From 2c905c6847471eb644f4cfed0b47f9b236cf49cc Mon Sep 17 00:00:00 2001 From: Stefan Reinhardt Date: Tue, 1 Apr 2014 09:14:34 +0000 Subject: [PATCH] pixelegg less - latest update --- pixelegg/css/pixelegg.css | 327 ++++++++------------- pixelegg/images/list.png | Bin 1393 -> 2548 bytes pixelegg/images/list_alt.png | Bin 0 -> 1323 bytes pixelegg/js/slider.js | 36 +-- pixelegg/less/def_buttons.less | 43 +-- pixelegg/less/etemplate2.less | 2 +- pixelegg/less/layout_content_elements.less | 4 +- pixelegg/less/layout_dialog.less | 7 +- pixelegg/less/layout_footer.less | 16 +- pixelegg/less/layout_loginPage.less | 6 +- pixelegg/less/layout_raster.less | 183 ++++++------ 11 files changed, 278 insertions(+), 346 deletions(-) create mode 100644 pixelegg/images/list_alt.png diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index dbd7dfff5d..16aa290fa2 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -116,11 +116,9 @@ */ .et2_button { text-shadow: 0px 0px !important; - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -285,11 +283,9 @@ * Link_entry_widget */ div.et2_link_to button { - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -488,7 +484,7 @@ ################################################################*/ .nextmatch_header_row > .search { padding: 0 0 0 0px; - margin-right: 3px; + margin-right: 15px; margin-left: 15px; width: 200px; z-index: 100; @@ -754,7 +750,7 @@ color: #0c5da5; line-height: 0.6em; padding-left: 0.1em; - padding-right: 4em; + padding-right: 100em; } button#admin-categories-index_add:active { background-color: #1aa200; @@ -1359,11 +1355,9 @@ span.ui-icon-search { background-color: #679fd2; } .ui-dialog-buttonset button { - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -1835,11 +1829,9 @@ div#ui-datepicker-div { } #egwpopup input#egwpopup_ok_button, #egwpopup button#desktop_perms { - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -1928,91 +1920,25 @@ td.message span.message { * http://cssreset.com * fieldset legend */ -html, -body, -div, -span, -applet, -object, -iframe, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -big, -cite, -code, -del, -dfn, -em, -img, -ins, -kbd, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -b, -u, -i, -center, -dl, -dt, -dd, -ol, -ul, -li, -form, -label, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td, -article, -aside, -canvas, -details, -embed, -figure, -figcaption, -footer, -header, -hgroup, -menu, -nav, -output, -ruby, -section, -summary, -time, -mark, -audio, -video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; -} +/* html, body, div, span, applet, object, iframe, + h1, h2, h3, h4, h5, h6, p, blockquote, pre, + a, abbr, acronym, address, big, cite, code, + del, dfn, em, img, ins, kbd, q, s, samp, + small, strike, strong, sub, sup, tt, var, + b, u, i, center, + dl, dt, dd, ol, ul, li, + form, label, + table, caption, tbody, tfoot, thead, tr, th, td, + article, aside, canvas, details, embed, + figure, figcaption, footer, header, hgroup, + menu, nav, output, ruby, section, summary, + time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + }*/ /* HTML5 display-role reset for older browsers */ article, aside, @@ -2789,11 +2715,9 @@ input[type=button]:active { * ######################################################################################## */ button.et2_button_with_image { - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -2849,11 +2773,9 @@ button.et2_button_delete { /*background-color: @color_negative_action_hover !important;*/ background-image: url('../images/delete.png') !important; margin-left: 3em; - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -2891,11 +2813,9 @@ button[id="displayToolbar-delete"]:hover, button.et2_button_delete:hover { background-image: url('../images/delete-hover.png') !important; background-color: #b81f00 !important; - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -2932,11 +2852,9 @@ button[id="displayToolbar-delete"]:active, button.et2_button_delete:active { background-image: url('../images/delete-hover.png') !important; background-color: #e12500 !important; - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -3004,11 +2922,9 @@ button#filemanager-select_button[ok]:active { } #passwordchange { background-image: url('../images/cancel.png') !important; - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -3071,11 +2987,9 @@ button.et2_button_question:active { button[id="cancel"], button#cancel { background-image: url('../images/cancel.png') !important; - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -3117,11 +3031,9 @@ button#cancel:active { } #passwordcancel { background-image: url('../images/cancel.png') !important; - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -3177,11 +3089,9 @@ button.add:before { } button[id="add"] { background-image: url('../images/add.png') !important; - border: 1px solid rgba(0, 0, 0, 0.15); + /*.border_normal;*/ /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.rounded (3px);*/ color: #000000; -webkit-appearance: none; -webkit-transition-property: background-color; @@ -3637,6 +3547,8 @@ table.nextmatch_header img { height: 100%; width: auto; border-bottom: 0px solid #7E7E7E; + margin: 0 -2%; + background-color: #679fd2; } #loginMainDiv #divAppIconBar { margin-left: auto; @@ -3667,7 +3579,7 @@ table.nextmatch_header img { background-repeat: repeat-x; } #loginMainDiv div#centerBox { - margin: 2% 14% auto auto; + margin: 0% auto; width: 444px; background-color: #ffffff; z-index: 100; @@ -3684,10 +3596,7 @@ table.nextmatch_header img { border-bottom-left-radius: 5px; border-top-left-radius: 25px; /*.background-clip(padding-box);*/ - border-top: solid 1px #ffc200; - border-left: solid 1px #679fd2; - border-right: solid 1px #ffc200; - border-bottom: solid 1px #679fd2; + /*.bordered (@egw_color_1_a, @egw_color_1_a, @egw_color_2_e, @egw_color_2_e );*/ border-width: 14px; } #loginMainDiv div#centerBox #loginScreenMessage { @@ -3917,6 +3826,7 @@ table.nextmatch_header img { #egw_fw_header { width: 100%; float: left; + background-color: #679fd2; /* Logo EGW or Company - left top*/ /* ########################################################################################################################################### Topmenu / Home / Einstellungen / Zugriff / Kategorien usw.. @@ -3930,7 +3840,7 @@ table.nextmatch_header img { margin-left: -8px; text-align: center; height: 45px; - background-color: #fafafa; + /*.background_color_5_gray;*/ } #egw_fw_header #egw_divLogo img { width: 209px; @@ -3938,7 +3848,7 @@ table.nextmatch_header img { position: absolute; top: 0.41em; left: 1em; - background-color: #fafafa; + /*.background_color_5_gray;*/ } #egw_fw_header #egw_fw_topmenu ul, #egw_fw_header #egw_fw_topmenu > * > ul > li, @@ -3949,10 +3859,11 @@ table.nextmatch_header img { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items { float: left; - padding-top: 10px; + padding-top: 14px; width: 70%; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul { + margin: 5px 2px; /*Home*/ /*home*/ /*Setup / Einstellungen*/ @@ -3964,29 +3875,11 @@ table.nextmatch_header img { /*logout*/ } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li { + color: #ffffff; /*.Button_size_square_32;*/ - padding: 0.3em 0.4em; - border: 1px solid rgba(0, 0, 0, 0.15); - /*.box_shadow_standard_light;*/ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - color: #000000; - -webkit-appearance: none; - -webkit-transition-property: background-color; - -moz-transition-property: background-color; - -o-transition-property: background-color; - transition-property: background-color; - -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; - background-color: #b4b4b4; - background-color: #e6e6e6; + padding: 8px 10px; + /*.Complete_Button_normal;*/ + /*background-color: @gray_10;*/ -webkit-transition: all 0.2s ease-out; -moz-transition: all 0.2s ease-out; -o-transition: all 0.2s ease-out; @@ -3997,7 +3890,7 @@ table.nextmatch_header img { -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; - color: #000000; + color: #ffffff; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:active { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -4007,14 +3900,21 @@ table.nextmatch_header img { #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a { color: #000000; text-decoration: none; - height: 16px; + height: 32px; /*font-size: 1.1em;*/ + font-size: 12.100000000000001px; + line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { - color: #808080; + color: #e6e6e6; border-color: #828282; text-decoration: none !important; } +#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:before { + /*.img_filter_gray;*/ + /*-webkit-filter: grayscale(100%) brightness(100%) contrast(100%);*/ + /*-webkit-filter: invert(100%);*/ +} #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:first-child { margin-left: 10px; } @@ -4026,11 +3926,13 @@ table.nextmatch_header img { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before { padding-right: 20px; + font-size: 12.100000000000001px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; - width: 12px; - height: 12px; + background-size: 20px 20px; + width: 24px; + height: 24px; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_prefs { margin-left: 0px; @@ -4040,6 +3942,7 @@ table.nextmatch_header img { content: ""; background-image: url(../images/topmenu_items/setup.png); background-repeat: no-repeat; + /* background-size: 20px 20px;*/ width: 12px; height: 12px; } @@ -4115,6 +4018,7 @@ table.nextmatch_header img { float: left; position: relative; left: -5px; + cursor: pointer; } /*Icon ARROW UP*/ #egw_fw_topmenu_slide.slideup { @@ -4125,6 +4029,7 @@ table.nextmatch_header img { display: block; margin-top: -36px; margin-left: 40px; + cursor: pointer; } #slidetoggle { width: 20px; @@ -4149,13 +4054,9 @@ table.nextmatch_header img { z-index: 200; width: 16px; height: 16px; - border: 1px solid rgba(0, 0, 0, 0.15); - -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); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + /*.border_normal;*/ + /*.box_shadow_standard_light;*/ + /*.border_radius_button_normal;*/ padding: 0.5em; top: 5px; position: fixed; @@ -4201,36 +4102,36 @@ table.nextmatch_header img { &:focus {.box_shadow_standard_light_inset;}*/ } /*################################################# -/* Second Line +/* Second Line /* e.g. Name / Datum / angemeldete User ###################################################*/ #egw_fw_topmenu_info_items { - bottom: 0px; - right: 0px; - padding-right: 0px; - position: relative; - z-index: 1000; - margin-right: 4px; - float: right; - display: flex; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - flex-direction: row; - justify-content: flex-start; - -webkit-flex-direction: row; - -webkit-justify-content: flex-start; - -ms-flex-direction: row; - -ms-justify-content: flex-start; - /* bottom: 3px; - display: flex; + /* bottom: 0px; + right: 0px; + padding-right: 0px; + position: relative; + z-index: 1000; + margin-right: 4px; + float: right; - height: 0; - margin-right: 20px; - padding-right: 20px; - position: fixed; - right: 5px; - z-index: 1000;*/ + + display: flex; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + + flex-direction: row; + justify-content: flex-start; + + -webkit-flex-direction: row; + -webkit-justify-content: flex-start; + -ms-flex-direction: row; + -ms-justify-content: flex-start;*/ + position: fixed; + z-index: 1000; + bottom: -8px; + right: 5px; + padding-right: 20px; /*Notification*/ /*user info*/ /*current user info*/ @@ -4274,8 +4175,8 @@ table.nextmatch_header img { padding: 0px; } #egw_fw_topmenu_info_items #topmenu_info_quick_add span#quick_add { - border: 1px solid rgba(0, 0, 0, 0.15); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); + /*border: 1px solid rgba(0, 0, 0, 0.15);*/ + /*box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);*/ float: right; padding: 0.5em; position: fixed; @@ -4411,11 +4312,11 @@ table.nextmatch_header img { #egw_fw_sidebar { position: fixed; overflow: hidden; - top: 57px; + top: 43px; left: 0px; bottom: 20px; width: 225px; - background-color: #fafafa; + /*.background_color_5_gray;*/ /*#################################*/ } #egw_fw_sidebar #egw_fw_sidemenu { @@ -4917,6 +4818,8 @@ table.nextmatch_header img { display: block; overflow-x: hidden; overflow-y: auto; + padding: 0 10px; + background-color: #cdcdcd; /* background-color: RGB(240, 240, 255);*/ } .egw_fw_content_browser_div_loading { @@ -5158,7 +5061,7 @@ button.image_button { * * Version 08.2013 * Author Stefan Reinhardt, Wolfgang Ott - * + * */ /* ################################################# * FOOTER @@ -5167,7 +5070,7 @@ button.image_button { #egw_fw_footer { position: fixed; bottom: 0px; - width: 100%; + width: 50%; text-align: left; padding: 3px; clear: both; @@ -5211,6 +5114,12 @@ button.image_button { }*/ div#popupMainDiv { padding: 8px; + background-color: #ffffff; + background-image: url(../images/bgDialog.png); + background-repeat: repeat-x; +} +div#popupMainDiv > * { + margin: 0px; } div.et2_container { padding: 0; diff --git a/pixelegg/images/list.png b/pixelegg/images/list.png index 15c40c84b17046e4be686458ca209dbf029b9710..01d1002659f8ceaf1ba1b87ab74ab664d1208447 100755 GIT binary patch delta 1910 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 diff --git a/pixelegg/images/list_alt.png b/pixelegg/images/list_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..333f56c66c4aeb11dea9b4f64a7cb27888c65e1a GIT binary patch literal 1323 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|80+w{G(j&jGsVi$(9y!e!qwE#+04Sw(AC(|*~Hk<+0xY1+{wk+ z&C&^`*Cju>G&eP`1g19yq1OzjUQklVEdbi=l3J8mmYU*Ll%J~r_OewbZnpsK$K@7? z-W1$!F~O-F! zPr?ne4>?He?N)aa)QV8_)0LIE)UacTg$PTmRS9Q_e#whxFJ4{n{ZOAGBxAh8ved-F zf<>lF_2s1ylg^z-;+kIi|L}Xk{?KFE_jk4N_jVtieDaB;;uY7LEH|MKA1nUMIRCu= z!i&Fk@~SKWTcdchw?=Vr=0%1XMtXjGSkWS?(D%4RRN%SN&36k$Pkb<9vfyB9bm#Wi z8}~oQL@G>gI&Q!Es z#kSneoqqgFx~_kFfq}%GPYQ-oz0)eJ=I)!Z?B|i@2A$JZor_i^OB{<`7|@}3F!s8r zM5BJuFIA;!>>@K7D#ZML)Ng)pzRUmpjn6iESpuGu?5g(O+pTcm(e^0aIguMTMd++s z&=AS?ycu|?m^^(~7qY}-F zvuA~=Bud;{fBp6Bpp`7MSZAMYGhn)Vh215vM|&z)t6G6w*qO&kMP-RC<-27cE@YT@ l{&{}i color-negative-action // red * - ######################################################################################## */ + ######################################################################################## */ .Complete_Button_delete{ /*background-color: @color_negative_action_hover !important;*/ @@ -137,54 +138,54 @@ .Complete_Button_text_icon_before; /*background-color: @color-negative-action !important;*/ /*color: @gray_0 !important;*/ - + &:hover { background-image:url('../images/delete-hover.png') !important; background-color: @color_negative_action_hover !important; .Complete_Button_text_icon_before; color: @gray_0 !important;; - } + } &:active { background-image:url('../images/delete-hover.png') !important; background-color: @color_negative_action_active !important; .Complete_Button_text_icon_before; color: @gray_0; - } + } } /* ######################################################################################## - * + * * Button cancel / => color-cancel-action // yellow * ######################################################################################## */ .Complete_Button_cancel{ - + background-image:url('../images/cancel.png') !important; .Complete_Button_text_icon_before; content: "ID missing"; - - + + &:hover {background-color: @color_cancel_action_hover !important; color: @gray_100; .box_shadow_standard_light_hover;} &:active {background-color: @color_cancel_action_active !important; color: @gray_100; .box_shadow_standard_light_inset;} - + } /* ######################################################################################## - * + * * Button edit + save + apply + copy => color-positive-action // green * - ######################################################################################## */ + ######################################################################################## */ .Complete_Button_save_apply_copy{ - + img[url*="svg"]{.gradient_vertical (@gray_30, @gray_30); fill: red;} - - + + &:hover { - background-color: @color_positive_action; - color: @gray_100; + background-color: @color_positive_action; + color: @gray_100; .box_shadow_standard_light_hover; } &:active {background-color: @color_positive_action_active;} diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index c72d528baf..ac38b9216e 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -383,7 +383,7 @@ div.header_row_right{ .nextmatch_header_row > .search{ padding: 0 0 0 0px; - margin-right: 3px; + margin-right: 15px; margin-left: 15px; width: 200px; z-index: 100; diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index a6c06bdb8e..ca92eb2b9c 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -21,7 +21,7 @@ * http://cssreset.com * fieldset legend */ - html, body, div, span, applet, object, iframe, +/* html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, @@ -39,7 +39,7 @@ border: 0; font-size: 100%; font: inherit; - } + }*/ /* HTML5 display-role reset for older browsers */ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index a30e8e8857..df64bcff20 100755 --- a/pixelegg/less/layout_dialog.less +++ b/pixelegg/less/layout_dialog.less @@ -28,10 +28,15 @@ // Dialoge Allgemeine Definition div#popupMainDiv { - padding: 8px; + padding: 8px; + background-color: @gray_0; + background-image: url(../images/bgDialog.png); + background-repeat: repeat-x; } +div#popupMainDiv > * {margin: 0px;} + div.et2_container { // .background-color-25-gray; diff --git a/pixelegg/less/layout_footer.less b/pixelegg/less/layout_footer.less index 57ad21d90b..df23202eb3 100644 --- a/pixelegg/less/layout_footer.less +++ b/pixelegg/less/layout_footer.less @@ -6,9 +6,9 @@ * * Version 08.2013 * Author Stefan Reinhardt, Wolfgang Ott - * + * */ - + @import "def_design_pattern_color_font_shadow.less"; /* ################################################# @@ -18,23 +18,23 @@ #egw_fw_footer { position: fixed; bottom: 0px; - width: 100%; + width: 50%; text-align: left; padding: 3px; clear: both; opacity: 1; - + z-index: 100; - + color: @gray_50; - + a {color: @gray_60;} - + a:last-child:after {content: " + Layout: pixelegg";} } - + #egw_fw_footer:hover { opacity: 0.1; transition: opacity .5s ease-out; diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less index 3352a89a16..8bc9b737e2 100644 --- a/pixelegg/less/layout_loginPage.less +++ b/pixelegg/less/layout_loginPage.less @@ -34,6 +34,8 @@ height: 100%; width: auto; border-bottom: 0px solid #7E7E7E; + margin: 0 -2%; + background-color: @egw_color_2_e; // Logo Leiste #divAppIconBar{ @@ -60,13 +62,13 @@ // Anmeldefenster / Box mit Mesaage + Form div#centerBox{ - margin: 2% 14% auto auto; + margin: 0% auto; width: 444px; background-color: @gray_0; z-index: 100; .border_radius (5px, 5px, 5px, 25px); - .bordered (@egw_color_1_a, @egw_color_1_a, @egw_color_2_e, @egw_color_2_e ); + /*.bordered (@egw_color_1_a, @egw_color_1_a, @egw_color_2_e, @egw_color_2_e );*/ border-width: 14px; diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index b78ca299db..fbfd92dabc 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -42,6 +42,7 @@ width: 100%; float: left; + background-color: @egw_color_2_e; /* Logo EGW or Company - left top*/ #egw_divLogo { @@ -51,7 +52,7 @@ margin-left: -8px; text-align: center; height: 45px; - .background_color_5_gray; + /*.background_color_5_gray;*/ img { width: 209px; @@ -59,7 +60,7 @@ position: absolute; top: 0.41em; left: 1em; - .background_color_5_gray; + /*.background_color_5_gray;*/ } } @@ -80,37 +81,48 @@ #egw_fw_topmenu{ - - + + #egw_fw_topmenu_items { float: left; - padding-top: 10px; + padding-top: 14px; width: 70%; ul { + margin: 5px 2px; + li{ - .color_100_gray; + color: @gray_0; /*.Button_size_square_32;*/ - padding: 0.3em 0.4em; - .Complete_Button_normal; - background-color: @gray_10; + padding: 8px 10px; + /*.Complete_Button_normal;*/ + /*background-color: @gray_10;*/ - &:hover{.Complete_Button_hover; color: @gray_100;} + &:hover{.Complete_Button_hover; color: @gray_0;} &:active {.Complete_Button_active;} .transition (0.2s, ease-out); a { - .color_100_gray; + color: @gray_100; text-decoration: none; - .dimension_height_s; + .dimension_height_l; /*font-size: 1.1em;*/ + .fontsize_l; + line-height: 1.5em; + &:hover { - .color_50_gray; + color: @gray_10; border-color: @gray_50; text-decoration: none !important; } + + &:before { + /*.img_filter_gray;*/ + /*-webkit-filter: grayscale(100%) brightness(100%) contrast(100%);*/ + /*-webkit-filter: invert(100%);*/ + } } } @@ -126,10 +138,12 @@ margin-left: 0px; &:before { padding-right: 20px; + .fontsize_l; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; - .dimension_width_height_xs; + background-size: 20px 20px; + .dimension_width_height_m; } } @@ -143,6 +157,7 @@ content: ""; background-image: url(../images/topmenu_items/setup.png); background-repeat: no-repeat; +/* background-size: 20px 20px;*/ .dimension_width_height_xs; } } @@ -246,6 +261,7 @@ float: left; position: relative; left: -5px; + cursor: pointer; } /*Icon ARROW UP*/ @@ -257,6 +273,7 @@ display: block; margin-top: -36px; margin-left: 40px; + cursor: pointer; } @@ -289,9 +306,9 @@ margin-top: 0px; z-index: 200; .Button_size_square_16; - .border_normal; - .box_shadow_standard_light; - .border_radius_button_normal; + /*.border_normal;*/ + /*.box_shadow_standard_light;*/ + /*.border_radius_button_normal;*/ padding: 0.5em; top: 5px; position: fixed; @@ -335,14 +352,14 @@ /*################################################# -/* Second Line +/* Second Line /* e.g. Name / Datum / angemeldete User ###################################################*/ #egw_fw_topmenu_info_items { - bottom: 0px; +/* bottom: 0px; right: 0px; padding-right: 0px; position: relative; @@ -362,19 +379,15 @@ -webkit-flex-direction: row; -webkit-justify-content: flex-start; -ms-flex-direction: row; - -ms-justify-content: flex-start; - - + -ms-justify-content: flex-start;*/ + + // move to bottom of the page -/* bottom: 3px; - display: flex; - float: right; - height: 0; - margin-right: 20px; - padding-right: 20px; position: fixed; + z-index: 1000; + bottom: -8px; right: 5px; - z-index: 1000;*/ + padding-right: 20px; .topmenu_info_item { @@ -439,30 +452,30 @@ // Fist you see an ADD Icon, via Mouseover it expand right, to an select field span#quick_add { - border: 1px solid rgba(0, 0, 0, 0.15); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); + /*border: 1px solid rgba(0, 0, 0, 0.15);*/ + /*box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);*/ float: right; padding: 0.5em; position: fixed; right: 45px; top: 5px; - + background-image: url(../images/add.png); background-repeat: no-repeat; background-size: 20px 20px; background-position: 4px 4px; - + .border_radius_button_normal; .dimension_width_height_s; - + &:before { - content: " "; - font-size: 2em; - color: @egw_color_2_a; + content: " "; + font-size: 2em; + color: @egw_color_2_a; line-height: 0.6em; background-color: white; } - + &:hover {.box_shadow_standard_light_hover;} &:focus {.box_shadow_standard_light_inset;} } @@ -542,11 +555,11 @@ #egw_fw_sidebar { position: fixed; overflow: hidden; - top: 57px; + top: 43px; left: 0px; bottom: 20px; width: 225px; - .background_color_5_gray; + /*.background_color_5_gray;*/ //SIDE AREA #egw_fw_sidemenu { @@ -559,7 +572,7 @@ z-index: 0; padding-top: 0.6em; font-size: 0.9em; - + // SIDE AREA .egw_fw_ui_scrollarea_outerdiv{ .background_color_5_gray; @@ -576,7 +589,7 @@ } } - + //#################################################### // All Tabs // DRAG AND DROP @@ -668,26 +681,26 @@ // ## ## // ## ## // ######################################## - + // ######################################## // ## ## // ## ## // ######################################## - + // ######################################## // ## ## // ## ## - // ######################################## - + // ######################################## + // ######################################## // ## div.egw_fw_ui_category ## // ## &:nth-last-of-type(-n+3) ## - // ##################################### - - - - - + // ##################################### + + + + + .egw_fw_ui_sidemenu_entry_content { display: block; background-image: none; @@ -697,7 +710,7 @@ border-width: 0px; margin: 0 0 2em 0; - + // rounded Corner on bottom &:nth-last-of-type(-n+3) { padding: 5px 0.3em 1.5em 0.3em; @@ -707,8 +720,8 @@ border-color: @gray_30; } - - + + //################################################### // *letztes Element */ // has round corners @@ -750,7 +763,7 @@ } //################################# - // Hover + // Hover // on Mouse over change color .egw_fw_ui_category:hover { .background_color_40_gray; @@ -783,7 +796,7 @@ img {.dimension_width_height_s;} - + &:hover { padding: 5px 30px 5px 0px; width: 200px; @@ -792,7 +805,7 @@ .Complete_Button_hover; } } - + } &:hover {background-color: @egw_color_2_d; .transition (0.2s, ease-out);} @@ -873,18 +886,18 @@ // ## ############################# ## // ## ## // ######################################## - - // ######################################## - // ## ## - // ## ## - // ######################################## - - // ######################################## - // ## ## - // ## ## - // ######################################## - + // ######################################## + // ## ## + // ## ## + // ######################################## + + // ######################################## + // ## ## + // ## ## + // ######################################## + + .egw_fw_ui_category_content { .background_color_0_gray; @@ -939,18 +952,18 @@ // ## ############################# ## // ## ## // ######################################## - - // ######################################## - // ## ## - // ## ## - // ######################################## - - // ######################################## - // ## ## - // ## ## - // ######################################## - + // ######################################## + // ## ## + // ## ## + // ######################################## + + // ######################################## + // ## ## + // ## ## + // ######################################## + + // Sub Sub Menu Item @@ -1072,7 +1085,7 @@ // ############################################################## // ## ## -// ## ## +// ## ## // Scrollarea .egw_fw_ui_scrollarea @@ -1133,6 +1146,8 @@ display: block; overflow-x: hidden; overflow-y: auto; + padding: 0 10px; + background-color: @gray_20; /* background-color: RGB(240, 240, 255);*/ } @@ -1280,7 +1295,7 @@ .img_filter_gray; } - + // FOR SVG IMG object { .dimension_width_height_s; @@ -1347,8 +1362,8 @@ } // Ende Tabs } - - + + // ################################ // Hover // no effect ?