diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index a66d4c231d..cfae2993ad 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -347,7 +347,7 @@ -webkit-user-select: none; -moz-user-select: none; user-select: none; - min-width: 76px; + min-width: 73px; } .et2_tabflag:hover { color: #f2f2f2; @@ -387,7 +387,7 @@ background-image: none; } .et2_tabheader :first-child { - margin-left: 0.3em; + margin-left: 1px; } /** * Validation @@ -767,6 +767,10 @@ background-color: #ffffff; background-image: none; } + .et2_dropdown button img { + width: 12px; + height: 12px; + } .et2_dropdown button > div { vertical-align: middle; } @@ -781,20 +785,23 @@ .et2_dropdown button.ui-state-default { background-image: none !important; background-repeat: no-repeat !important; + /*&:hover {.Complete_Button_save_apply_copy;}*/ } .et2_dropdown button.ui-corner-left img, .et2_dropdown button.ui-state-default img { - width: 16px; - height: 16px; + width: 12px; + height: 12px; text-align: left; position: relative; right: 1px; top: 3px; } + .et2_dropdown button.ui-corner-left:active, + .et2_dropdown button.ui-state-default:active { + background-color: #1aa200; + } .et2_dropdown button.ui-state-hover { - background-color: #b4b4b4 !important; - background-size: 16px 16px !important; - background-position: 10px center !important; + background-color: #e6e6e6; } .sidebox-favorites ul.favorites { width: 99%; @@ -2708,6 +2715,7 @@ button.et2_button_with_image { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-size: 20px auto !important; @@ -2716,7 +2724,7 @@ button.et2_button_with_image { background-repeat: no-repeat !important; background-position: 6px center; background-size: 20px 20px; - background-color: #b4b4b4; + background-color: #e6e6e6; } button.et2_button_with_image background-color[url$="svg"] { background-color: #b4b4b4; diff --git a/pixelegg/images/prio_high.png b/pixelegg/images/prio_high.png index 41ea863515..e794b9b23b 100755 Binary files a/pixelegg/images/prio_high.png and b/pixelegg/images/prio_high.png differ diff --git a/pixelegg/images/prio_low.png b/pixelegg/images/prio_low.png index 25c253a0fa..f856832ce7 100755 Binary files a/pixelegg/images/prio_low.png and b/pixelegg/images/prio_low.png differ diff --git a/pixelegg/images/scroll.png b/pixelegg/images/scroll.png index c9eafd37d6..607914e9a6 100644 Binary files a/pixelegg/images/scroll.png and b/pixelegg/images/scroll.png differ diff --git a/pixelegg/images/scroll_hover.png b/pixelegg/images/scroll_hover.png index 8deeabf33a..10396f8ab0 100644 Binary files a/pixelegg/images/scroll_hover.png and b/pixelegg/images/scroll_hover.png differ diff --git a/pixelegg/images/view.png b/pixelegg/images/view.png new file mode 100755 index 0000000000..422d439029 Binary files /dev/null and b/pixelegg/images/view.png differ diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index e2aedf242e..f07c110795 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -171,7 +171,7 @@ egw_LAB.wait(function() { if (ev.relatedTarget && ev.relatedTarget.id != 'quick_add_selectbox') { $j(this).css({ - transition: "0.2s ease-out 0s", + transition: "0.6s ease-out 0s", width: "16px", 'border-top-left-radius': "0px", 'background-color': "transparent" diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index fbb7b7047a..7edb18358a 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -251,7 +251,7 @@ div.et2_link_entry{ -webkit-user-select: none; -moz-user-select: none; user-select: none; - min-width: 76px; + min-width: 73px; &:hover { .color_5_gray; .background_color_25_gray; @@ -294,7 +294,7 @@ div.et2_link_entry{ margin: 0 2px; background-image: none; :first-child { - margin-left: 0.3em; + margin-left: 1px; } } @@ -603,6 +603,9 @@ hr { background-image: none; // width: 50px; + // Filter img + img{.dimension_width_height_xs;} + } button > div { vertical-align: middle; @@ -623,36 +626,26 @@ hr { // background-size: 10px 10px; img { - .dimension_width_height_s; + .dimension_width_height_xs; text-align: left; position: relative; right: 1px; top: 3px; - } + } + + /*&:hover {.Complete_Button_save_apply_copy;}*/ + &:active {background-color: @color_positive_action_active;} } /*right Button*/ - button.ui-corner-right { -// background-image: url("../images/fav_filter_normal.png"); -// background-repeat: no-repeat !important; -// background-size: 10px 10px; - } + button.ui-corner-right {} /* hover */ - button.ui-state-hover { - background-color: @gray_30 !important; -// background-image: url("../images/fav_filter_normal.png") !important; -// background-repeat: no-repeat !important; - background-size: 16px 16px !important; - background-position: 10px center !important; - } + button.ui-state-hover { background-color: @gray_10; } - button.ui-state-hover > img { -// position: absolute; -// top: 70000px; - } + button.ui-state-hover > img {} diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index b213d02f15..cf78a6865c 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -945,7 +945,7 @@ button.et2_button_with_image{ background-repeat: no-repeat !important; background-position: 6px center; background-size: 20px 20px; - background-color: @gray_30; + background-color: @gray_10; background-color[url$="svg"]{.gradient_vertical (@gray_30, @gray_30);} }