From 293a4d5fb2fd595b5bd108414b7a034a890204b9 Mon Sep 17 00:00:00 2001 From: Stefan Reinhardt Date: Mon, 16 Jun 2014 11:06:15 +0000 Subject: [PATCH] pixelegg.less Favorites in purple --- pixelegg/css/pixelegg.css | 62 +++++++++++++++++++++----------- pixelegg/less/etemplate2.less | 24 +++++++++++-- pixelegg/less/layout_dialog.less | 4 +-- pixelegg/less/layout_raster.less | 39 ++++++++++---------- 4 files changed, 83 insertions(+), 46 deletions(-) diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index cf088d4348..01ca03a9b5 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1046,12 +1046,29 @@ margin-left: 0px; min-height: 16px; padding: 3px 0px; + margin-bottom: 0.2em; + background-color: #ece2f7; } .sidebox-favorites ul.favorites li.ui-menu-item:hover { color: #000000; - background-color: #ffdd73; + background-color: #9b6ad6; padding: 3px 0; } + .sidebox-favorites ul.favorites li.ui-menu-item:hover a { + color: #ffffff; + } + .sidebox-favorites ul.favorites li.ui-menu-item:first-of-type { + background-color: #ffffff; + } + .sidebox-favorites ul.favorites li.ui-menu-item:first-of-type a { + color: #000000; + } + .sidebox-favorites ul.favorites li.ui-menu-item:last-of-type { + background-color: #ffffff; + } + .sidebox-favorites ul.favorites li.ui-menu-item:last-of-type a { + color: #000000; + } .sidebox-favorites ul.favorites li.ui-menu-item a { line-height: inherit; padding: 2px 0px; @@ -1227,7 +1244,7 @@ #admin-categories-index div.egwGridView_scrollarea { min-height: 500px; } - /*#################################### ADMIN PART #####################################################*/ + /*#################################### END ADMIN PART #####################################################*/ } /*#################################### Media Queries #####################################################*/ @media only screen and (min-width: 980px) and (max-width: 1279px) { @@ -4741,7 +4758,7 @@ table.nextmatch_header img { } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category { margin: 4px 5px 5px 5px; - padding: 0.5em 1em; + padding: 0.5em 1em 0.5em 0; cursor: pointer; border-color: #b4b4b4; background-color: #e6e6e6; @@ -4774,7 +4791,7 @@ table.nextmatch_header img { } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category:hover { background-color: #999999; - padding: 0.5em 1em; + padding: 0.5em 1em 0.5em 0; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active { border-bottom-width: 0px; @@ -4881,7 +4898,7 @@ table.nextmatch_header img { margin-top: 0px; padding-bottom: 5px; padding-left: 0px; - padding-top: 14px; + padding-top: 3px; margin-right: 5px; /*min-height: 50px;*/ } @@ -4914,12 +4931,16 @@ table.nextmatch_header img { vertical-align: middle; } .egw_fw_ui_sidemenu_listitem { - padding: 0.5em 0; - margin: 0px 0 5px 0px; + padding: 9px 0px 0px 0px; + margin: 0px 0 1px 0px; position: relative; - min-height: 16px; + min-height: 18px; background-color: #ffffff; } +.egw_fw_ui_sidemenu_listitem:hover { + color: #000000; + background-color: #ffdd73; +} .egw_fw_ui_sidemenu_listitem img.egw_fw_ui_sidemenu_listitem_icon { /*display: none;*/ width: 12px; @@ -4950,6 +4971,7 @@ table.nextmatch_header img { padding: 5px 0px 5px 5px; text-decoration: none; min-width: 5em; + vertical-align: bottom; } .egw_fw_ui_sidemenu_listitem a:hover { color: #000000; @@ -4995,11 +5017,6 @@ table.nextmatch_header img { border-radius: 3px; color: #ffffff; } -.egw_fw_ui_sidemenu_listitem:hover { - color: #000000; - background-color: #ffdd73; - padding: 0.5em 0; -} .egw_fw_ui_scrollarea { overflow: hidden; z-index: 0; @@ -5075,18 +5092,19 @@ table.nextmatch_header img { #egw_fw_main { padding: 0; width: auto; -} -@media screen and (-webkit-min-device-pixel-ratio: 0) { - #egw_fw_main #egw_fw_tabs { - /*Chrome needs margin-top*/ - margin-top: 3px; - } + /* @media screen and (-webkit-min-device-pixel-ratio:0) { + #egw_fw_tabs { + Chrome needs margin-top + margin-top: 3px; + } + }*/ } #egw_fw_main #egw_fw_tabs { position: relative; background-color: transparent; float: left; width: 100%; + margin-top: 3px; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header { margin: 0px 0 0 0; @@ -5443,7 +5461,7 @@ div.dialogHeader { .dialogHeader { /*.gradient_thead;*/ color: #000000; - height: 40px; + height: 50px; } .dialogHeader img[src*="navbar"] { padding: 0 0 0 15px; @@ -5631,7 +5649,6 @@ div#etemplate\.tab_widget { padding: 3px; white-space: nowrap; /*.et2_selectbox {height: 32px; top: 0px; font-size: 1em;}*/ - /*label.et2_label {}*/ } .dialogFooterToolbar td { padding: 0px 5px 0px 0px; @@ -5655,6 +5672,9 @@ div#etemplate\.tab_widget { .dialogFooterToolbar div.et2_box_widget { white-space: nowrap; } +.dialogFooterToolbar label.et2_label { + white-space: nowrap; +} .dialogFooterToolbar input.et2_checkbox { top: 0px; } diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 7c7b90a5a3..cf24a897ba 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -963,15 +963,32 @@ button#admin-categories-index_add { margin-left: 0px; min-height: 16px; padding: 3px 0px; + margin-bottom: 0.2em; + background-color: lighten(@egw_color_3_e, 30%); - // gelb + // lila &:hover{ .color_100_gray; - background-color: @egw_color_1_e; + background-color: @egw_color_3_e; padding: 3px 0; + a{color: @gray_0;} + } + // delete favourites + &:first-of-type {background-color: @gray_0; + + a{color: @gray_100;} + } + + // view as favourites + &:last-of-type {background-color: @gray_0; + + a{color: @gray_100;} + } + + a{ line-height: inherit; @@ -1213,7 +1230,8 @@ iframe#admin-index_iframe{ -/*#################################### ADMIN PART #####################################################*/ +/*#################################### END ADMIN PART #####################################################*/ + diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index 00a29d3980..e6737c2a21 100755 --- a/pixelegg/less/layout_dialog.less +++ b/pixelegg/less/layout_dialog.less @@ -187,7 +187,7 @@ div.dialogHeader { /*.gradient_thead;*/ .color_100_gray; - height: 40px; + height: 50px; // APP img img[src*="navbar"] { @@ -424,7 +424,7 @@ div#etemplate\.tab_widget { // e.g. keine Benachrichtigung senden - /*label.et2_label {}*/ + label.et2_label {white-space: nowrap;} input.et2_checkbox { top: 0px;} diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 015bbee3ef..3b0f2374e6 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -736,7 +736,7 @@ // Normal .egw_fw_ui_category { margin: 4px 5px 5px 5px; - padding: 0.5em 1em; + padding: 0.5em 1em 0.5em 0; cursor: pointer; // border-top: 7px solid; border-color: @gray_30; @@ -769,7 +769,7 @@ // on Mouse over change color .egw_fw_ui_category:hover { .background_color_40_gray; - padding: 0.5em 1em; + padding: 0.5em 1em 0.5em 0; } @@ -910,7 +910,7 @@ margin-top: 0px; padding-bottom: 5px; padding-left: 0px; - padding-top: 14px; + padding-top: 3px; margin-right: 5px; /*min-height: 50px;*/ @@ -971,12 +971,20 @@ .egw_fw_ui_sidemenu_listitem { - padding: 0.5em 0; - margin: 0px 0 5px 0px; + padding: 9px 0px 0px 0px; + margin: 0px 0 1px 0px; position: relative; - min-height: 16px; + min-height: 18px; background-color: @gray_0; + // Submenu Hover Item - gelb + &:hover{ + .color_100_gray; + background-color: @egw_color_1_e; + + } + + // Icon before img.egw_fw_ui_sidemenu_listitem_icon { /*display: none;*/ @@ -1014,6 +1022,7 @@ padding: 5px 0px 5px 5px; text-decoration: none; min-width: 5em; + vertical-align: bottom; &:hover{ .color_100_gray; @@ -1065,20 +1074,9 @@ .color_0_gray; // width: auto; } - - } - - // Submenu Hover Item - gelb - &:hover{ - .color_100_gray; - background-color: @egw_color_1_e; - padding: 0.5em 0; - - } - } // .egw_fw_ui_sidemenu_listitem @@ -1194,12 +1192,12 @@ // ######################################## // APPS // CHrome hack - @media screen and (-webkit-min-device-pixel-ratio:0) { +/* @media screen and (-webkit-min-device-pixel-ratio:0) { #egw_fw_tabs { - /*Chrome needs margin-top*/ + Chrome needs margin-top margin-top: 3px; } - } + }*/ // ####################################### // AREA for Content @@ -1208,6 +1206,7 @@ background-color: transparent; float: left; width: 100%; + margin-top: 3px; // ############################################################