Ignore:
Timestamp:
09/17/12 14:30:47 (12 years ago)
Author:
douglas
Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:
branches/2.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4

  • branches/2.4/prototype/modules/calendar/css/layout.css

    r6964 r7228  
    193193        display: inline-block; 
    194194        border: none; 
    195         width: 215px; 
     195        width: 213px; 
    196196} 
    197197 
     
    217217/* -- event details styles -- */ 
    218218 
    219 .new-event-win.active { 
     219.new-event-win.active, .new-task-win.active { 
    220220         width:700px;height:510px;text-align:left; 
    221221} 
    222222 
    223 .new-event-win > .content.ui-tabs.ui-widget-content { 
     223.new-event-win > .content.ui-tabs.ui-widget-content, .new-task-win > .content.ui-tabs.ui-widget-content { 
    224224        border: none; 
    225225} 
    226226 
    227 .new-event-win ul.attendee-permissions-list, li.attendee-permissions-list{text-align: left;} 
     227.new-event-win ul.attendee-permissions-list, li.attendee-permissions-list, .new-task-win ul.attendee-permissions-list{text-align: left;} 
     228.new-activity-win.active { 
     229         width:700px;height:510px;text-align:left; 
     230} 
     231 
     232.new-activity-win > .content.ui-tabs.ui-widget-content { 
     233        border: none; 
     234} 
     235.new-activity-win ul.attendee-permissions-list, li.attendee-permissions-list{text-align: left;} 
    228236 
    229237li.attendee-permissions-list input{width: 20px !important; margin: 3px 0 0 0 !important;} 
     
    234242p.request-update label{width: 150px !important;} 
    235243 
    236 .new-event-win .menu-addevent { 
     244.new-event-win .menu-addevent, .new-task-win .menu-addevent { 
    237245        text-align: right; 
    238246} 
    239247 
    240 fieldset.block-add-attendee .add-attendee-search { max-width: 250px; margin: 5px;} 
    241 fieldset.block-add-attendee .add-attendee-search input { max-width: 220px; width: 220px; padding: 0 0 0 7px;} 
    242 fieldset.block-add-attendee .search-result-list { width: 255px; max-height: 215px; overflow: auto;} 
    243 fieldset.block-add-attendee .search-result-list .ui-widget-content { border: none;} 
    244 fieldset.block-add-attendee .search-result-list .empty { margin-left: 5px; } 
     248.new-event-win fieldset.block-add-attendee .add-attendee-search { max-width: 250px; margin: 5px;} 
     249.new-task-win fieldset.block-add-attendee .add-attendee-search { max-width: 323px; margin: 5px;} 
     250 
     251.new-event-win fieldset.block-add-attendee .add-attendee-search input { max-width: 220px; width: 220px; padding: 0 0 0 7px;} 
     252.new-task-win fieldset.block-add-attendee .add-attendee-search input { max-width: 290px; width: 290px; padding: 0 0 0 7px;} 
     253 
     254.new-activity-win .menu-addevent {      text-align: right; } 
     255fieldset.block-add-attendee .add-attendee-search, fieldset.block-add-activity .add-activity-search { max-width: 250px; margin: 5px;} 
     256fieldset.block-add-attendee .add-attendee-search input, fieldset.block-add-activity .add-activity-search input { max-width: 220px; width: 220px; padding: 0 0 0 7px;} 
     257fieldset.block-add-attendee .search-result-list, fieldset.block-add-activity .search-result-list { width: 255px; max-height: 215px; overflow: auto;} 
     258fieldset.block-add-attendee .search-result-list .ui-widget-content, fieldset.block-add-activity .search-result-list .ui-widget-content { border: none;} 
     259fieldset.block-add-attendee .search-result-list .empty, fieldset.block-add-activity .search-result-list .empty { margin-left: 5px; } 
    245260fieldset.block-add-user .add-user-search {max-width: 235px;} 
    246261fieldset.block-add-user .search-result-list {max-width: 245px;}  
    247 fieldset.block-add-user .search-result-list .ui-widget-content {/*max-width: 245px;*/} 
    248  
    249 .block-attendee-list, .block-add-attendee { float:left;} 
     262 
     263fieldset.block-add-user .search-result-list .ui-widget-content, fieldset.block-add-user .search-result-list .ui-widget-content {max-width: 245px;} 
     264 
     265#calendar_addactivity_details8 .block-attendee-list, #calendar_addactivity_details8 .block-activity-list { width:430px; margin-right: 5px; } 
     266 
     267div.assing-calendar dl.block-add-user.search{width: 255px;}  
     268div.assing-calendar dt.add-user.search{width: 120px;}  
     269 
     270 
     271.block-activity-list, .block-activity-group-select{width: 405px} 
     272.block-add-activity.search{width: 298px} 
     273 
     274.block-attendee-list, .block-activity-list, .block-add-activity, .block-activity-group-select { float:left;} 
    250275.block-attendee-list { width:400px; margin-right: 5px; } 
    251 .block-add-attendee { width:260px; margin-right: 5px; } 
    252 .block-attendee-list dd, .block-add-attendee dd { border: 1px solid #BFBFBF; } 
    253 .block-attendee-list dt, .block-add-attendee dt { background-color:#FFF; margin: 5px 0 -6px 5px; font-weight: bold; display: table;  position: relative;} 
     276.new-event-win .block-add-attendee { width:260px; margin-right: 5px; } 
     277.new-task-win .block-add-attendee { width:335px; margin-right: 5px; } 
     278.block-attendee-list dd, .block-add-attendee dd, .block-activity-list dd, .block-add-activity dd, .block-activity-group-select dd { border: 1px solid #BFBFBF; } 
     279.block-attendee-list dt, .block-add-attendee dt,.block-activity-list dt, .block-add-activity dt, .block-activity-group-select dt { background-color:#FFF; margin: 5px 0 -6px 5px; font-weight: bold; display: table;  position: relative; display: table;} 
    254280.block-attendee-list dd.attendee-list { height: 196px; } 
    255 .block-attendee-list dd.attendee-list ul { max-height: 186px; overflow: auto; margin-top: 10px;} 
    256 .block-attendee-list dd.attendee-list-add {border-top:none !important; border:1px solid #BFBFBF;} 
    257 .block-attendee-list dd.attendee-list-add fieldset.add-attendee-input { border:none !important; margin: 0; padding: 0 } 
    258 .block-attendee-list dd.attendee-list-brief { border:none !important; margin: 5px 0; color:#777; } 
    259  
    260 dl.block-add-attendee { 
     281.block-attendee-list dd.attendee-list ul, .block-activity-list dd.task-activity-list ul { max-height: 186px; overflow: auto; margin-top: 10px;} 
     282.block-attendee-list dd.attendee-list-add, .block-activity-list dd.activity-list-add {border-top:none !important; border:1px solid #BFBFBF;} 
     283.block-attendee-list dd.attendee-list-add fieldset.add-attendee-input, .block-activity-list dd.activity-list-add fieldset.add-activity-input { border:none !important; margin: 0; padding: 0 } 
     284.block-attendee-list dd.attendee-list-brief, .block-activity-list dd.activity-list-brief { border:none !important; margin: 5px 0; color:#777; } 
     285#calendar_addactivity_details8 .block-attendee-list, #calendar_addactivity_details8 .block-activity-list { width:430px; margin-right: 5px; } 
     286 
     287/* Pesquisa de tarefas */ 
     288.block-activity-group-select dd.task-activity-list { height: 181px; } 
     289.block-activity-group-select dd.group-select { height: 40px; } 
     290 
     291fieldset.block-add-activity ul.search-result-list li{ width: 9999px; } 
     292fieldset.block-add-activity ul.search-result-list{width: 290px;} 
     293 
     294fieldset.block-add-activity fieldset.add-activity-search{max-width: 320px; width: 282px} 
     295fieldset.block-add-activity fieldset.add-activity-search input{max-width: 260px; width: 245px;} 
     296 
     297.block-activity-group-select dd.group-select select{margin: 12px 8px;} 
     298.block-activity-group-select dd.task-activity-list{padding: 10px 5px} 
     299 
     300/** Pesquisa de tarefas **/ 
     301 
     302select.group-addactivity-details-txt-timezone{width: 175px;} 
     303 
     304 
     305dl.block-add-attendee, dl.block-add-activity { 
    261306        float: right; 
    262307        display: block; 
    263308} 
    264309 
    265 dl.block-add-attendee dd.add-attendee { 
     310dl.block-add-activity dd.add-activity{ 
     311    width: 295px; 
     312    min-height: 254px; 
     313    display: block; 
     314} 
     315 
     316.new-event-win dl.block-add-attendee dd.add-attendee{ 
    266317        width: 260px; 
    267318        min-height: 260px; 
    268319        display: block; 
    269320} 
     321 
     322.new-task-win dl.block-add-attendee dd.add-attendee { 
     323        width: 343px; 
     324        min-height: 260px; 
     325        display: block; 
     326} 
     327 
     328.new-activity-win dl.block-activity-group-select li.task{overflow: hidden; position: relative;} 
     329.new-activity-win dl.block-activity-group-select ul{overflow: hidden;} 
     330 
     331#calendar_addactivity_details8 dl.block-add-attendee dd.add-attendee ,#calendar_addactivity_details8 dl.block-add-activity dd.add-activity { 
     332        width: 260px; 
     333        min-height: 292px; 
     334        display: block; 
     335} 
     336 
    270337 
    271338ul.attendees-count {clear:left; float:left;} 
     
    280347.attendees-list .me .add-attendee-options-read { max-height: 16px; height:16px;  max-width: 16px; width:16px; display: inline; padding: 0; margin: 0 0 5px 0;} 
    281348 
    282 .attendees-list .me .add-attendee-options-button {position: absolute; top: 171px;} 
     349.attendees-list .me .add-attendee-options-button {top: 4px;} 
    283350.attendees-list .hover-attendee { background-color: #DFEFFC;} 
     351.task-activity-list .hover-activity { background: #DFEFFC;} 
    284352/* 
    285353.attendees-list .attendee-options-button-edit { position: absolute; top:0; right:25px;} 
     
    288356*/ 
    289357 
    290 .attendee-options{ position: absolute; top: 0; left: 287px; background-color: white; z-index: 100; width: 90px; background-color: #FFF; padding: 0 20px 0 3px; text-align: right;} 
    291 .attendees-list .not-attendee { height:16px; } 
     358.attendee-options, .activity-options{ position: absolute; top: 0; left: 287px; background-color: white; z-index: 100; width: 90px; background-color: #FFF;      padding: 0 20px 0 3px; text-align: right;} 
     359.attendees-list .not-attendee, .activitys-list .not-activity { height:16px; } 
    292360 
    293361.list-delegates{margin: 0 0 0 25px;} 
     
    296364 
    297365.attendees-list .me .add-attendee-search input { max-width: 125px; } 
    298 .attendees-list li.organizer, .attendees-list li.me-delegated  {margin-bottom: 3px;} 
     366.attendees-list li.organizer, .attendees-list li.me-delegated, .activitys-list li.organizer {margin-bottom: 3px;} 
    299367.attendees-list .organizer .button.swap { 
    300368        float: right; 
     
    338406} 
    339407dd.attendee-list ul.attendee-list li label[title=''] { display:none } 
     408dd.task-activity-list ul.task-activity-list li { 
     409    overflow: hidden; 
     410        position: relative; 
     411} 
     412 
     413 
     414dd.task-activity-list ul.task-activity-list li label.name, 
     415dd.task-activity-list ul.task-activity-list li label.mail { 
     416        width: 99999px; 
     417        min-width: 99999px; 
     418} 
     419 
     420 ul.task-activity-list li label.name{display: table-cell;} 
     421 
     422dd.task-activity-list ul.task-activity-list li label[title=''] { display:none } 
    340423/* 
    341424dd.attendee-list ul.attendee-list li .button.close { 
     
    404487/* -- calendar list styles -- */ 
    405488 
    406 .my-calendars .button.new { 
     489.my-calendars .button.new, .my-groups-task .button.new{ 
    407490  float:right; 
    408491  width: 15px; 
     
    410493} 
    411494 
    412 .my-calendars .status-list { 
     495.my-calendars .status-list, .my-groups-task  .status-list { 
    413496        display: inline-block; 
    414497        margin: 0px 0pc -4px -5px; 
     
    416499} 
    417500 
    418 .my-calendars .list-calendars-item, .signed-calendars .list-calendars-item{ 
     501.my-calendars .list-calendars-item, .signed-calendars .list-calendars-item, .my-groups-task .list-calendars-item{ 
    419502        position: relative;  
    420503        overflow: hidden; 
    421504} 
    422 .my-calendars .list-calendars-item div, .signed-calendars .list-calendars-item div{ 
     505.my-calendars .list-calendars-item div, .signed-calendars .list-calendars-item div, .my-groups-task .list-calendars-item div{ 
    423506        overflow:hidden;  
    424507        width:6000px;  
     
    426509} 
    427510 
    428 .my-calendars .cal-list-options-btn, .signed-calendars .cal-list-options-btn { 
     511.my-calendars .cal-list-options-btn, .signed-calendars .cal-list-options-btn, .my-groups-task .cal-list-options-btn { 
    429512        position: absolute; 
    430513        top: 2px; 
     
    459542 
    460543.shared-calendar .user-list li.user-list{ 
    461         height: 17px; 
     544        height: 20px; 
    462545        overflow: hidden; 
    463         position: relative;  
     546        position: relative; 
    464547} 
    465548 
     
    474557} 
    475558 
     559//Remover bordas indesejáveis no Ie 
     560input[type="checkbox"]{border: none 0px;} 
     561 
    476562.user-acls-shared-calendar{ 
    477563    width: 130px; 
    478564    float: right; 
    479565    position: absolute; 
    480     left: 200px;  
    481         top:2px; 
     566    left: 200px; 
     567    top:2px; 
    482568    background: white; 
    483569} 
     
    606692} 
    607693 
     694div.assing-calendar .add-user fieldset.block-add-user{ 
     695    width: 234px; 
     696    margin: 0; 
     697    padding: 0; 
     698} 
     699 
    608700dd.user-list{ 
    609701        height: 193px; 
     
    616708/*dd.calendar-list ul.user-list li.user-list div {  
    617709        position:relative;  
     710}*/ 
     711 
     712/*dd.calendar-list ul.user-list li.user-list div { 
     713        position:relative; 
    618714}*/ 
    619715 
     
    714810 
    715811.button.add.button-add-attachment{margin: -9px 0 0 8px;} 
    716 .button.btn-danger.delete{margin: 0 0 0 0;} 
     812/*.button.btn-success.fileinput-button{width: 85px;}*/ 
     813.button.btn-danger.delete{margin: 0 0 0 0; min-width: 143px;} 
    717814 
    718815.button.upload{top: 4px;} 
     
    729826.lbl-archive-nome{width:40px !important;} 
    730827.row.fileupload-buttonbar{margin-top: -14px; padding: 0.2em 0.7em;} 
     828.row.fileupload-buttonbar-task{margin-top: 0; padding: 0.2em 0.7em;} 
    731829 
    732830.archive-nome{width: 73px;} 
     
    745843/* -- alarm dysplay -- */ 
    746844 
    747 .new-event-alarm{ 
     845.new-event-alarm, .new-task-alarm{ 
    748846        margin: 5px;     
    749847        font: bold; 
    750848} 
    751849 
    752 .title-event-alarm{ 
     850.title-event-alarm, .title-task-alarm{ 
    753851        margin: 5px; 
    754852} 
    755853 
    756 .description-event-alarm{ 
     854.description-event-alarm, .description-task-alarm{ 
    757855        margin: 5px; 
    758856} 
    759857 
    760 .inicialize-event-alarm{ 
     858.inicialize-event-alarm, .inicialize-task-alarm{ 
    761859        margin: 5px; 
    762860} 
     
    861959.ui-dialog .ui-button-text-only .ui-button-text { padding: 0.4em 1em; } 
    862960 
    863 .new-event-win fieldset { border: none; margin: 0; padding: 0; } 
    864 .new-event-win fieldset.tab-level2 { padding: 0px 5px; } 
    865 .new-event-win fieldset fieldset, .new-event-win fieldset.tab-level2 fieldset { padding: 5px 0; } 
     961.new-event-win fieldset, .new-task-win fieldset { border: none; margin: 0; padding: 0; } 
     962.new-event-win fieldset.tab-level2, .new-task-win fieldset.tab-level2 { padding: 0px 5px; } 
     963.new-event-win fieldset fieldset, .new-task-win fieldset.tab-level2 fieldset, 
     964.new-task-win fieldset fieldset, .new-task-win fieldset.tab-level2 fieldset{ padding: 5px 0; } 
     965 
     966.new-activity-win fieldset { border: none;      margin: 0; padding: 0; } 
     967.new-activity-win fieldset.tab-level2 { padding: 0px 5px; } 
     968.new-activity-win fieldset fieldset, .new-activity-win fieldset.tab-level2 fieldset { padding: 5px 0; } 
    866969 
    867970.hidden { 
     
    9041007} 
    9051008 
     1009.new-event-win form.form-addevent { padding: 9px; } 
     1010 
     1011.new-activity-win div.div-addtask { padding: 0; width: 774px; border: 0;} 
     1012.new-activity-win div.div-addactivity { padding: 0; width: 734px; border: 0;} 
     1013.new-activity-win form.form-addevent { padding: 9px; } 
    9061014.ui-dialog .ui-dialog-content { padding: 0; } 
    907 .new-event-win div.div-addevent { padding: 0; width: 700px; border: 0;} 
    908 .new-event-win form.form-addevent { padding: 9px; } 
     1015.new-event-win div.div-addevent{ padding: 0; width: 700px; border: 0;} 
     1016.new-task-win div.div-addtask { padding: 0; width: 774px; border: 0;} 
     1017.new-event-win form.form-addevent, .new-task-win form.form-addtask { padding: 9px; } 
     1018.new-activity-win div.div-addevent { padding: 0; width: 700px; border: 0;} 
     1019.new-activity-win form.form-addevent { padding: 9px; } 
    9091020 
    9101021.expresso-calendar-container input[type="text"] { height: 18px; } 
     
    9291040 
    9301041.expresso-calendar-container input.h1, 
    931 .new-event-win input.h1 { 
     1042.new-event-win input.h1, .new-task-win input.h1, .new-activity-win input.h1 { 
    9321043        font-size: 150%; 
    9331044        font-weight: bold; 
     
    9361047} 
    9371048 
    938 .new-event-win textarea { 
     1049.new-event-win textarea, .new-task-win textarea, .new-activity-win textarea { 
    9391050        width:600px; 
    9401051        height: 210px; 
     
    9451056span.input-group { display: block; } 
    9461057/*p.input-group label { vertical-align: top; }*/ 
    947 .new-event-win p.input-group label { display: inline-block; width: 65px;} 
    948 .new-event-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;} 
     1058.new-event-win p.input-group label, .new-task-win p.input-group label { display: inline-block; width: 65px;} 
     1059.new-event-win p.input-group label.input-group, .new-task-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;} 
     1060.new-activity-win p.input-group label { display: inline-block; width: 65px;} 
     1061.new-activity-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;} 
    9491062 
    9501063input.number {text-align: right} 
     
    9661079.new-event-win fieldset.event-repeat-container label,  
    9671080.new-event-win p.input-group.event-repeat-weekly label,  
    968 .new-event-win p.input-group.event-repeat-monthly label { 
     1081.new-event-win p.input-group.event-repeat-monthly label, 
     1082.new-task-win fieldset.task-repeat-container label,  
     1083.new-task-win p.input-group.task-repeat-weekly label,  
     1084.new-task-win p.input-group.task-repeat-monthly label 
     1085{ 
    9691086        width: auto;  
    9701087} 
     
    9731090.new-event-win fieldset.search-field, 
    9741091.new-event-win fieldset.block-add-attendee-permissions, 
    975 .new-event-win fieldset.block-attendee-list { 
     1092.new-event-win fieldset.block-attendee-list, 
     1093.new-task-win fieldset.input-field-rounded, 
     1094.new-task-win fieldset.search-field, 
     1095.new-task-win fieldset.block-add-attendee-permissions, 
     1096.new-task-win fieldset.block-attendee-list 
     1097{ 
    9761098        border:1px solid #CFCFCF; 
    9771099} 
    9781100 
    979 .new-event-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;} 
    980 .new-event-win fieldset.block-attendee-list ul {  height:160px; overflow: auto;} 
     1101.new-event-win fieldset.block-attendee-list, .new-task-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;} 
     1102.new-event-win fieldset.block-attendee-list ul, .new-task-win fieldset.block-attendee-list ul {  height:160px; overflow: auto;} 
     1103/**/ 
     1104.new-activity-win fieldset.event-repeat-container label,  
     1105.new-activity-win p.input-group.event-repeat-weekly label,  
     1106.new-activity-win p.input-group.event-repeat-monthly label { 
     1107        width: auto;  
     1108} 
     1109 
     1110.new-activity-win fieldset.input-field-rounded, 
     1111.new-activity-win fieldset.search-field, 
     1112.new-activity-win fieldset.block-add-attendee-permissions, 
     1113.new-activity-win fieldset.block-attendee-list { 
     1114        border:1px solid #CFCFCF; 
     1115} 
     1116 
     1117.new-activity-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;} 
     1118.new-activity-win fieldset.block-attendee-list ul {  height:160px; overflow: auto;} 
    9811119 
    9821120 
     
    11481286} 
    11491287 
    1150 .events-list-win table img { 
    1151   width: 12px; 
    1152   height: 12px; 
    1153   padding: 0 2px; 
    1154 } 
    11551288 
    11561289.events-list-win table span { font-size:12px; } 
Note: See TracChangeset for help on using the changeset viewer.