Browse code

Merge remote-tracking branch 'origin/dev' into dev

Benjamin Roth authored on29/08/2016 16:41:21
Showing4 changed files
... ...
@@ -38,7 +38,7 @@ input[type="number"],input[type="search"],input[type="tel"],input[type="time"],i
38 38
 	font-size: 123%;
39 39
 	line-height: 2;
40 40
 	font-weight: normal;
41
-	border-bottom: inherit 3px solid;
41
+	border: none;
42 42
 	margin-bottom: 1em;
43 43
 }
44 44
 
... ...
@@ -143,6 +143,7 @@ input[type="number"],input[type="search"],input[type="tel"],input[type="time"],i
143 143
 	min-height: 2.1em;
144 144
 }
145 145
 
146
+.widget.w5  { float: left; width: 3%; }
146 147
 .widget.w10 { float: left; width: 8%; }
147 148
 .widget.w15 { float: left; width: 13%; }
148 149
 .widget.w20 { float: left; width: 18%; }
... ...
@@ -170,6 +171,7 @@ input[type="number"],input[type="search"],input[type="tel"],input[type="time"],i
170 171
 }
171 172
 
172 173
 @media screen and (max-width: 43em) {
174
+	.widget.w5,
173 175
 	.widget.w10,
174 176
 	.widget.w15,
175 177
 	.widget.w20,
... ...
@@ -191,6 +193,8 @@ input[type="number"],input[type="search"],input[type="tel"],input[type="time"],i
191 193
 	.widget.w100 { float: none; width: 98%; }
192 194
 }
193 195
 
196
+.widget.w5:before,
197
+.widget.w5:after,
194 198
 .widget.w10:before,
195 199
 .widget.w10:after,
196 200
 .widget.w15:before,
... ...
@@ -235,6 +239,7 @@ form:after {
235 239
 	display: table; /* 2 */
236 240
 }
237 241
 
242
+.widget.w5:after,
238 243
 .widget.w10:after,
239 244
 .widget.w15:after,
240 245
 .widget.w20:after,
