diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index ccc7ee0e75..17e1f8e79a 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -15,7 +15,7 @@ img.sideboxstar { width: 12px; height: 12px; - background-color: #f0f0f0; + /*.background_color_10_gray;*/ -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -27,17 +27,17 @@ img.sideboxstar { margin: 1px; } img.sideboxstar:hover { - background-color: #b3b3b3 !important; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + /*.background_color_20_gray;*/ + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } img.sideboxstar:active { - background-color: #808080; + /*.background_color_30_gray;*/ border: 1px solid rgba(0, 0, 0, 0.9); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -45,7 +45,8 @@ img.sideboxstar:active { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - background-color: #00b500 !important; + background-color: #1aa200; + background-color: #1aa200 !important; } .chzn-container { max-width: 85% !important; @@ -63,6 +64,18 @@ img.sideboxstar:active { width: 16px; height: 16px; } +.calendar_calEventBodySmall img[src$="svg"], +.calendar_calDayColHeader img[src$="svg"] { + background-color: #0c5da5; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); + background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); + background-image: linear-gradient(top, #0c5da5, #0c5da5); + background-repeat: repeat-x; +} /* calender view*/ /*defind in layout_raster.less , because frame*/ span#start { @@ -128,7 +141,7 @@ div.calendar { } .calendar thead .active { /* Active (pressed) buttons in header */ - background-color: #408dd2; + background_color: #408dd2; padding: 2px 0px 0px 2px; } .calendar tbody .day { @@ -327,7 +340,7 @@ div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(even) { background: #ffffff; } div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(odd) { - background: #ebebeb; + background: #fafafa; } div#calendar-edit #calendar-edit_calendar-edit-general { display: block; @@ -360,7 +373,7 @@ div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category { border-radius: 3px; } div#calendar-edit #calendar-edit_calendar-edit-participants tr.optional { - background-color: rgba(255, 194, 0, 0.1); + background-color: rgba(255, 221, 115, 0.1); } div#calendar-edit #calendar-edit_calendar-edit-participants tbody { display: table; @@ -371,7 +384,7 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody td { padding-top: 3px; } div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search { - background-color: #f0f0f0; + /*.background_color_10_gray;*/ -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -385,17 +398,17 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-s margin-left: 1em; } div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-search:hover { - background-color: #b3b3b3 !important; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + /*.background_color_20_gray;*/ + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-searchactive { - background-color: #808080; + /*.background_color_30_gray;*/ border: 1px solid rgba(0, 0, 0, 0.9); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -403,6 +416,7 @@ div#calendar-edit #calendar-edit_calendar-edit-participants tbody span.ui-icon-s -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); + background-color: #1aa200; } div#calendar-edit #calendar-edit_calendar-edit-participants tbody div#calendar-edit_resource { margin: 5px 0 10px 0; @@ -440,7 +454,7 @@ div#calendar-edit #calendar-edit_calendar-edit-alarms tbody label.et2_label { padding: 0 5px; } div#calendar-edit #calendar-edit_calendar-edit-alarms tbody tr.add_alarm_action { - background-color: rgba(255, 194, 0, 0.1); + background-color: rgba(255, 221, 115, 0.1); margin-bottom: 1em; } div#calendar-edit #calendar-edit_calendar-edit-history { @@ -479,21 +493,19 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget +. .#.* * * *. .*+----------------------------------+*. */ - /* custom ui-tooltip style for calendar */ .calendar_uitooltip { - padding: 0px; - position: absolute; - border: none; - max-height: 400px; - z-index: 9999; - max-width: 300px; - -webkit-box-shadow: 0 0 5px; - -moz-box-shadow: 0 0 5px; - box-shadow: 0 0 5px; + padding: 0px; + position: absolute; + border: none; + max-height: 400px; + z-index: 9999; + max-width: 300px; + -webkit-box-shadow: 0 0 5px; + -moz-box-shadow: 0 0 5px; + box-shadow: 0 0 5px; } - .calendar_size120b { font-size: 120%; font-weight: bold; @@ -789,6 +801,17 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget padding: 2px; font-weight: bold; } +.calendar_calDayTodos .calendar_calDayTodosHeader a img[src$="svg"] { + background-color: #0c5da5; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); + background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); + background-image: linear-gradient(top, #0c5da5, #0c5da5); + background-repeat: repeat-x; +} .calendar_calDayTodos .calendar_calDayTodosHeader a img { border: 1px solid rgba(0, 0, 0, 0.15); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -798,13 +821,25 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget -moz-border-radius: 3px; border-radius: 3px; color: #000000; + -webkit-transition-property: background; + -moz-transition-property: background; + -o-transition-property: background; + transition-property: background; + -webkit-transition-duration: 0.5s; + -moz-transition-duration: 0.5s; + -o-transition-duration: 0.5s; + transition-duration: 0.5s; + -webkit-transition-timing-function: linear; + -moz-transition-timing-function: linear; + -o-transition-timing-function: linear; + transition-timing-function: linear; width: 16px; height: 16px; } .calendar_calDayTodos .calendar_calDayTodosHeader a img:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); background-color: inherit !important; } .calendar_calDayTodos .calendar_calDayTodosTable { @@ -814,16 +849,27 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget .calendar_calDayTodos .calendar_calDayTodosTable table tr:nth-child(even) { background: #ffffff; } -.calendar_calDayTodos .calendar_calDayTodosTable table tr:nth-child(odd) { - background: #ebebeb; +.calendar_calDayTodos .calendar_calDayTodosTable table tr:nth_child(odd) { + background: #fafafa; } .calendar_calDayTodos .calendar_calDayTodosTable table td { padding: 3px; } +.calendar_calDayTodos .calendar_calDayTodosTable table td img[src$="svg"] { + background-color: #0c5da5; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); + background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); + background-image: linear-gradient(top, #0c5da5, #0c5da5); + background-repeat: repeat-x; +} .calendar_calDayTodos .calendar_calDayTodosTable table td img { width: 12px; height: 12px; - background-color: #f0f0f0; + /*.background_color_10_gray;*/ -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -833,17 +879,17 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget border-radius: 3px; } .calendar_calDayTodos .calendar_calDayTodosTable table td img:hover { - background-color: #b3b3b3 !important; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + /*.background_color_20_gray;*/ + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .calendar_calDayTodos .calendar_calDayTodosTable table td img:active { - background-color: #808080; + /*.background_color_30_gray;*/ border: 1px solid rgba(0, 0, 0, 0.9); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -851,7 +897,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - background-color: #00ab00 !important; + background-color: #1aa200; + background-color: #189800 !important; } .calendar_calDayTodos { width: 250px; @@ -1066,6 +1113,18 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget -moz-border-radius: 3px; border-radius: 3px; color: #000000; + -webkit-transition-property: background; + -moz-transition-property: background; + -o-transition-property: background; + transition-property: background; + -webkit-transition-duration: 0.5s; + -moz-transition-duration: 0.5s; + -o-transition-duration: 0.5s; + transition-duration: 0.5s; + -webkit-transition-timing-function: linear; + -moz-transition-timing-function: linear; + -o-transition-timing-function: linear; + transition-timing-function: linear; } #delete_series { top: 100px; @@ -1106,7 +1165,7 @@ tr.prefRow > td { right: 55%; display: none; width: 33%; - background-color: #ffc200; + background-color: #679fd2; } tr.prefRow:hover .prefHelp { display: block; diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 2d8651909d..3eeee43efa 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -14,6 +14,7 @@ @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less"; + // ************************************************ // Seitenleiste // Ansichten @@ -31,7 +32,9 @@ img.sideboxstar { margin: 1px; &:hover{.Complete_Button_Icon_hover ;} - &:active{.Complete_Button_Icon_active ; background-color: @color-positive-action-active !important;} + &:active{ + .Complete_Button_Icon_active ; + background-color: @color_positive_action_active !important;} } .chzn-container { @@ -49,7 +52,8 @@ img.sideboxstar { border: none; - + + } // Ende Iframe @@ -58,8 +62,14 @@ img.sideboxstar { // Images .calendar_calDayColHeader img {.dimension_width_height_s;} + .calendar_calEventBodySmall img {.dimension_width_height_s;} +.calendar_calEventBodySmall img[src$="svg"], +.calendar_calDayColHeader img[src$="svg"] { + .gradient_vertical (@egw_color_2_a, @egw_color_2_a); + } + @@ -98,7 +108,7 @@ div.calendar { position: relative; } } .nav { background: url(menuarrow.gif) no-repeat 100% 100%; - .background-table-cal-head; + .background_table_cal_head; } @@ -112,12 +122,12 @@ div.calendar { position: relative; } padding: 2px; } .headrow { /* Row containing navigation buttons */ - .background-table-cal-head; + .background_table_cal_head; color: #fff; } .daynames { /* Row containing the day names */ // background: #bdf; - .background-color-30-gray; + .background_color_30_gray; } .name { /* Cells containing the day names */ @@ -133,15 +143,15 @@ div.calendar { position: relative; } .hilite { /* How do the buttons in header appear when hover */ - .background-color-0-gray; + .background_color_0_gray; color: #000; border: 1px solid; - border-color: @gray-50; + border-color: @gray_50; padding: 1px; } .active { /* Active (pressed) buttons in header */ - background-color: @egw_color_2_d; + background_color: @egw_color_2_d; padding: 2px 0px 0px 2px; } } // thead @@ -167,7 +177,7 @@ div.calendar { position: relative; } .rowhilite td { // background: #def; - .background-color-25-gray; + .background_color_25_gray; } .rowhilite td.wn { @@ -219,7 +229,7 @@ div.calendar { position: relative; } padding: 2px 3px 2px 2px; border-right: 1px solid #000; // background: #bdf; - .background-color-30-gray; + .background_color_30_gray; } @@ -321,7 +331,7 @@ div.calendar { position: relative; } span.hilite { border-color: #000; // background-color: #667; - .background-color-30-gray; + .background_color_30_gray; color: #fff; } @@ -389,8 +399,8 @@ div#calendar-edit{ table.et2_grid { // Listendarstellung - tr:nth-child(even) {background: @color-even;} - tr:nth-child(odd) {background: @color-odd;} + tr:nth-child(even) {background: @color_even;} + tr:nth-child(odd) {background: @color_odd;} } } @@ -435,7 +445,7 @@ div#calendar-edit{ } #calendar-edit_category{ border: 1px solid; - border-color: @gray-30; + border-color: @gray_30; .border_radius_button_normal; } @@ -449,7 +459,7 @@ div#calendar-edit{ #calendar-edit_calendar-edit-participants{ - tr.optional {background-color: @color-optional;} + tr.optional {background-color: @color_optional;} tbody{ display: table; @@ -545,7 +555,7 @@ div#calendar-edit{ width: 100%; label.et2_label {white-space: nowrap; padding: 0 5px;} - tr.add_alarm_action {background-color: @color-optional; margin-bottom: 1em;} + tr.add_alarm_action {background-color: @color_optional; margin-bottom: 1em;} } } @@ -614,14 +624,14 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget */ .calendar_calToday{ // background: #ffffcc; - .background-table-cal-head; + .background_table_cal_head; } /* marks a day in the colum-header as holiday */ .calendar_calHoliday{ background-color: @egw_color_3_e; a { - .color-0-gray; + .color_0_gray; font-size: 0.9em; } } @@ -642,7 +652,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget left: 0px; border:1px solid silver; width: 99%; - .background-color-10-gray; + .background_color_10_gray; /* set via inline style on runtime: * height: */ @@ -660,7 +670,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget } .calendar_calTimeRow{ /* background-color: silver; */ - .background-color-5-gray; + .background_color_5_gray; } /* time in a timeRow @@ -842,7 +852,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget // .background-color-50-gray; background-color: @egw_color_1_e; cursor: pointer; - .color-0-gray; + .color_0_gray; } /* header-row of the event @@ -868,7 +878,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget position: absolute; right: 0px; top: 0px; - background-color: @gray-10; + background-color: @gray_10; .rounded (2px); } .calendar_calEventIcons img{ @@ -914,6 +924,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget font-weight: bold; a { + img[src$="svg"] { + .gradient_vertical (@egw_color_2_a, @egw_color_2_a); + } + img { .Complete_Button_normal; .dimension_width_height_s; @@ -930,11 +944,15 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget // Listendarstellung // Reihen ohne Border left und right - tr:nth-child(even) {background: @color-even;} - tr:nth-child(odd) {background: @color-odd;} + tr:nth-child(even) {background: @color_even;} + tr:nth_child(odd) {background: @color_odd;} td { padding: 3px; + + img[src$="svg"] { + .gradient_vertical (@egw_color_2_a, @egw_color_2_a); + } img { .dimension_width_height_xs; @@ -943,7 +961,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget &:hover {.Complete_Button_Icon_hover;} &:active { .Complete_Button_Icon_active; - background-color: @color-positive-action !important; + background-color: @color_positive_action !important; } } } @@ -1113,7 +1131,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget .dimension_width_height_xs; margin: 3px; .rounded (2px); - background-color: @gray-10; + background-color: @gray_10; } .calendar_plannerEvent:hover{ cursor: pointer; @@ -1193,7 +1211,7 @@ tr.prefRow > td { right: 55%; display: none; width: 33%; - background-color: @color-hint; + background-color: @color_hint; } tr.prefRow:hover .prefHelp { diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index 9a6be1f6d0..f3335b84c3 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -115,6 +115,10 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { # # # ############################################## */ +/* +.egw_fw_content_browser_div{ + +}*/ #infolog-index { height: auto !important; } @@ -339,6 +343,9 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { #infolog-edit #infolog-edit_history { max-width: 785px; } +#infolog-edit div.et2_hbox { + white-space: nowrap; +} .infolog_fixedHeight { height: auto; } @@ -350,7 +357,10 @@ input#infolog-edit_info_subject { } /*#############################################*/ /*Tabs */ -/*Beschreibung*/ +/*Beschreibung************************************/ +#infolog-edit_infolog-edit-description #infolog-edit_info_des { + min-height: 246px; +} /*Verknüpfung ************************************/ #infolog-edit_infolog-edit-links { /*neue verknüpfung erstellen - div*/ diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index eea3335e76..b135fa5570 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -61,10 +61,10 @@ span#favorite_sidebox_infolog{ # # # ############################################## */ - +/* .egw_fw_content_browser_div{ -} +}*/ #infolog-index { @@ -224,8 +224,8 @@ span#favorite_sidebox_infolog{ } //nextmatch_header - // ################################## - // Listendarstellung +// ################################## +// Listendarstellung .egwGridView_outer {} table.egwGridView_outer thead tr th.optcol .selectcols{ @@ -306,6 +306,10 @@ span#favorite_sidebox_infolog{ max-width: 785px; } + div.et2_hbox { + white-space: nowrap; +} + } .infolog_fixedHeight { height: auto; @@ -352,7 +356,13 @@ input#infolog-edit_info_subject {width: 98% !important;} /*#############################################*/ /*Tabs */ -/*Beschreibung*/ +/*Beschreibung************************************/ + +#infolog-edit_infolog-edit-description{ + + #infolog-edit_info_des {min-height: 246px;} + +} /*Verknüpfung ************************************/ diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index da03c5db79..7dd72e7b28 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -211,7 +211,8 @@ div#mail-index{ button#mail-index_button[mailcreate], button[id*="mailcreate"]{ - .Complete_Button_add; + + .Complete_Button_add; background-image: url("images/write_mail_lighter.png") !important; background-position: right center !important; background-repeat: no-repeat; @@ -220,14 +221,14 @@ div#mail-index{ text-align: left; width: 93%; - &:hover { + &:hover { .box_shadow_standard_light_hover; } - &:focus { + &:focus { .border_radius_button_lefttop ; .box_shadow_standard_light_inset; - } + } }