pixelegg changes from last week

This commit is contained in:
Ralf Becker 2013-12-08 21:36:30 +00:00
parent f72910dc27
commit 852e98f740
16 changed files with 1473 additions and 117 deletions

File diff suppressed because it is too large Load Diff

View File

@ -62,7 +62,7 @@
@import "../less/layout_footer.less";
@import "../less/layout_dialog.less";
@import "../less/print.less";
//
//
//
//

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -53,7 +53,7 @@
background-image: none !important;
.border_radius_button_lefttop;
&:before {content: "+";font-size: 1.5em;color: @egw_color_1;}
&:before {content: "+";font-size: 1.5em;color: @egw_color_1; line-height: 1.1em;}
}
.Complete_Button_add_hover {
@ -146,20 +146,24 @@
width: 3em;
// height: 2.5em;
// margin: 0.5em 1em 0.5em 1;
.border_radius_button_lefttop;
.border_radius_button_righttop;
.background-color-search;
color: #FFFFFF;
color: lighten(@egw_color_1, 15%);
text-decoration: none;
cursor: pointer;
padding: 3px;
margin-left: 5px;
background-image: url("../images/search.png");
background-position: center 0;
background-size: contain;
background-repeat: no-repeat;
}
.Complete_Button_search_action_hover{
/*.Complete_Button_search_action_hover{
.box_shadow_standard_light_hover;
background-color: @yellow !important;
.border_radius_button_lefttop;
@ -178,7 +182,7 @@
.Complete_Button_search_action_reset{
.Complete_Button_search_action;
.background_verlauf_diagonal_gray;
}
}*/
// Buchstaben

View File

@ -505,4 +505,19 @@
background-clip: @argument;
}
/* ##################################################### */
.gradient-outer-thead{
.gradient(@color: rgba(245,246,246,1), @start: #EEE, @stop: #FFF);
background: rgb(245,246,246); /* Old browsers */
background: -moz-linear-gradient(top, rgba(245,246,246,1) 0%, rgba(219,220,226,1) 21%, rgba(184,186,198,1) 49%, rgba(221,223,227,1) 80%, rgba(245,246,246,1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(245,246,246,1)), color-stop(21%,rgba(219,220,226,1)), color-stop(49%,rgba(184,186,198,1)), color-stop(80%,rgba(221,223,227,1)), color-stop(100%,rgba(245,246,246,1))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(245,246,246,1) 0%,rgba(219,220,226,1) 21%,rgba(184,186,198,1) 49%,rgba(221,223,227,1) 80%,rgba(245,246,246,1) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(245,246,246,1) 0%,rgba(219,220,226,1) 21%,rgba(184,186,198,1) 49%,rgba(221,223,227,1) 80%,rgba(245,246,246,1) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(245,246,246,1) 0%,rgba(219,220,226,1) 21%,rgba(184,186,198,1) 49%,rgba(221,223,227,1) 80%,rgba(245,246,246,1) 100%); /* IE10+ */
background: linear-gradient(to bottom, rgba(245,246,246,1) 0%,rgba(219,220,226,1) 21%,rgba(184,186,198,1) 49%,rgba(221,223,227,1) 80%,rgba(245,246,246,1) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f6f6', endColorstr='#f5f6f6',GradientType=0 ); /* IE6-9 */
}
//

View File

@ -6,9 +6,9 @@
* Stefan Reinhardt
*/
@import (reference) "def_design_pattern_color_font_shadow.less";
@import (reference) "def_buttons.less";
@import (reference) "./def_design_pattern_color_font_shadow.less";
@import (reference) "./def_buttons.less";
@import (less) "../../etemplate/templates/default/etemplate2.css";
/**
* Top level
@ -346,7 +346,8 @@ button.et2_button_text:focus, input[type=button]:focus {
}
.et2_selectbox .ui-multiselect-checkboxes div.ui-icon-close {
visibility: hidden;
/*visibility: hidden;*/
background-image: url(../images/close.png);
padding: 0px;
}
.et2_selectbox .ui-multiselect-checkboxes li:hover div.ui-icon-close {
@ -441,6 +442,9 @@ action buttons, left aligned for "extra" controls
/**
* File upload
*/
div.et2_file input {background-color: @egw_color_1_a;}
.et2_file .progress {
width: 300px;
max-height: 6em;
@ -625,20 +629,26 @@ ul.et2_link_string {
}
.et2_link_list tr {
cursor: pointer;
&:hover {background-color: @color_hover_row;}
&:active {background-color: @color_active_row;}
}
.et2_link_list td.remark {
font-style: italic;
}
.et2_link_list td div.delete {
visibility: hidden;
background-image: url("images/close.png");
background-image: url("../images/close.png");
background-position: center;
background-repeat: no-repeat;
background-size: contain;
padding: 0px;
}
.et2_link_list .icon img, .et2_link_list .icon {
width: 16px;
height: 16px;
width: 14px !important;
height: 14px !important;
display: inline-block;
}
.et2_link_list tr:hover div.delete {
@ -664,6 +674,7 @@ ul.et2_link_string {
margin: 1em 3px -1px 0;
padding: 4px;
cursor: pointer;
font-size: 0.8em;
.border-radius(3px,0,0,3px);
// .bordered (@egw_color_2_c, @egw_color_2_c, #bfbfbf, @egw_color_2_c);
@ -969,18 +980,24 @@ div.message.floating {
// Search Field
.nextmatch_header > .filters input[type=search] { .background-color-search;}
.nextmatch_header > .filters button.et2_button {
.Complete_Button_search_action;
background-image: none;
width: auto;
&:hover{
.Complete_Button_search_action_hover;
.box_shadow_standard_light_hover;
/* .Complete_Button_search_action_hover;*/
background-color: @egw_color_2_e !important;
/*hide arrow*/
color: @egw_color_2_e !important;
}
&:active {
.Complete_Button_search_action_active;
/*hide background image*/
/*show arrow*/
.background_verlauf_diagonal_gray;
}
&:focus {
@ -1095,7 +1112,7 @@ div.message.floating {
width: 16px;
text-align: left;
position: relative;
right: 8px;
right: 1px;
top: 3px;
}
@ -1649,4 +1666,4 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
.ms-res-ctn {
overflow-x: hidden;
}
//
//

Binary file not shown.

Binary file not shown.

View File

@ -146,6 +146,9 @@
box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
}
/*Supersized*/
#wrap {
background-color: white !important;
}
* {
margin: 0;
padding: 0;

View File

@ -209,6 +209,13 @@
/*Supersized*/
#wrap {
background-color: white !important;
}
* {
margin: 0;
padding: 0;

View File

@ -51,7 +51,7 @@
background-color: #0b5fa4 !important;
color: #FFF;
text-shadow: none;
height: 35px;
/* height: auto;*/
background-image: none !important;
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px;
@ -62,8 +62,9 @@
}
.Complete_Button_add:before {
content: "+";
font-size: 2em;
font-size: 1.5em;
color: #ffc200;
line-height: 1.1em;
}
.Complete_Button_add_hover {
background-color: #66a1d2 !important;
@ -469,7 +470,7 @@
background-color: #0b5fa4 !important;
color: #FFF;
text-shadow: none;
height: 35px;
/* height: auto;*/
background-image: none !important;
-webkit-border-radius: 3px;
-webkit-border-top-left-radius: 20px;
@ -481,17 +482,19 @@
right: 88px;
top: 0;
z-index: 200;
padding: 0 0.8em 0.8em 0.5em;
padding: 6px 0.8em 6px 0.5em;
}
#egw_fw_topmenu_addons span#quick_add:before {
content: "+";
font-size: 2em;
font-size: 1.5em;
color: #ffc200;
line-height: 1.1em;
}
#egw_fw_topmenu_addons span#quick_add:before {
content: "+";
font-size: 2em;
font-size: 1.5em;
color: #ffc200;
line-height: 1.1em;
}
#egw_fw_topmenu_addons span#quick_add select#quick_add_selectbox {
border: 1px solid rgba(0, 0, 0, 0.15);
@ -545,6 +548,11 @@
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9);
}
#egw_fw_logout:focus {
-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);
}
#egw_fw_print {
background-image: url(../images/print.png);
background-size: 16px 16px;
@ -621,6 +629,7 @@
bottom: 20px;
width: 225px;
background-color: #fafafa;
/*#################################*/
}
#egw_fw_sidebar #egw_fw_sidemenu {
position: absolute;
@ -631,6 +640,7 @@
overflow: hidden;
z-index: 0;
padding-top: 0.6em;
font-size: 80%;
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv {
background-color: #fafafa;
@ -725,11 +735,13 @@
border-style: solid;
border-width: 0px;
margin: 0 0 2em 0;
/*letztes Element*/
/*######################*/
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content > div:nth-of-type(1) {
padding: 5px 0.3em 1.5em 0.3em;
margin: 0 0 10px 0;
background-color: #bfbfbf;
background-color: #b3b3b3 !important;
-webkit-border-top-right-radius: 0;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 27px;
@ -747,6 +759,25 @@
background-clip: padding-box;
border-color: #b4b4b4;
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content div.egw_fw_ui_category:nth-last-of-type(-n+3) {
/* color:#ff0000;
background-color: yellow !important;*/
-webkit-border-top-right-radius: 0;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 15px;
-webkit-border-top-left-radius: 0;
-moz-border-radius-topright: 0;
-moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 15px;
-moz-border-radius-topleft: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 15px;
border-top-left-radius: 0;
-moz-background-clip: padding-box;
-webkit-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 {
margin: 10px 5px 0px 5px;
padding: 0.5em 1em;
@ -777,15 +808,35 @@
background-repeat: no-repeat;
background-position: left center;
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category:last-child {
color: #ff0000;
background-color: yellow !important;
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category:hover {
background-color: #b3b3b3 !important;
background-color: #999999;
padding: 0.5em 1em;
}
#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;
margin-top: 0px;
background-color: #808080;
margin-top: 4px;
background-color: #0c5da5;
/*.background-color-50-gray;*/
color: #f2f2f2;
-webkit-border-top-right-radius: 3px !important;
-webkit-border-bottom-right-radius: 3px !important;
-webkit-border-bottom-left-radius: 3px !important;
-webkit-border-top-left-radius: 3px !important;
-moz-border-radius-topright: 3px !important;
-moz-border-radius-bottomright: 3px !important;
-moz-border-radius-bottomleft: 3px !important;
-moz-border-radius-topleft: 3px !important;
border-top-right-radius: 3px !important;
border-bottom-right-radius: 3px !important;
border-bottom-left-radius: 3px !important;
border-top-left-radius: 3px !important;
-moz-background-clip: padding-box !important;
-webkit-background-clip: padding-box !important;
background-clip: padding-box !important;
}
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 {
background-image: url(../images/arrow_down.png);
@ -835,9 +886,9 @@
}
#egw_fw_sidebar #egw_fw_splitter {
position: absolute;
background-color: #bfbfbf;
background-color: #b3b3b3 !important;
width: 5px;
top: 61px;
top: 60px;
bottom: 3px;
right: 0px;
}
@ -848,6 +899,7 @@
background-image: url(../images/splitter_vert.png);
background-position: center;
background-repeat: no-repeat;
background-color: #b3b3b3 !important;
position: absolute;
width: 5px;
height: 100%;
@ -880,11 +932,33 @@
position: relative;
}
.egw_fw_ui_sidemenu_listitem img.egw_fw_ui_sidemenu_listitem_icon {
height: 9px;
width: 9p;
height: 16px;
width: 16px;
padding: 0px;
margin: 0px 5px;
float: left;
background-color: #f0f0f0;
-webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
background-image: url("../images/bullet.png");
background-size: 16px 16px;
background-position: center;
}
.egw_fw_ui_sidemenu_listitem img.egw_fw_ui_sidemenu_listitem_icon:hover {
height: 16px;
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);
border: 1px solid rgba(0, 0, 0, 0.5);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.egw_fw_ui_sidemenu_listitem input {
height: 16px;
@ -995,6 +1069,7 @@
}
.egw_fw_content_browser_div {
display: block;
overflow: auto;
/* background-color: RGB(240, 240, 255);*/
}
.egw_fw_content_browser_div_loading {
@ -1125,8 +1200,8 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
}
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active {
border-width: 1px 1px 0px 1px !important;
padding: 2px 10px 3px 10px !important;
background-color: #bfbfbf;
padding: 1px 10px 3px 10px !important;
background-color: #b3b3b3 !important;
background-image: none !important;
}
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover {
@ -1163,7 +1238,3 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
border-style: solid;
border-color: #b4b4b4;
}
#egw_fw_main .egw_fw_ui_tab_content div:nth-child(1) iframe {
height: 100%;
min-height: 99%;
}

View File

@ -179,9 +179,9 @@
top: 0;
z-index: 200;
padding: 0 0.8em 0.5em 0.5em;
padding: 6px 0.8em 6px 0.5em;
&:before {content: "+";font-size: 2em;color: @egw_color_1;}
&:before {content: "+";font-size: 1.5em;color: @egw_color_1; line-height: 1.1em}
select#quick_add_selectbox{
.border_normal;
@ -227,6 +227,8 @@
&:hover {.box_shadow_standard_light_hover;}
&:focus {.box_shadow_standard_light_inset;}
}
@ -424,28 +426,27 @@
// Rahmen um APP Einstellungen
.egw_fw_ui_sidemenu_entry_content {
display: block;
background-image: none;
.border-radius (0, 0, 27px, 0);
border-color: @gray-30;
border-style: solid;
border-width: 0px;
margin: 0 0 2em 0;
// padding: 0 0.3em 2em 0.3em;
> div:nth-of-type(1) {
padding: 5px 0.3em 1.5em 0.3em;
margin: 0 0 10px 0;
.background-color-25-gray;
.background-color-30-gray;
.border-radius (0, 0, 27px, 0);
border-color: @gray-30;
}
/*letztes Element*/
div.egw_fw_ui_category:nth-last-of-type(-n+3) {
/* color:#ff0000;
background-color: yellow !important;*/
.border-radius (0, 0, 15px, 0);
}
// Schaltflächen
// Normal
@ -458,7 +459,6 @@
background-color: @gray-50;
.border-radius(3px,3px,3px,3px);
h1 {
margin: 5px 0px 3px 5px;
padding: 0px 0px 0px 15px;
@ -467,20 +467,33 @@
background-repeat:no-repeat;
background-position:left center;
}
&:last-child {
color:#ff0000;
background-color: yellow !important;
}
}
// Hover
.egw_fw_ui_category:hover {
.background-color-30-gray;
.background-color-40-gray;
padding: 0.5em 1em;
}
// Active
/*######################*/
// Active State
.egw_fw_ui_category_active {
border-bottom-width: 0px;
margin-top: 0px;
.background-color-50-gray;
margin-top: 4px;
background-color: @egw_color_2_a;
/*.background-color-50-gray;*/
.color-5-gray;
.border-radius(3px,3px,3px,3px) !important;
h1 {
background-image:url(../images/arrow_down.png);
@ -503,6 +516,10 @@
}
}
.egw_fw_ui_sidemenu_entry_content_bottom {
@ -537,13 +554,15 @@
}
/*#################################*/
// Trenner (Splitter)
#egw_fw_splitter {
position: absolute;
// background-color: RGB(200, 200, 255);
.background-color-25-gray;
.background-color-30-gray;
width: 5px;
top: 61px;
top: 60px;
bottom: 3px;
right: 0px;
@ -553,6 +572,7 @@
background-image: url(../images/splitter_vert.png);
background-position: center;
background-repeat: no-repeat;
.background-color-30-gray;
position: absolute;
width: 5px;
height: 100%;
@ -786,7 +806,7 @@
.egw_fw_content_browser_div {
display: block;
// overflow: auto;
overflow: auto;
/* background-color: RGB(240, 240, 255);*/
}
@ -993,8 +1013,8 @@ div#calendar-container {
.egw_fw_ui_tab_header_active {
border-width: 1px 1px 0px 1px !important;
padding: 2px 10px 3px 10px !important;
.background-color-25-gray ;
padding: 1px 10px 3px 10px !important;
.background-color-30-gray ;
background-image:none !important;
&:hover {.background-color-25-gray ;}

Binary file not shown.