extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix some alignment issues: always have a margin for widgets with a lable, ...

Browse Source
This commit is contained in:
Ralf Becker 2016-03-31 09:21:55 +00:00
parent 22a78c4f1f
commit a54f8f2a28
10 changed files with 59 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/js/etemplate/et2_core_valueWidget.js
View File

@ -108,6 +108,9 @@ var et2_valueWidget = (function(){ "use strict"; return et2_baseWidget.extend(
this._labelContainer.append(ph); this._labelContainer.append(ph);
} }
} }
// add class if label is empty
this._labelContainer.toggleClass('et2_label_empty', !_value || !parts[0]);
} }
else else
{ {

3
api/js/etemplate/et2_widget_date.js
View File

@ -1104,6 +1104,9 @@ var et2_date_ro = (function(){ "use strict"; return et2_valueWidget.extend([et2_
this._labelContainer.prepend(parts[0]); this._labelContainer.prepend(parts[0]);
this._labelContainer.append(parts[1]); this._labelContainer.append(parts[1]);
this.label = label; this.label = label;
// add class if label is empty
this._labelContainer.toggleClass('et2_label_empty', !label || !parts[0]);
}, },
/** /**

16
api/templates/default/etemplate2.css
View File

@ -51,11 +51,11 @@ div.et2_hbox {
div.et2_hbox > * { div.et2_hbox > * {
text-align: left; text-align: left;
white-space: normal; white-space: normal;
padding-right: 5px; margin-right: 5px;
display: inline-block; display: inline-block;
} }
div.et2_hbox > *:empty { div.et2_hbox > *:empty {
padding-right: 0; margin-right: 0;
} }
div.et2_hbox_left { div.et2_hbox_left {
float: left; float: left;
@ -148,6 +148,12 @@ div.et2_hbox > div {
color: #101050; color: #101050;
white-space: pre-wrap; white-space: pre-wrap;
} }
label.et2_label > * {
margin-left: 5px !important;
}
label.et2_label > input[type="checkbox"], label.et2_label.et2_label_empty > * {
margin-left: 0 !important;
}
#msg, #msg,
.message { .message {
color: red; color: red;
@ -204,6 +210,7 @@ input[type=button] {
background-position: center; background-position: center;
background-repeat: repeat-x; background-repeat: repeat-x;
margin: 5px; margin: 5px;
margin-left: 0;
padding: 3px; padding: 3px;
border: 1px solid silver; border: 1px solid silver;
color: #101010; color: #101010;
@ -392,12 +399,9 @@ ul.et2_selectbox {
display: inline-block; display: inline-block;
} }
/* padding between selectbox/textbox and it's label */ /* padding between selectbox/textbox and it's label */
label.et2_label > .et2_selectbox, label.et2_label > .et2_textbox, label.et2_label > .et2_textbox_ro { input, select {
padding-left: 5px; padding-left: 5px;
} }
label.et2_label_empty > .et2_textbox_ro{
padding-left: 0;
}
.et2_selectbox li { .et2_selectbox li {
text-decoration: none; text-decoration: none;
list-style-image: none; list-style-image: none;

24
pixelegg/css/mobile.css
View File

@ -65,7 +65,6 @@
button, button,
select { select {
margin: 1px; margin: 1px;
padding: 0px;
/*-webkit-appearance: none;*/ /*-webkit-appearance: none;*/
} }
/** /**
@ -2681,7 +2680,6 @@ input {
&:focus{.Complete_Button_input_focus;}*/ &:focus{.Complete_Button_input_focus;}*/
} }
select { select {
padding: 3px;
margin: 0; margin: 0;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
@ -2736,7 +2734,9 @@ input,
button { button {
color: #000000; color: #000000;
/*font-size:99%;*/ /*font-size:99%;*/
padding: 2px 0px; padding-top: 2px;
padding-bottom: 2px;
padding-right: 0;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-color: #e6e6e6; border-color: #e6e6e6;
@ -2908,17 +2908,16 @@ div#popupMainDiv > * {
form.et2_container { form.et2_container {
padding: 0; padding: 0;
} }
form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select { form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select,
form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
height: 20px; height: 20px;
padding: 0; padding-right: 0;
margin: 0px; padding-top: 0;
padding-bottom: 0;
font-size: 0.95em; font-size: 0.95em;
} }
form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input { form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
height: 20px; margin: 4px 5px 4px 0;
padding: 0;
margin: 4px 4px 4px 5px;
font-size: 0.95em;
-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: 3px; -webkit-border-bottom-left-radius: 3px;
@ -3204,6 +3203,9 @@ div#etemplate\.tab_widget {
.dialogFooterToolbar td { .dialogFooterToolbar td {
padding: 0px 5px 0px 0px; padding: 0px 5px 0px 0px;
} }
.dialogFooterToolbar td:first-child {
padding-left: 5px;
}
.dialogFooterToolbar button { .dialogFooterToolbar button {
height: 24px; height: 24px;
min-width: 86px; min-width: 86px;
@ -3664,7 +3666,7 @@ td.message span.message {
} }
.egwGridView_scrollarea { .egwGridView_scrollarea {
width: 100%; width: 100%;
overflow-y: auto; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
} }
/** /**

22
pixelegg/css/pixelegg.css
View File

@ -54,7 +54,6 @@
button, button,
select { select {
margin: 1px; margin: 1px;
padding: 0px;
/*-webkit-appearance: none;*/ /*-webkit-appearance: none;*/
} }
/** /**
@ -2670,7 +2669,6 @@ input {
&:focus{.Complete_Button_input_focus;}*/ &:focus{.Complete_Button_input_focus;}*/
} }
select { select {
padding: 3px;
margin: 0; margin: 0;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
@ -2725,7 +2723,9 @@ input,
button { button {
color: #000000; color: #000000;
/*font-size:99%;*/ /*font-size:99%;*/
padding: 2px 0px; padding-top: 2px;
padding-bottom: 2px;
padding-right: 0;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-color: #e6e6e6; border-color: #e6e6e6;
@ -2897,17 +2897,16 @@ div#popupMainDiv > * {
form.et2_container { form.et2_container {
padding: 0; padding: 0;
} }
form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select { form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select,
form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
height: 20px; height: 20px;
padding: 0; padding-right: 0;
margin: 0px; padding-top: 0;
padding-bottom: 0;
font-size: 0.95em; font-size: 0.95em;
} }
form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input { form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
height: 20px; margin: 4px 5px 4px 0;
padding: 0;
margin: 4px 4px 4px 5px;
font-size: 0.95em;
-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: 3px; -webkit-border-bottom-left-radius: 3px;
@ -3193,6 +3192,9 @@ div#etemplate\.tab_widget {
.dialogFooterToolbar td { .dialogFooterToolbar td {
padding: 0px 5px 0px 0px; padding: 0px 5px 0px 0px;
} }
.dialogFooterToolbar td:first-child {
padding-left: 5px;
}
.dialogFooterToolbar button { .dialogFooterToolbar button {
height: 24px; height: 24px;
min-width: 86px; min-width: 86px;

2
pixelegg/less/etemplate2.less
View File

@ -30,7 +30,7 @@
*/ */
input,button,select { input,button,select {
margin: 1px; margin: 1px;
padding: 0px; //padding: 0px;
// switch off for Safari + Chrome // switch off for Safari + Chrome
/*-webkit-appearance: none;*/ /*-webkit-appearance: none;*/
} }

BIN
pixelegg/less/layout_content_elements.less
View File

Binary file not shown.

28
pixelegg/less/layout_dialog.less
View File

@ -58,20 +58,17 @@ form.et2_container {
td { td {
.et2_box_widget { .et2_box_widget {
select{ select, input{
height: 20px; height: 20px;
padding: 0; padding-right: 0;
margin: 0px; padding-top: 0;
padding-bottom: 0;
font-size: 0.95em; font-size: 0.95em;
} }
input { input {
height: 20px; margin: 4px 5px 4px 0;
padding: 0; .border_radius (3px, 3px ,3px ,3px );
margin: 4px 4px 4px 5px;;
font-size: 0.95em;
.border_radius (3px, 3px ,3px ,3px );
} }
input.hasDatepicker { input.hasDatepicker {
@ -397,7 +394,12 @@ div#etemplate\.tab_widget {
padding: 3px; padding: 3px;
white-space: nowrap; white-space: nowrap;
td {padding: 0px 5px 0px 0px;} td {
padding: 0px 5px 0px 0px;
}
td:first-child {
padding-left: 5px;
}
button { button {
.dimension_height_m; min-width: 86px; .dimension_height_m; min-width: 86px;
@ -410,8 +412,8 @@ div#etemplate\.tab_widget {
} }
div.et2_hbox { div.et2_hbox {
white-space: normal; white-space: normal;
} }
div.et2_box_widget{white-space: nowrap;} div.et2_box_widget{white-space: nowrap;}

2
pixelegg/less/layout_raster.less
View File

@ -36,7 +36,7 @@
.egwGridView_scrollarea { .egwGridView_scrollarea {
width: 100%; width: 100%;
overflow-y: auto; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
} }

2
pixelegg/mobile/fw_mobile.css
View File

@ -2928,7 +2928,7 @@ form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select {
form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input { form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
height: 20px; height: 20px;
padding: 0; padding: 0;
margin: 4px 4px 4px 5px; margin: 4px 5px 4px 0;
font-size: 0.95em; font-size: 0.95em;
-webkit-border-top-right-radius: 3px; -webkit-border-top-right-radius: 3px;
-webkit-border-bottom-right-radius: 3px; -webkit-border-bottom-right-radius: 3px;