pixelegg changes from thursday

This commit is contained in:
Ralf Becker 2014-01-17 08:10:35 +00:00
parent 195ac0ceb3
commit 26df0b41b7
8 changed files with 67 additions and 31 deletions

View File

@ -33,7 +33,7 @@
/**
* Styles for etemplate2 widgets
* Überschreibt egroupware/etemplate/templates/default/etemplate2.css
*
*
* @version: 1
* Stefan Reinhardt
*/
@ -386,7 +386,7 @@ action buttons, left aligned for "extra" controls
float: none;
}
*/
/**
/**
* Diff widget
*/
.diff thead,
@ -1372,7 +1372,7 @@ action buttons, left aligned for "extra" controls
opacity: 0.5;
}
/**
* Grid / nextmatch Hierarchy
* Grid / nextmatch Hierarchy
*/
/* Make sure arrow & cell content don't overlap */
.egwGridView_grid span.arrow {
@ -1388,7 +1388,7 @@ action buttons, left aligned for "extra" controls
margin-left: 10px;
border-left: 1px solid silver;
}
/**
/**
* This class' margin-right is used to line up columns at each indent level
* Classes level_# are created programmatically with margin-right * depth
* Margin-right = -(indent + border)
@ -1849,7 +1849,11 @@ option:checked {
}
span.ui-icon-close {
margin-top: 0px;
top: 5px !important;
top: 5px;
}
.et2_link_entry .ui-icon-close {
margin-top: -5px;
top: 9px !important;
}
/*Schliessen x*/
.ui-icon-closethick {
@ -2918,9 +2922,9 @@ img {
background-image: linear-gradient(top, #0c5da5, #0c5da5);
background-repeat: repeat-x;
/* &:hover {
path{fill: red;}
}*/
}
input,
@ -3187,8 +3191,8 @@ input[type=button]:active {
box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
}
/* ########################################################################################
*
* Button mit Bildern
*
* Button mit Bildern
*
######################################################################################## */
button.et2_button_with_image {
@ -3234,7 +3238,7 @@ button.et2_button_with_image background-color[url$="svg"] {
background-repeat: repeat-x;
}
/* ########################################################################################
*
*
* Button löschen / delete / => color-negative-action
*
######################################################################################## */
@ -3348,7 +3352,7 @@ button[id="addressbook-edit_button[delete]"]:active {
color: #ffffff;
}
/* ########################################################################################
*
*
* Button edit + save + apply + copy => color-positive-action
*
######################################################################################## */
@ -3468,7 +3472,7 @@ button[id*="edit_button[add_alarm]"]:active {
background-color: #1aa200 !important;
}
/* ########################################################################################
*
*
* Button cancel / => color-cancel-action
*
######################################################################################## */
@ -3528,8 +3532,8 @@ button[id="cancel"]:active {
box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
}
/* ########################################################################################
*
* Button hinzufügen
*
* Button hinzufügen
*
######################################################################################## */
button.add {
@ -3711,8 +3715,8 @@ table.egwGridView_outer tbody {
/*Elements inside td*/
}
table.egwGridView_outer tbody td.frame {
/*border: 1px solid #e6e6e6; can't have - breaks grid scrol calcs*/
/*padding: 0px 5px; no need*/
/*border: 1px solid @gray_10; can't have - breaks grid scroll calculations'
/*padding: 0px 5px; no need*/
}
table.egwGridView_outer tbody td .et2_link {
margin-left: 0px;
@ -3740,7 +3744,7 @@ table.egwGridView_outer tbody td img[src$="svg"] {
}
/*########################################################*/
table.egwGridView_grid {
font-size: 1.15em;
font-size: 12px;
background-color: #ffffff;
border-spacing: 0px 1px;
width: 100%;
@ -4361,7 +4365,7 @@ table.nextmatch_header img {
}
/*#################################################
###################################################
Add / Print / Logout /
Add / Print / Logout /
- Name / Date
###################################################*/
#egw_fw_topmenu_addons span#quick_add {
@ -4717,7 +4721,7 @@ table.nextmatch_header img {
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;
/* color:#ff0000;
background-color: yellow !important;*/
-webkit-border-top-right-radius: 0;
-webkit-border-bottom-right-radius: 0;
@ -5089,7 +5093,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
width: 100%;
}
#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header {
margin: 4px 0 0 0;
margin: 2px 0 0 0;
padding: 0px 1px 0px 1px;
background-position: bottom;
background-repeat: repeat-x;
@ -5132,7 +5136,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
/*.background-clip(padding-box);*/
/*.background-color-5-gray;*/
background: transparent;
display: table-cell;
display: inline-table;
margin: 3px 5px 0px 0px;
/*padding: 2px 10px 2px 10px;*/
cursor: pointer;
@ -5244,7 +5248,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
padding: 0px;
margin: 0;
overflow-x: hidden;
overflow-y: auto;
overflow-y: hidden;
}
#egw_fw_main .egw_fw_ui_tab_content > div {
width: 100%;
@ -5258,7 +5262,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
*
* Version 08.2013
* Author Stefan Reinhardt, Wolfgang Ott
*
*
*/
/* #################################################
* FOOTER
@ -5290,7 +5294,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
/**
* EGroupware: Stylite Pixelegg template
*
* dialog
* dialog
* define every dialog box in egw
* even popup or jquery

View File

@ -67,4 +67,5 @@
//
//
//

View File

@ -47,10 +47,10 @@ function hide_pixelegg_header(_toggle, _delay)
$j("#egw_fw_topmenu_info_items").css("position", "fixed");
$j("#egw_fw_topmenu_info_items").css("z-index", "1000");
$j(".egw_fw_ui_tabs_header").css("height", "32px");
$j(".egw_fw_ui_tabs_header").css("height", "30px");
//Tab
$j(".egw_fw_ui_tab_header").css("height", "32px");
$j(".egw_fw_ui_tab_header").css("height", "24px");
// ICON
$j(".egw_fw_ui_tab_icon").css("height", "17px");
$j(".egw_fw_ui_tab_icon").css("display", "inline-block");

View File

@ -73,6 +73,9 @@
&:before {content: "+";font-size: 1.5em;color: @egw_color_1; line-height: 1.1em;}
}
.Complete_Button_add_hover {
background-color: @egw_color_blue_lightest !important;
color: @egw_color_1;
@ -81,6 +84,33 @@
}
/*ADD / Hinzufügen = only PLUS */
.Complete_Button_add_only_plus {
.dimension_width_height_l;
border: 1px solid rgba(0, 0, 0, 0.15);
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
padding: 0.5em;
background-color: @egw_color_2_a !important;
&:before {
content: "+";
font-size: 2em;
color: @egw_color_1_a;
line-height: 0.6em;
padding-left: 0.1em;
padding-right: 4em;
}
&:active {background-color: @color_positive_action_active;}
}
.Complete_Button_add_only_plus_hover {
background-color: @egw_color_blue_lightest !important;
color: @egw_color_1;
.box_shadow_standard_light_hover;
.border_radius_button_lefttop;
}
.Complete_Button_hinweis{
.Button_size_square_32;

View File

@ -201,7 +201,8 @@ option:checked {background-color: @egw_color_1_e;}
&:active { background-color: @color_cancel_action_active !important; }
}
span.ui-icon-close {margin-top: 0px; top: 5px !important;}
span.ui-icon-close {margin-top: 0px; top: 5px;}
.et2_link_entry .ui-icon-close {margin-top: -5px; top: 9px !important;}
/*Schliessen x*/
.ui-icon-closethick {

Binary file not shown.

View File

@ -1087,7 +1087,7 @@ div#calendar-container {
.egw_fw_ui_tabs_header {
margin: 4px 0 0 0;
margin: 2px 0 0 0;
padding: 0px 1px 0px 1px;
@ -1133,7 +1133,7 @@ div#calendar-container {
/*.background-color-5-gray;*/
background: transparent;
display: table-cell;
display: inline-table;
margin: 3px 5px 0px 0px;
/*padding: 2px 10px 2px 10px;*/
cursor: pointer;

View File

@ -185,7 +185,7 @@ table.egwGridView_outer{
table.egwGridView_grid{
// border-collapse:collapse;
font-size: 1.15em;
font-size: 12px;
.background_color_0_gray;
border-spacing: 0px 1px;
width: 100%;
@ -346,4 +346,4 @@ table.egwGridView_grid{
table.nextmatch_header{
img{ .dimension_width_height_s;}
}
}