Author: hnategh
New Revision: 55667
URL: http://svn.stylite.de/viewvc/egroupware?rev=55667&view=rev
Log:
Dialog styling W.I.P.:
- New design for header & footer in dialogs
- More styling of calendar edit dialog
Modified:
trunk/calendar/templates/default/edit.xet
trunk/calendar/templates/mobile/app.css
trunk/calendar/templates/pixelegg/app.css
trunk/calendar/templates/pixelegg/app.less
trunk/pixelegg/css/mobile.css
trunk/pixelegg/css/pixelegg.css
trunk/pixelegg/inc/class.pixelegg_framework.inc.php
trunk/pixelegg/less/layout_dialog.less
trunk/pixelegg/less/layout_table.less
trunk/pixelegg/mobile/fw_mobile.css
— trunk/calendar/templates/default/edit.xet (original)
+++ trunk/calendar/templates/default/edit.xet Thu Apr 7 11:13:26 2016
@@ -94,7 +94,7 @@
@@ -157,19 +157,19 @@
@@ -270,7 +270,7 @@
-
<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search" image="timesheet" background_image="1" span="all"/>
<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="app.calendar.delete_btn(widget,$cont[query_delete_exceptions]);" image="delete" background_image="1"/>
<textbox type="hidden" id="delete_exceptions"/>
</hbox>
— trunk/calendar/templates/mobile/app.css (original)
+++ trunk/calendar/templates/mobile/app.css Thu Apr 7 11:13:26 2016
@@ -141,7 +141,7 @@
-
@package calendar
-
@version $Id$
/
-/ $Id: app.css 55614 2016-04-04 17:55:49Z nathangray $ /
+/ $Id: app.css 55640 2016-04-05 21:38:49Z nathangray $ /
/Media print classes/
@media print {
#calendar-view.et2_container,
@@ -288,16 +288,6 @@
}
#calendar-view_view td {
padding: 0px;
-}
-/ Header classes */
-tr.dialogHeader td,
-tr.dialogHeader2 td,
-tr.dialogHeader3 td,
-tr.dialogHeader4 td,
-tr.dialogOperators td,
-.dialogFooterToolbar {
- padding: 5px 0 5px 0;
- vertical-align: middle;
}
.calendar_inputFullWidth input {
width: 100%;
@@ -1418,8 +1408,8 @@
#calendar-edit_account + .chzn-container .chzn-results {
max-height: 195px;
}
-#calendar-edit_category {
- max-width: 230px;
+input#calendar-edit_location {
- padding-left: 0;
}
#calendar_sidebox_content .ui-datepicker div.ui-datepicker-buttonpane {
border-top: 0;
@@ -1761,24 +1751,6 @@
background-color: #000;
color: #0f0;
}
-/###########################################
-# #
-# dialogHeader #
-#############################################
-# #
-# #
-# #
-# #
-# #
-# dialog #
-# #
-# #
-#############################################
-# #
-# buttons #
-# #
-# #
-##############################################/
#calendar-edit {
/###########################################/
/###########################################/
— trunk/calendar/templates/pixelegg/app.css (original)
+++ trunk/calendar/templates/pixelegg/app.css Thu Apr 7 11:13:26 2016
@@ -11,7 +11,7 @@
-
@package calendar
-
@version $Id$
/
-/ $Id: app.css 55640 2016-04-05 21:38:49Z nathangray $ /
+/ $Id: app.css 55652 2016-04-06 16:43:51Z hnategh $ */
/Media print classes/
@media print {
#calendar-view.et2_container,
@@ -1658,12 +1658,6 @@
#calendar-edit select#calendar-edit_duration {
width: 133px;
}
-#calendar-edit button#calendar-edit_freetime {
- height: 16px;
- background-size: 12px auto !important;
- margin-left: 32px;
- padding-top: 0px;
-}
#calendar-edit #calendar-edit_id {
float: right;
margin-right: 5px;
— trunk/calendar/templates/pixelegg/app.less (original)
+++ trunk/calendar/templates/pixelegg/app.less Thu Apr 7 11:13:26 2016
@@ -416,14 +416,6 @@
}
select#calendar-edit_duration{width: 133px;}
-
-
// Terminsuche
-
button#calendar-edit_freetime {
-
height: 16px;
-
background-size: 12px auto !important;
-
margin-left: 32px;
-
padding-top: 0px;
-
}
// ID
#calendar-edit_id{float: right;margin-right: 5px;}
— trunk/pixelegg/css/mobile.css (original)
+++ trunk/pixelegg/css/mobile.css Thu Apr 7 11:13:26 2016
@@ -2989,6 +2989,7 @@
/********** Header Part ********************/
.dialogHeader {
color: #000000;
- border-bottom: 3px solid #696969;
}
.dialogHeader img[src*=“navbar”] {
padding: 0 0 0 15px;
@@ -3111,6 +3112,7 @@
padding: 5px;
background-color: #ffffff;
margin-bottom: 11px;
- margin-top: 11px;
}
.tab_body {
border-top-width: 1px;
@@ -3140,7 +3142,6 @@
dialogOperators
#############################################*/
.dialogOperators {
- background-color: #e6e6e6;
border-top: 0px solid #e6e6e6;
border-bottom: 0px solid #e6e6e6;
}
@@ -3157,10 +3158,12 @@
/# button | button | button delete #/
/##############################################/
.dialogFooterToolbar {
- background-color: #679fd2;
- background-color: transparent;
margin: 10px 0 0 0;
padding: 3px;
white-space: nowrap;
- border-top: 3px solid #696969;
- padding-top: 8px !important;
/.et2_selectbox {height: 32px; top: 0px; font-size: 1em;}/
}
.dialogFooterToolbar td {
@@ -3170,8 +3173,10 @@
padding-left: 5px;
}
.dialogFooterToolbar button {
- min-width: 86px;
height: 24px;
- border-radius: 3px;
- border: 1px solid silver;
}
.dialogFooterToolbar button:hover {
height: 24px;
@@ -5395,6 +5400,9 @@
table.egwGridView_grid tbody tr:hover {
background: rgba(103, 159, 210, 0.2);
}
+table.egwGridView_grid tbody tr.th:hover {
- background: transparent;
+}
table.egwGridView_grid tbody tr.selected {
background-image: none;
/background-color: @egw_color_1_e !important;/
— trunk/pixelegg/css/pixelegg.css (original)
+++ trunk/pixelegg/css/pixelegg.css Thu Apr 7 11:13:26 2016
@@ -2978,6 +2978,7 @@
/********** Header Part ********************/
.dialogHeader {
color: #000000;
- border-bottom: 3px solid #696969;
}
.dialogHeader img[src*=“navbar”] {
padding: 0 0 0 15px;
@@ -3100,6 +3101,7 @@
padding: 5px;
background-color: #ffffff;
margin-bottom: 11px;
- margin-top: 11px;
}
.tab_body {
border-top-width: 1px;
@@ -3129,7 +3131,6 @@
dialogOperators
#############################################*/
.dialogOperators {
- background-color: #e6e6e6;
border-top: 0px solid #e6e6e6;
border-bottom: 0px solid #e6e6e6;
}
@@ -3146,10 +3147,12 @@
/# button | button | button delete #/
/##############################################/
.dialogFooterToolbar {
- background-color: #679fd2;
- background-color: transparent;
margin: 10px 0 0 0;
padding: 3px;
white-space: nowrap;
- border-top: 3px solid #696969;
- padding-top: 8px !important;
/.et2_selectbox {height: 32px; top: 0px; font-size: 1em;}/
}
.dialogFooterToolbar td {
@@ -3159,8 +3162,10 @@
padding-left: 5px;
}
.dialogFooterToolbar button {
- min-width: 86px;
height: 24px;
- border-radius: 3px;
- border: 1px solid silver;
}
.dialogFooterToolbar button:hover {
height: 24px;
@@ -5384,6 +5389,9 @@
table.egwGridView_grid tbody tr:hover {
background: rgba(103, 159, 210, 0.2);
}
+table.egwGridView_grid tbody tr.th:hover {
- background: transparent;
+}
table.egwGridView_grid tbody tr.selected {
background-image: none;
/background-color: @egw_color_1_e !important;/
— trunk/pixelegg/inc/class.pixelegg_framework.inc.php (original)
+++ trunk/pixelegg/inc/class.pixelegg_framework.inc.php Thu Apr 7 11:13:26 2016
@@ -144,7 +144,7 @@
-popup toolbar
*/
div#egw_fw_header, div.egw_fw_ui_category:hover,#loginMainDiv,#loginMainDiv #divAppIconBar #divLogo,
-.dialogFooterToolbar, .et2_portlet .ui-widget-header{
+.et2_portlet .ui-widget-header{
background-color: $color !important;
}
@@ -168,6 +168,10 @@
";
-
if ($GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'traditional')
-
{
-
$ret['app_css'] .= ".dialogFooterToolbar {background-color: $color !important;}";
-
}
}
else
/* Mobile theme custom colors*/
— trunk/pixelegg/less/layout_dialog.less (original)
+++ trunk/pixelegg/less/layout_dialog.less Thu Apr 7 11:13:26 2016
@@ -155,7 +155,7 @@
/********** Header Part ********************/
.dialogHeader {
.color_100_gray;
- border-bottom: 3px solid @gray_60;
// APP img
img[src*=“navbar”] {
padding: 0 0 0 15px;
@@ -284,6 +284,7 @@
padding: 5px;
background-color: @gray_0;
margin-bottom: 11px;
- margin-top:11px;
}
.tab_body {
@@ -318,7 +319,6 @@
dialogOperators
#############################################*/
.dialogOperators {
- background-color: @gray_10;
border-top: 0px solid @gray_10;
border-bottom: 0px solid @gray_10;
@@ -335,11 +335,12 @@
/##############################################/
.dialogFooterToolbar{
- background-color: @color_button_panel_bg_color;
- background-color: transparent;
margin: 10px 0 0 0;
padding: 3px;
white-space: nowrap;
-
border-top: 3px solid #696969;
-
padding-top: 8px !important;
td {
padding: 0px 5px 0px 0px;
}
@@ -349,6 +350,9 @@
button {
.dimension_height_m; min-width: 86px;
-
height: 24px;
-
border-radius: 3px;
-
border: 1px solid silver;
&:hover{.dimension_height_m;}
&:action{.dimension_height_m;}
}
— trunk/pixelegg/less/layout_table.less (original)
+++ trunk/pixelegg/less/layout_table.less Thu Apr 7 11:13:26 2016
@@ -202,7 +202,7 @@
/multiple choise/
// Hover State
tr:hover {background: @color_hover_row;}
— trunk/pixelegg/mobile/fw_mobile.css (original)
+++ trunk/pixelegg/mobile/fw_mobile.css Thu Apr 7 11:13:26 2016
@@ -1559,7 +1559,7 @@
-
-
@version $Id: magicsuggest.less 55035 2016-02-16 21:37:19Z nathangray $
-
-
@version $Id: layout_dialog.less 55581 2016-03-31 16:59:47Z hnategh $
-
-
@version $Id: layout_dialog.less 55652 2016-04-06 16:43:51Z hnategh $
/
/body {
background-color: @gray_0;
@@ -3000,6 +3000,7 @@
/******** Header Part ********************/
.dialogHeader {
color: #000000;
- border-bottom: 3px solid #696969;
}
.dialogHeader img[src*=“navbar”] {
padding: 0 0 0 15px;
@@ -3122,6 +3123,7 @@
padding: 5px;
background-color: #ffffff;
margin-bottom: 11px;
- margin-top: 11px;
}
.tab_body {
border-top-width: 1px;
@@ -3151,7 +3153,6 @@
dialogOperators
#############################################*/
.dialogOperators {
- background-color: #e6e6e6;
border-top: 0px solid #e6e6e6;
border-bottom: 0px solid #e6e6e6;
}
@@ -3168,10 +3169,12 @@
/# button | button | button delete #/
/##############################################/
.dialogFooterToolbar {
- background-color: #679fd2;
- background-color: transparent;
margin: 10px 0 0 0;
padding: 3px;
white-space: nowrap;
- border-top: 3px solid #696969;
- padding-top: 8px !important;
/.et2_selectbox {height: 32px; top: 0px; font-size: 1em;}/
}
.dialogFooterToolbar td {
@@ -3181,8 +3184,10 @@
padding-left: 5px;
}
.dialogFooterToolbar button {
- min-width: 86px;
height: 24px;
- border-radius: 3px;
- border: 1px solid silver;
}
.dialogFooterToolbar button:hover {
height: 24px;
@@ -5266,7 +5271,7 @@
-
-
@version $Id: layout_table.less 55187 2016-02-29 13:25:21Z ralfbecker $
-
-
@version $Id: layout_table.less 55652 2016-04-06 16:43:51Z hnategh $
/
/* #####################################################################################
- et2
@@ -5405,6 +5410,9 @@
}
table.egwGridView_grid tbody tr:hover {
background: rgba(103, 159, 210, 0.2);
+}
+table.egwGridView_grid tbody tr.th:hover {
- background: transparent;
}
table.egwGridView_grid tbody tr.selected {
background-image: none;
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