... ...
@@ -1 +1 @@
1
-input[type="text"],input[type="password"],input[type="date"],input[type="datetime"],input[type="email"],input[type="number"],input[type="search"],input[type="tel"],input[type="time"],input[type="url"],textarea,select{width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.widget input.captcha{max-width:4em}.formbody>fieldset{clear:left}.formbody>fieldset legend{color:inherit;font-size:123%;line-height:2;font-weight:normal;border-bottom:inherit 3px solid;margin-bottom:1em}.widget .radio_container legend,.widget .checkbox_container legend{color:inherit;font-size:100%;font-weight:normal;border-bottom:0;display:block;margin-bottom:.4em;line-height:1.5em}.widget .checkbox_container label,.widget .radio_container label{font-weight:normal;display:inline;margin-bottom:0}.widget .checkbox_container>span,.widget .radio_container>span{display:block}.widget.headline{margin-top:1em;font-size:108%;font-weight:bold;min-height:1.5em}.widget{padding:0 1%;margin-bottom:.5em;min-height:4em;float:left;width:98%}.widget.cbx{min-height:1.5em;height:1.5em;padding:4px 1%}.widget label{display:block;margin-bottom:.4em;line-height:1.5em}.widget.error input,.widget.error select,.widget.error textarea{border-color:#e23e15}.widget p.error{font-size:85%;margin-top:-0.4em;margin-bottom:.4em}.widget.error .errortip{background-color:#e23e15;border-bottom-left-radius:50%;border-bottom-right-radius:50%;border-top-left-radius:50%;border-top-right-radius:50%;color:#fff;cursor:help;display:block;float:right;font-family:'Open Sans',Arial,Helvetica,sans-serif;font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;height:15px;line-height:13px;margin-top:3.25px;text-align:center;vertical-align:top;width:15px}.submit_container{min-height:2.1em}.widget.w10{float:left;width:8%}.widget.w15{float:left;width:13%}.widget.w20{float:left;width:18%}.widget.w25{float:left;width:23%}.widget.w30{float:left;width:28%}.widget.w35{float:left;width:33%}.widget.w40{float:left;width:38%}.widget.w45{float:left;width:43%}.widget.w50{float:left;width:48%}.widget.w55{float:left;width:53%}.widget.w60{float:left;width:58%}.widget.w65{float:left;width:63%}.widget.w70{float:left;width:68%}.widget.w75{float:left;width:73%}.widget.w80{float:left;width:78%}.widget.w85{float:left;width:83%}.widget.w90{float:left;width:88%}.widget.w95{float:left;width:93%}.widget.w100{float:left;width:98%}.widget.clr,.formbody>fieldset{clear:left}@media screen and (max-width:43em){.widget.w10,.widget.w15,.widget.w20,.widget.w25,.widget.w30,.widget.w35,.widget.w40,.widget.w45,.widget.w50,.widget.w55,.widget.w60,.widget.w65,.widget.w70,.widget.w75,.widget.w80,.widget.w85,.widget.w90,.widget.w95,.widget.w100{float:none;width:98%}}.widget.w10:before,.widget.w10:after,.widget.w15:before,.widget.w15:after,.widget.w20:before,.widget.w20:after,.widget.w25:before,.widget.w25:after,.widget.w30:before,.widget.w30:after,.widget.w35:before,.widget.w35:after,.widget.w40:before,.widget.w40:after,.widget.w45:before,.widget.w45:after,.widget.w50:before,.widget.w50:after,.widget.w55:before,.widget.w55:after,.widget.w60:before,.widget.w60:after,.widget.w65:before,.widget.w65:after,.widget.w70:before,.widget.w70:after,.widget.w75:before,.widget.w75:after,.widget.w80:before,.widget.w80:after,.widget.w85:before,.widget.w85:after,.widget.w90:before,.widget.w90:after,.widget.w95:before,.widget.w95:after,.widget.w100:before,.widget.w100:after,form:before,form:after{content:" ";display:table}.widget.w10:after,.widget.w15:after,.widget.w20:after,.widget.w25:after,.widget.w30:after,.widget.w35:after,.widget.w40:after,.widget.w45:after,.widget.w50:after,.widget.w55:after,.widget.w60:after,.widget.w65:after,.widget.w70:after,.widget.w75:after,.widget.w80:after,.widget.w85:after,.widget.w90:after,.widget.w95:after,.widget.w100:after,form:after{clear:both}.widget.widget-split input[type="text"],.widget.widget-split input[type="password"],.widget.widget-split input[type="date"],.widget.widget-split input[type="datetime"],.widget.widget-split input[type="email"],.widget.widget-split input[type="number"],.widget.widget-split input[type="search"],.widget.widget-split input[type="tel"],.widget.widget-split input[type="time"],.widget.widget-split input[type="url"],.widget.widget-split textarea,.widget.widget-split select{max-width:50%!important;min-width:10%!important;float:left;margin-right:10px;display:inline}.widget.widget-split.widget-split-3 input{max-width:30%!important}.widget.widget-split.widget-split-3 input[type="submit"]{max-width:70%!important}.widget.widget-split.widget-split-4 input{max-width:40%!important}.widget.widget-split.widget-split-4 input[type="submit"]{max-width:60%!important}.widget.widget-split.widget-split-5 input{max-width:50%!important}.widget.widget-split.widget-split-5 input[type="submit"]{max-width:50%!important}.widget.widget-split.widget-split-6 input{max-width:60%!important}.widget.widget-split.widget-split-6 input[type="submit"]{max-width:40%!important}.widget.widget-split.widget-split-7 input{max-width:70%!important}.widget.widget-split.widget-split-7 input[type="submit"]{max-width:30%!important}.widget.fl_right input[type="submit"],.submit_container.fl_right .submit{float:right}.widget.lblp{padding-top:1.9em;min-height:2.1em}.widget.autoh{min-height:0}.widget,form{*zoom:1}
2 1
\ No newline at end of file
2
+input[type="text"],input[type="password"],input[type="date"],input[type="datetime"],input[type="email"],input[type="number"],input[type="search"],input[type="tel"],input[type="time"],input[type="url"],textarea,select{width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.widget input.captcha{max-width:4em}.formbody>fieldset{clear:left}.formbody>fieldset legend{color:inherit;font-size:123%;line-height:2;font-weight:normal;border:0;margin-bottom:1em}.widget .radio_container legend,.widget .checkbox_container legend{color:inherit;font-size:100%;font-weight:normal;border-bottom:0;display:block;margin-bottom:.4em;line-height:1.5em}.widget .checkbox_container label,.widget .radio_container label{font-weight:normal;display:inline;margin-bottom:0}.widget .checkbox_container>span,.widget .radio_container>span{display:block}.widget.headline{margin-top:1em;font-size:108%;font-weight:bold;min-height:1.5em}.widget{padding:0 1%;margin-bottom:.5em;min-height:4em;float:left;width:98%}.widget.cbx{min-height:1.5em;height:1.5em;padding:4px 1%}.widget label{display:block;margin-bottom:.4em;line-height:1.5em}.widget.error input,.widget.error select,.widget.error textarea{border-color:#e23e15}.widget p.error{font-size:85%;margin-top:-0.4em;margin-bottom:.4em}.widget.error .errortip{background-color:#e23e15;border-bottom-left-radius:50%;border-bottom-right-radius:50%;border-top-left-radius:50%;border-top-right-radius:50%;color:#fff;cursor:help;display:block;float:right;font-family:'Open Sans',Arial,Helvetica,sans-serif;font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;height:15px;line-height:13px;margin-top:3.25px;text-align:center;vertical-align:top;width:15px}.submit_container{min-height:2.1em}.widget.w5{float:left;width:3%}.widget.w10{float:left;width:8%}.widget.w15{float:left;width:13%}.widget.w20{float:left;width:18%}.widget.w25{float:left;width:23%}.widget.w30{float:left;width:28%}.widget.w35{float:left;width:33%}.widget.w40{float:left;width:38%}.widget.w45{float:left;width:43%}.widget.w50{float:left;width:48%}.widget.w55{float:left;width:53%}.widget.w60{float:left;width:58%}.widget.w65{float:left;width:63%}.widget.w70{float:left;width:68%}.widget.w75{float:left;width:73%}.widget.w80{float:left;width:78%}.widget.w85{float:left;width:83%}.widget.w90{float:left;width:88%}.widget.w95{float:left;width:93%}.widget.w100{float:left;width:98%}.widget.clr,.formbody>fieldset{clear:left}@media screen and (max-width:43em){.widget.w5,.widget.w10,.widget.w15,.widget.w20,.widget.w25,.widget.w30,.widget.w35,.widget.w40,.widget.w45,.widget.w50,.widget.w55,.widget.w60,.widget.w65,.widget.w70,.widget.w75,.widget.w80,.widget.w85,.widget.w90,.widget.w95,.widget.w100{float:none;width:98%}}.widget.w5:before,.widget.w5:after,.widget.w10:before,.widget.w10:after,.widget.w15:before,.widget.w15:after,.widget.w20:before,.widget.w20:after,.widget.w25:before,.widget.w25:after,.widget.w30:before,.widget.w30:after,.widget.w35:before,.widget.w35:after,.widget.w40:before,.widget.w40:after,.widget.w45:before,.widget.w45:after,.widget.w50:before,.widget.w50:after,.widget.w55:before,.widget.w55:after,.widget.w60:before,.widget.w60:after,.widget.w65:before,.widget.w65:after,.widget.w70:before,.widget.w70:after,.widget.w75:before,.widget.w75:after,.widget.w80:before,.widget.w80:after,.widget.w85:before,.widget.w85:after,.widget.w90:before,.widget.w90:after,.widget.w95:before,.widget.w95:after,.widget.w100:before,.widget.w100:after,form:before,form:after{content:" ";display:table}.widget.w5:after,.widget.w10:after,.widget.w15:after,.widget.w20:after,.widget.w25:after,.widget.w30:after,.widget.w35:after,.widget.w40:after,.widget.w45:after,.widget.w50:after,.widget.w55:after,.widget.w60:after,.widget.w65:after,.widget.w70:after,.widget.w75:after,.widget.w80:after,.widget.w85:after,.widget.w90:after,.widget.w95:after,.widget.w100:after,form:after{clear:both}.widget.widget-split input[type="text"],.widget.widget-split input[type="password"],.widget.widget-split input[type="date"],.widget.widget-split input[type="datetime"],.widget.widget-split input[type="email"],.widget.widget-split input[type="number"],.widget.widget-split input[type="search"],.widget.widget-split input[type="tel"],.widget.widget-split input[type="time"],.widget.widget-split input[type="url"],.widget.widget-split textarea,.widget.widget-split select{max-width:50%!important;min-width:10%!important;float:left;margin-right:10px;display:inline}.widget.widget-split.widget-split-3 input{max-width:30%!important}.widget.widget-split.widget-split-3 input[type="submit"]{max-width:70%!important}.widget.widget-split.widget-split-4 input{max-width:40%!important}.widget.widget-split.widget-split-4 input[type="submit"]{max-width:60%!important}.widget.widget-split.widget-split-5 input{max-width:50%!important}.widget.widget-split.widget-split-5 input[type="submit"]{max-width:50%!important}.widget.widget-split.widget-split-6 input{max-width:60%!important}.widget.widget-split.widget-split-6 input[type="submit"]{max-width:40%!important}.widget.widget-split.widget-split-7 input{max-width:70%!important}.widget.widget-split.widget-split-7 input[type="submit"]{max-width:30%!important}.widget.fl_right input[type="submit"],.submit_container.fl_right .submit{float:right}.widget.lblp{padding-top:1.9em;min-height:2.1em}.widget.autoh{min-height:0}.widget,form{*zoom:1}
3 3
\ No newline at end of file
... ...
@@ -32,7 +32,7 @@ $GLOBALS['TL_DCA']['tl_form_field']['fields']['eSM_fl_width'] = array
32 32
 	'exclude'                 => true,
33 33
 	'inputType'               => 'select',
34 34
 	'default'                 => 100,
35
-	'options'                 => array(10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100),
35
+	'options'                 => array(5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100),
36 36
 	'reference'               => &$GLOBALS['TL_LANG']['tl_form_field']['ref_width'],
37 37
 	'eval'                    => array('tl_class'=>'w50'),
38 38
 	'sql'                     => "varchar(3) NOT NULL default '100'"
... ...
@@ -32,6 +32,7 @@ $GLOBALS['TL_LANG']['tl_form_field']['formilicious_legend']  = 'Formilicious Fra
32 32
  */
33 33
 $GLOBALS['TL_LANG']['tl_form_field']['ref_width']     = array
34 34
 (
35
+	5   => '5 %',
35 36
 	10  => '10 %',
36 37
 	15  => '15 %',
37 38
 	20  => '20 %',