change in nextmatch:

input, search, count, favorites : delete box-shadow: make it more flat
This commit is contained in:
Stefan Reinhardt 2014-02-28 17:44:23 +00:00
parent 5481286179
commit 8ece4ae74c
10 changed files with 151 additions and 58 deletions

View File

@ -451,13 +451,24 @@
height: 16px; height: 16px;
} }
.ui-helper-clearfix { .ui-helper-clearfix {
background-color: #f0f0f0; background-color: gray_20;
} }
.nextmatch_header .header_count { .nextmatch_header .header_count {
font-size: 11px;
position: relative; position: relative;
top: 3px; top: 3px;
height: 22px; height: 22px;
height: 24px;
border: 1px solid #E0E0E0;
float: right;
margin: 6px 11px 0;
padding: 0 20px;
text-align: center;
font-size: 11px;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
color: #000000;
} }
.nextmatch_header .header_count span { .nextmatch_header .header_count span {
font-size: 11px; font-size: 11px;
@ -477,7 +488,7 @@
border: none !important; border: none !important;
border-color: #000000; border-color: #000000;
background-image: none !important; background-image: none !important;
height: 37px; min-height: 37px;
-webkit-border-top-right-radius: 3px; -webkit-border-top-right-radius: 3px;
-webkit-border-bottom-right-radius: 3px; -webkit-border-bottom-right-radius: 3px;
-webkit-border-bottom-left-radius: 0px; -webkit-border-bottom-left-radius: 0px;
@ -521,7 +532,8 @@
.nextmatch_header > .search { .nextmatch_header > .search {
padding: 0 0 0 3px; padding: 0 0 0 3px;
margin-right: 3px; margin-right: 3px;
background-color: #b4b4b4; margin-left: 15px;
/*.background_color_search;*/
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-webkit-border-top-right-radius: 20px; -webkit-border-top-right-radius: 20px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
@ -535,6 +547,7 @@
border: none; border: none;
font-size: 11px; font-size: 11px;
color: #000000; color: #000000;
padding: 3px;
} }
.nextmatch_header > .search input::-webkit-input-placeholder { .nextmatch_header > .search input::-webkit-input-placeholder {
/* WebKit browsers */ /* WebKit browsers */
@ -638,6 +651,7 @@
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
box-shadow: none;
margin-right: 1em; margin-right: 1em;
width: 16px; width: 16px;
height: 16px; height: 16px;
@ -667,7 +681,9 @@
.et2_nextmatch .nextmatch_header { .et2_nextmatch .nextmatch_header {
border: none; border: none;
background-image: none; background-image: none;
background-color: #cdcdcd;
margin-bottom: 3px; margin-bottom: 3px;
margin: 0;
} }
.et2_nextmatch .nextmatch_header > .filters { .et2_nextmatch .nextmatch_header > .filters {
border: 1px solid #e6e6e6; border: 1px solid #e6e6e6;
@ -741,9 +757,7 @@
.nextmatch_header div[id$=favorite_wrapper] { .nextmatch_header div[id$=favorite_wrapper] {
/* margin-top: 6px; /* margin-top: 6px;
vertical-align: middle;*/ vertical-align: middle;*/
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); /*.box_shadow_standard_light;*/
-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; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
@ -758,7 +772,7 @@
/* hover */ /* hover */
} }
.et2_dropdown button { .et2_dropdown button {
height: 3.0ex; height: 24px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: -2px; margin-right: -2px;
@ -1245,6 +1259,30 @@ span.ui-icon-search {
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
.ui-corner-all,
.ui-corner-bottom,
.ui-corner-left,
.ui-corner-bl {
border-bottom-left-radius: 3px;
}
.ui-corner-all,
.ui-corner-top,
.ui-corner-left,
.ui-corner-tl {
border-top-left-radius: 3px;
}
.ui-corner-all,
.ui-corner-bottom,
.ui-corner-right,
.ui-corner-br {
border-bottom-right-radius: 3px;
}
.ui-corner-all,
.ui-corner-top,
.ui-corner-right,
.ui-corner-tr {
border-top-right-radius: 3px;
}
/*###########################################*/ /*###########################################*/
/*Dialog: edit row*/ /*Dialog: edit row*/
.ui-widget-content { .ui-widget-content {
@ -1774,24 +1812,19 @@ div#egwpopup_message {
border-width: 9px 0px 0px 0px; border-width: 9px 0px 0px 0px;
border-style: solid; border-style: solid;
border-color: #b4b4b4; border-color: #b4b4b4;
background-color: #b3b3b3 !important; background-color: #cdcdcd;
} }
.egw_fw_ui_app_header_container .egw_fw_ui_app_header { .egw_fw_ui_app_header_container .egw_fw_ui_app_header {
border-width: 0px 0px 0px 0px; /*border-width: 0px 0px 0px 0px;*/
border-style: solid; /*border-style: solid;*/
border-color: #e6e6e6; /*border-color: @gray_10;*/
-webkit-border-radius: 3px; /*.border_radius_button_righttop;*/
-webkit-border-top-right-radius: 20px; padding: 7px 2px 6px 20px;
-moz-border-radius: 3px;
-moz-border-radius-topright: 20px;
border-radius: 3px;
border-top-right-radius: 20px;
padding: 0px 2px 0px 15px;
/*font-size: 1em;*/ /*font-size: 1em;*/
font-weight: normal; font-weight: normal;
background-color: #f0f0f0; /*background-color: @gray_20;*/
color: #408dd2; color: #408dd2;
width: 80%; /*width: 80%;*/
height: auto; height: auto;
/*&:before {content: "! "; color: @egw_color_1_a; font-size: 1em; }*/ /*&:before {content: "! "; color: @egw_color_1_a; font-size: 1em; }*/
} }
@ -2133,9 +2166,7 @@ div.selectbox-wrapper ul li {
cursor: pointer; cursor: pointer;
} }
.sbHolder { .sbHolder {
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); /*.box_shadow_standard_light;*/
-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
width: auto; width: auto;
margin: 5px 0em 5px 5px; margin: 5px 0em 5px 5px;
padding: 3px; padding: 3px;
@ -3253,7 +3284,7 @@ table.table_passord_change td:first-child {
.nextmatch_header { .nextmatch_header {
background-color: #d9d9d9; background-color: #d9d9d9;
font-weight: normal; font-weight: normal;
padding: 2px; padding: 0 2px 2px 0;
border-width: 0; border-width: 0;
border-style: solid; border-style: solid;
border-color: #b4b4b4; border-color: #b4b4b4;
@ -3626,9 +3657,7 @@ table.nextmatch_header img {
padding: 0.5em; padding: 0.5em;
} }
#loginMainDiv div#centerBox form table.divLoginbox select { #loginMainDiv div#centerBox form table.divLoginbox select {
-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); /*.box_shadow_standard_light;*/
-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
width: auto; width: auto;
margin: 5px 0em 5px 5px; margin: 5px 0em 5px 5px;
padding: 3px; padding: 3px;
@ -4137,6 +4166,15 @@ table.nextmatch_header img {
-webkit-justify-content: flex-start; -webkit-justify-content: flex-start;
-ms-flex-direction: row; -ms-flex-direction: row;
-ms-justify-content: flex-start; -ms-justify-content: flex-start;
/* bottom: 3px;
display: flex;
float: right;
height: 0;
margin-right: 20px;
padding-right: 20px;
position: fixed;
right: 5px;
z-index: 1000;*/
/*Notification*/ /*Notification*/
/*user info*/ /*user info*/
/*current user info*/ /*current user info*/
@ -4495,15 +4533,15 @@ table.nextmatch_header img {
background-color: #b3b3b3 !important; background-color: #b3b3b3 !important;
-webkit-border-top-right-radius: 0; -webkit-border-top-right-radius: 0;
-webkit-border-bottom-right-radius: 0; -webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 27px; -webkit-border-bottom-left-radius: 24px;
-webkit-border-top-left-radius: 0; -webkit-border-top-left-radius: 0;
-moz-border-radius-topright: 0; -moz-border-radius-topright: 0;
-moz-border-radius-bottomright: 0; -moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 27px; -moz-border-radius-bottomleft: 24px;
-moz-border-radius-topleft: 0; -moz-border-radius-topleft: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 27px; border-bottom-left-radius: 24px;
border-top-left-radius: 0; border-top-left-radius: 0;
/*.background-clip(padding-box);*/ /*.background-clip(padding-box);*/
border-color: #b4b4b4; border-color: #b4b4b4;
@ -4524,7 +4562,7 @@ table.nextmatch_header img {
/*.background-clip(padding-box);*/ /*.background-clip(padding-box);*/
} }
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category { #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category {
margin: 10px 5px 0px 5px; margin: 4px 5px 5px 5px;
padding: 0.5em 1em; padding: 0.5em 1em;
cursor: pointer; cursor: pointer;
border-color: #b4b4b4; border-color: #b4b4b4;
@ -4875,7 +4913,7 @@ table.nextmatch_header img {
} }
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header {
margin: 0px 0 0 0; margin: 0px 0 0 0;
padding: 0px 1px 0px 1px; padding: 1px 1px 0px 0px;
background-position: bottom; background-position: bottom;
background-repeat: repeat-x; background-repeat: repeat-x;
background-color: transparent; background-color: transparent;
@ -4918,7 +4956,7 @@ table.nextmatch_header img {
background: transparent; background: transparent;
display: inline-table; display: inline-table;
margin: 0px 5px 0px 0px; margin: 0px 5px 0px 0px;
padding: 2px 2px 5px 2px; padding: 2px 2px 7px 2px;
cursor: pointer; cursor: pointer;
border-width: 1px 1px 0 1px; border-width: 1px 1px 0 1px;
border-style: solid; border-style: solid;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@ -20,12 +20,13 @@ function show_pixelegg_header(_toggle, _delay)
$j("#egw_fw_sidebar").animate({'top':'52px'},_delay); $j("#egw_fw_sidebar").animate({'top':'52px'},_delay);
$j("#egw_fw_tabs").animate({'margin-top':'12px'},_delay); $j("#egw_fw_tabs").animate({'margin-top':'12px'},_delay);
$j(".egw_fw_ui_tabs_header").css("padding", "1px 1px 0px 1px");
$j(".egw_fw_ui_sidemenu_entry_header_active").css("background-position","95% -3000px"); $j(".egw_fw_ui_sidemenu_entry_header_active").css("background-position","95% -3000px");
$j(_toggle).parent().removeClass("slidedown"); $j(_toggle).parent().removeClass("slidedown");
$j(_toggle).parent().addClass("slideup"); $j(_toggle).parent().addClass("slideup");
} }
//closed //closed = Topmenu is gone
function hide_pixelegg_header(_toggle, _delay) function hide_pixelegg_header(_toggle, _delay)
{ {
$j("#egw_fw_header").slideToggle(); $j("#egw_fw_header").slideToggle();
@ -33,7 +34,7 @@ function hide_pixelegg_header(_toggle, _delay)
$j("#egw_fw_topmenu_info_items").show(); $j("#egw_fw_topmenu_info_items").show();
$j("#egw_fw_logout").show(); $j("#egw_fw_logout").show();
$j("#egw_fw_print").show(); $j("#egw_fw_print").show();
$j("#egw_fw_tabs").animate({'margin-top':'0px', "top": "0px"},_delay); $j("#egw_fw_tabs").animate({'margin-top':'2px', "top": "0px"},_delay);
$j("#egw_fw_topmenu_info_items").animate({ $j("#egw_fw_topmenu_info_items").animate({
"bottom": "3px", "bottom": "3px",
"right": "5px", "right": "5px",
@ -51,6 +52,7 @@ function hide_pixelegg_header(_toggle, _delay)
$j(".egw_fw_ui_tabs_header").css("height", "34px"); $j(".egw_fw_ui_tabs_header").css("height", "34px");
//Tab //Tab
$j(".egw_fw_ui_tab_header").css("height", "24px"); $j(".egw_fw_ui_tab_header").css("height", "24px");
// ICON // ICON

View File

@ -194,7 +194,7 @@
// select // select
.Complete_Button_select{ .Complete_Button_select{
.box_shadow_standard_light; /*.box_shadow_standard_light;*/
width: auto; width: auto;
margin: 5px 0em 5px 5px; margin: 5px 0em 5px 5px;
padding:3px; padding:3px;

View File

@ -173,6 +173,9 @@
@color_negative_action_active : lighten(#AE1D00, 10%); @color_negative_action_active : lighten(#AE1D00, 10%);
@color_splitter_bar : @egw_color_1_a; @color_splitter_bar : @egw_color_1_a;
@color_splitter_bar_hover : @egw_color_1_a; @color_splitter_bar_hover : @egw_color_1_a;
@color_splitter_bar_active : @egw_color_1_a; @color_splitter_bar_active : @egw_color_1_a;

View File

@ -340,14 +340,27 @@ hr {
// area width left and right boxes // area width left and right boxes
.ui-helper-clearfix{.background_color_10_gray;} .ui-helper-clearfix{ background-color: gray_20;}
// count // count
.nextmatch_header .header_count { .nextmatch_header .header_count {
.fontsize_normal;
position: relative; position: relative;
top: 3px; top: 3px;
height: 22px; height: 22px;
.dimension_height_m;
border: 1px solid #E0E0E0;
float: right;
margin: 6px 11px 0;
padding: 0 20px;
text-align: center;
.fontsize_normal;
.border_normal;
.rounded (3px);
color: @gray_100;
// count number // count number
span { span {
@ -373,7 +386,7 @@ hr {
border: none !important; border: none !important;
border-color: @gray_100; border-color: @gray_100;
background-image: none !important; background-image: none !important;
height: 37px; min-height: 37px;
.border_radius (3px, 3px, 0px, 0px); .border_radius (3px, 3px, 0px, 0px);
select {margin-top: 10px;} select {margin-top: 10px;}
@ -415,8 +428,9 @@ hr {
padding: 0 0 0 3px; padding: 0 0 0 3px;
margin-right: 3px; margin-right: 3px;
margin-left: 15px;
.background_color_search; /*.background_color_search;*/
.border_radius_button_righttop; .border_radius_button_righttop;
input { input {
@ -425,6 +439,7 @@ hr {
border: none; border: none;
.fontsize_normal; .fontsize_normal;
color: @gray_100; color: @gray_100;
padding: 3px;
} }
input::-webkit-input-placeholder { input::-webkit-input-placeholder {
@ -506,6 +521,7 @@ hr {
margin-top: 8px; margin-top: 8px;
vertical-align: middle; vertical-align: middle;
.Complete_Button_Icon_normal; .Complete_Button_Icon_normal;
box-shadow: none;
margin-right: 1em; margin-right: 1em;
.dimension_width_height_s; .dimension_width_height_s;
padding: 2px; padding: 2px;
@ -520,8 +536,9 @@ hr {
.et2_nextmatch .nextmatch_header { .et2_nextmatch .nextmatch_header {
border: none; border: none;
background-image: none; background-image: none;
// background-color: transparent; background-color: @gray_20;
margin-bottom: 3px; margin-bottom: 3px;
margin: 0;
// margin-right: 3px; // margin-right: 3px;
} }
.et2_nextmatch .nextmatch_header > .filters { .et2_nextmatch .nextmatch_header > .filters {
@ -577,7 +594,7 @@ button#admin-categories-index_add {
.nextmatch_header div[id$=favorite_wrapper] { .nextmatch_header div[id$=favorite_wrapper] {
/* margin-top: 6px; /* margin-top: 6px;
vertical-align: middle;*/ vertical-align: middle;*/
.box_shadow_standard_light; /*.box_shadow_standard_light;*/
.border_radius_button_normal; .border_radius_button_normal;
.background_color_25_gray; .background_color_25_gray;
} }
@ -588,7 +605,7 @@ button#admin-categories-index_add {
.et2_dropdown{ .et2_dropdown{
button { button {
height: 3.0ex; .dimension_height_m;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: -2px; margin-right: -2px;

View File

@ -251,6 +251,24 @@ span.ui-icon-search{
.ui-corner-all{.rounded(3px)} .ui-corner-all{.rounded(3px)}
// e.g. Corner Favorites
.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl {
border-bottom-left-radius: 3px;
}
// e.g. Corner Favorites
.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
border-top-left-radius: 3px;
}
.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br {
border-bottom-right-radius: 3px;
}
.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
border-top-right-radius: 3px;
}
/*###########################################*/ /*###########################################*/
/*Dialog: edit row*/ /*Dialog: edit row*/

View File

@ -61,28 +61,29 @@
// Container für Meldungen / Message Container
.egw_fw_ui_app_header_container { .egw_fw_ui_app_header_container {
border-width: 9px 0px 0px 0px; border-width: 9px 0px 0px 0px;
border-style: solid; border-style: solid;
border-color: @gray_30; border-color: @gray_30;
.background_color_30_gray; background-color: @gray_20;
// Statusmeldung
// Meldung oberhalb iFrame // Meldung oberhalb iFrame
.egw_fw_ui_app_header { .egw_fw_ui_app_header {
// display: none !important; // display: none !important;
border-width: 0px 0px 0px 0px; /*border-width: 0px 0px 0px 0px;*/
border-style: solid; /*border-style: solid;*/
border-color: @gray_10; /*border-color: @gray_10;*/
.border_radius_button_righttop; /*.border_radius_button_righttop;*/
padding: 0px 2px 0px 15px; padding: 7px 2px 6px 20px;
/*font-size: 1em;*/ /*font-size: 1em;*/
font-weight: normal; font-weight: normal;
.background_color_10_gray; /*background-color: @gray_20;*/
color: @egw_color_2_d; color: @egw_color_2_d;
width: 80%; /*width: 80%;*/
height: auto; height: auto;
/*&:before {content: "! "; color: @egw_color_1_a; font-size: 1em; }*/ /*&:before {content: "! "; color: @egw_color_1_a; font-size: 1em; }*/

View File

@ -80,6 +80,8 @@
#egw_fw_topmenu{ #egw_fw_topmenu{
#egw_fw_topmenu_items { #egw_fw_topmenu_items {
float: left; float: left;
padding-top: 10px; padding-top: 10px;
@ -362,6 +364,18 @@
-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;
right: 5px;
z-index: 1000;*/
.topmenu_info_item { .topmenu_info_item {
overflow: visible; overflow: visible;
@ -688,7 +702,7 @@
padding: 5px 0.3em 1.5em 0.3em; padding: 5px 0.3em 1.5em 0.3em;
margin: 0 0 10px 0; margin: 0 0 10px 0;
.background_color_30_gray; .background_color_30_gray;
.border_radius (0, 0, 27px, 0); .border_radius (0, 0, 24px, 0);
border-color: @gray_30; border-color: @gray_30;
} }
@ -705,7 +719,7 @@
// Schaltflächen - Elements // Schaltflächen - Elements
// Normal // Normal
.egw_fw_ui_category { .egw_fw_ui_category {
margin: 10px 5px 0px 5px; margin: 4px 5px 5px 5px;
padding: 0.5em 1em; padding: 0.5em 1em;
cursor: pointer; cursor: pointer;
// border-top: 7px solid; // border-top: 7px solid;
@ -1198,7 +1212,7 @@
.egw_fw_ui_tabs_header { .egw_fw_ui_tabs_header {
margin: 0px 0 0 0; margin: 0px 0 0 0;
padding: 0px 1px 0px 1px; padding: 1px 1px 0px 0px;
background-position: bottom; background-position: bottom;
background-repeat: repeat-x; background-repeat: repeat-x;
background-color: transparent; background-color: transparent;
@ -1236,7 +1250,7 @@
background: transparent; background: transparent;
display: inline-table; display: inline-table;
margin: 0px 5px 0px 0px; margin: 0px 5px 0px 0px;
padding: 2px 2px 5px 2px; padding: 2px 2px 7px 2px;
cursor: pointer; cursor: pointer;
border-width: 1px 1px 0 1px; border-width: 1px 1px 0 1px;
border-style: solid; border-style: solid;

View File

@ -40,7 +40,7 @@ table.et2_grid {
.nextmatch_header { .nextmatch_header {
.background_color_15_gray; .background_color_15_gray;
font-weight: normal; font-weight: normal;
padding: 2px; padding: 0 2px 2px 0;
border-width: 0; border-width: 0;
border-style: solid; border-style: solid;
border-color: @gray_30; border-color: @gray_30;