Author: ralfbecker
New Revision: 55572
URL: http://svn.stylite.de/viewvc/egroupware?rev=55572&view=rev
Log:
fix some alignment issues: always have a margin for widgets with a lable, …
Modified:
trunk/egroupware/api/js/etemplate/et2_core_valueWidget.js
trunk/egroupware/api/js/etemplate/et2_widget_date.js
trunk/egroupware/api/templates/default/etemplate2.css
trunk/pixelegg/css/mobile.css
trunk/pixelegg/css/pixelegg.css
trunk/pixelegg/less/etemplate2.less
trunk/pixelegg/less/layout_content_elements.less
trunk/pixelegg/less/layout_dialog.less
trunk/pixelegg/less/layout_raster.less
trunk/pixelegg/mobile/fw_mobile.css
— trunk/egroupware/api/js/etemplate/et2_core_valueWidget.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_core_valueWidget.js Thu Mar 31 11:21:55 2016
@@ -108,6 +108,9 @@
this._labelContainer.append(ph);
}
}
+
-
// add class if label is empty
-
this._labelContainer.toggleClass('et2_label_empty', !_value || !parts[0]);
}
else
{
— trunk/egroupware/api/js/etemplate/et2_widget_date.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_date.js Thu Mar 31 11:21:55 2016
@@ -1104,6 +1104,9 @@
this._labelContainer.prepend(parts[0]);
this._labelContainer.append(parts[1]);
this.label = label;
+
-
// add class if label is empty
-
this._labelContainer.toggleClass('et2_label_empty', !label || !parts[0]);
},
/**
— trunk/egroupware/api/templates/default/etemplate2.css (original)
+++ trunk/egroupware/api/templates/default/etemplate2.css Thu Mar 31 11:21:55 2016
@@ -51,11 +51,11 @@
div.et2_hbox > * {
text-align: left;
white-space: normal;
- margin-right: 5px;
display: inline-block;
}
div.et2_hbox > *:empty {
- margin-right: 0;
}
div.et2_hbox_left {
float: left;
@@ -148,6 +148,12 @@
color: #101050;
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,
.message {
color: red;
@@ -204,6 +210,7 @@
background-position: center;
background-repeat: repeat-x;
margin: 5px;
- margin-left: 0;
padding: 3px;
border: 1px solid silver;
color: #101010;
@@ -392,11 +399,8 @@
display: inline-block;
}
/* 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;
-}
-label.et2_label_empty > .et2_textbox_ro{
- padding-left: 0;
}
.et2_selectbox li {
text-decoration: none;
— trunk/pixelegg/css/mobile.css (original)
+++ trunk/pixelegg/css/mobile.css Thu Mar 31 11:21:55 2016
@@ -65,7 +65,6 @@
button,
select {
margin: 1px;
- padding: 0px;
/-webkit-appearance: none;/
}
/**
@@ -2681,7 +2680,6 @@
&:focus{.Complete_Button_input_focus;}*/
}
select {
- padding: 3px;
margin: 0;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
@@ -2736,7 +2734,9 @@
button {
color: #000000;
/font-size:99%;/
- padding: 2px 0px;
- padding-top: 2px;
- padding-bottom: 2px;
- padding-right: 0;
border-width: 1px;
border-style: solid;
border-color: #e6e6e6;
@@ -2908,17 +2908,16 @@
form.et2_container {
padding: 0;
}
-form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select {
- height: 20px;
- padding: 0;
- margin: 0px;
- font-size: 0.95em;
-}
+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;
- padding: 0;
- margin: 4px 4px 4px 5px;
- padding-right: 0;
- padding-top: 0;
- padding-bottom: 0;
font-size: 0.95em;
+}
+form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
- margin: 4px 5px 4px 0;
-webkit-border-top-right-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
-webkit-border-bottom-left-radius: 3px;
@@ -3204,6 +3203,9 @@
.dialogFooterToolbar td {
padding: 0px 5px 0px 0px;
}
+.dialogFooterToolbar td:first-child {
- padding-left: 5px;
+}
.dialogFooterToolbar button {
height: 24px;
min-width: 86px;
@@ -3664,7 +3666,7 @@
}
.egwGridView_scrollarea {
width: 100%;
- overflow-y: scroll;
overflow-x: hidden;
}
/**
— trunk/pixelegg/css/pixelegg.css (original)
+++ trunk/pixelegg/css/pixelegg.css Thu Mar 31 11:21:55 2016
@@ -54,7 +54,6 @@
button,
select {
margin: 1px;
- padding: 0px;
/-webkit-appearance: none;/
}
/**
@@ -2670,7 +2669,6 @@
&:focus{.Complete_Button_input_focus;}*/
}
select {
- padding: 3px;
margin: 0;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
@@ -2725,7 +2723,9 @@
button {
color: #000000;
/font-size:99%;/
- padding: 2px 0px;
- padding-top: 2px;
- padding-bottom: 2px;
- padding-right: 0;
border-width: 1px;
border-style: solid;
border-color: #e6e6e6;
@@ -2897,17 +2897,16 @@
form.et2_container {
padding: 0;
}
-form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select {
- height: 20px;
- padding: 0;
- margin: 0px;
- font-size: 0.95em;
-}
+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;
- padding: 0;
- margin: 4px 4px 4px 5px;
- padding-right: 0;
- padding-top: 0;
- padding-bottom: 0;
font-size: 0.95em;
+}
+form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
- margin: 4px 5px 4px 0;
-webkit-border-top-right-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
-webkit-border-bottom-left-radius: 3px;
@@ -3193,6 +3192,9 @@
.dialogFooterToolbar td {
padding: 0px 5px 0px 0px;
}
+.dialogFooterToolbar td:first-child {
- padding-left: 5px;
+}
.dialogFooterToolbar button {
height: 24px;
min-width: 86px;
— trunk/pixelegg/less/etemplate2.less (original)
+++ trunk/pixelegg/less/etemplate2.less Thu Mar 31 11:21:55 2016
@@ -30,7 +30,7 @@
*/
input,button,select {
margin: 1px;
- //padding: 0px;
// switch off for Safari + Chrome
/-webkit-appearance: none;/
}
— trunk/pixelegg/less/layout_content_elements.less (original)
+++ trunk/pixelegg/less/layout_content_elements.less Thu Mar 31 11:21:55 2016
@@ -53,7 +53,6 @@
}
select {
- padding:3px;
margin: 0;
.rounded (3px);
@@ -111,7 +110,9 @@
{
.color_100_gray;
/font-size:99%;/
- padding-top: 2px;
- padding-bottom: 2px;
- padding-right: 0;
border-width: 1px;
border-style: solid;
border-color: @gray_10;
— trunk/pixelegg/less/layout_dialog.less (original)
+++ trunk/pixelegg/less/layout_dialog.less Thu Mar 31 11:21:55 2016
@@ -58,20 +58,17 @@
td {
.et2_box_widget {
-
}
-
input {
-
height: 20px;
-
padding: 0;
-
margin: 4px 4px 4px 5px;;
-
font-size: 0.95em;
-
.border_radius (3px, 3px ,3px ,3px );
@@ -397,7 +394,12 @@
padding: 3px;
white-space: nowrap;
- td {padding: 0px 5px 0px 0px;}
-
td {
-
padding: 0px 5px 0px 0px;
-
}
-
td:first-child {
-
padding-left: 5px;
-
}
button {
.dimension_height_m; min-width: 86px;
@@ -410,8 +412,8 @@
}
div.et2_hbox {
— trunk/pixelegg/less/layout_raster.less (original)
+++ trunk/pixelegg/less/layout_raster.less Thu Mar 31 11:21:55 2016
@@ -36,7 +36,7 @@
.egwGridView_scrollarea {
width: 100%;
- overflow-y: scroll;
overflow-x: hidden;
}
— trunk/pixelegg/mobile/fw_mobile.css (original)
+++ trunk/pixelegg/mobile/fw_mobile.css Thu Mar 31 11:21:55 2016
@@ -2928,7 +2928,7 @@
form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
height: 20px;
padding: 0;
- margin: 4px 5px 4px 0;
font-size: 0.95em;
-webkit-border-top-right-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
