diff options
| -rw-r--r-- | view/css/mod_connect.css | 1 | ||||
| -rw-r--r-- | view/css/mod_group.css | 1 | ||||
| -rw-r--r-- | view/css/mod_settings.css | 2 | ||||
| -rw-r--r-- | view/css/mod_thing.css | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_checkbox.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/field_colorinput.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_combobox.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_custom.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_input.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_intcheckbox.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/field_password.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_radio.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_richtext.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_select.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/field_select_disabled.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_select_raw.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_textarea.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_themeselect.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_yesno.tpl | 2 |
21 files changed, 28 insertions, 18 deletions
diff --git a/view/css/mod_connect.css b/view/css/mod_connect.css index da1265c52..218b1d2cb 100644 --- a/view/css/mod_connect.css +++ b/view/css/mod_connect.css @@ -7,6 +7,7 @@ } /* first-of-type needed to style switches */ +#sellpage-edit label.mainlabel, #sellpage-edit label:first-of-type { width: 300px; } diff --git a/view/css/mod_group.css b/view/css/mod_group.css index cd6b7acc7..30a954d2a 100644 --- a/view/css/mod_group.css +++ b/view/css/mod_group.css @@ -4,6 +4,7 @@ } /* first-of-type needed to style switches */ +#group-edit-form label.mainlabel, #group-edit-form label:first-of-type { float: left; width: 300px; diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 7b0c8e7ed..b066e6059 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -29,6 +29,7 @@ ul#settings-privacy-macros { } /* first-of-type needed to be able to style switches */ +#settings-permissions-wrapper .field label.mainlabel, #settings-permissions-wrapper .field label:first-of-type { width: 350px; } @@ -43,6 +44,7 @@ ul#settings-privacy-macros { } /* first-of-type needed to be able to style switches */ +#settings-notifications .field label.mainlabel, #settings-notifications .field label:first-of-type { margin-left: 20px; width: 330px; diff --git a/view/css/mod_thing.css b/view/css/mod_thing.css index 9c1eb2b21..ddb2faa87 100644 --- a/view/css/mod_thing.css +++ b/view/css/mod_thing.css @@ -5,6 +5,7 @@ } /* first-of-type needed to style switches */ +.field label.mainlabel, .thing-label, .field label:first-of-type, .thing-verb-label, .thing-profile-label{ float: left; width: 350px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f88febf4d..61acc8ec7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -307,6 +307,7 @@ footer { } /* first-of-type needed to style switches */ +#main-login .field.checkbox label.mainlabel, #main-login .field.checkbox label:first-of-type { margin-bottom: 0; float: left; @@ -376,6 +377,7 @@ footer { margin-top: 20px; } /* first-of-type needed to style switches */ +#profile-edit-wrapper .field label.mainlabel, #profile-edit-wrapper .field label:first-of-type { width: 175px; } @@ -1244,6 +1246,7 @@ footer { } /* first-of-type needed to style switches */ +.field label.mainlabel, .field label:first-of-type { float: left; width: 350px; @@ -2358,6 +2361,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { /* Hide the placeholder label which is used for styling switches */ /* Many places give a width to all labels, so need to specifically set these to 0 width */ /* This should probably be moved to core */ +.field.checkbox label.switchlabel, .field.checkbox label:nth-of-type(2) { width: 0px; margin: 0px; @@ -2371,6 +2375,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { margin-left: -9999px; visibility: hidden; } +.field.checkbox input + label.switchlabel, .field.checkbox input + label:nth-of-type(2) { display: block; position: relative; diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 89de170b7..816af2a65 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,6 +1,6 @@ <tr> <td> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> </td> <td class="abook-them"> <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 7e4f00a2d..5c7f58ad1 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,4 +1,4 @@ <div class='field checkbox'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><label for='id_{{$field.0}}'></label><span class='field_help'>{{$field.3}}</span> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> + <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'></label><span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl index a68781698..a1e912186 100644 --- a/view/tpl/field_colorinput.tpl +++ b/view/tpl/field_colorinput.tpl @@ -1,5 +1,5 @@ <div class='field input color'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> <input class='color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> <div id='end_{{$field.0}}' class='field_end'></div> diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl index 1f9218954..337c60673 100755 --- a/view/tpl/field_combobox.tpl +++ b/view/tpl/field_combobox.tpl @@ -1,5 +1,5 @@ <div class='field combobox'> - <label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> {{* html5 don't work on Chrome, Safari and IE9 see https://github.com/thgreasi/datalist-polyfill <input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" > <datalist id="data_{{$field.0}}" > diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl index a6b49f6da..754f5b2f4 100755 --- a/view/tpl/field_custom.tpl +++ b/view/tpl/field_custom.tpl @@ -1,5 +1,5 @@ <div class='field custom'> - <label for='{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='{{$field.0}}'>{{$field.1}}</label> {{$field.2}} <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index a584f95e7..be6e3f047 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,5 +1,5 @@ <div class='field input'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> <div id='end_{{$field.0}}' class='field_end'></div> diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 41ee46822..1d0bd9175 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,4 +1,4 @@ <div class='field checkbox'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}}><label for='id_{{$field.0}}'></label><span class='field_help'>{{$field.4}}</span> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> + <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'></label><span class='field_help'>{{$field.4}}</span> </div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 23058f8a6..38ecf3d07 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ <div class='field password'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl index 147b6b834..a92324cad 100755 --- a/view/tpl/field_radio.tpl +++ b/view/tpl/field_radio.tpl @@ -1,5 +1,5 @@ <div class='field radio'> - <label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label> <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl index c8639cf10..378e02a62 100755 --- a/view/tpl/field_richtext.tpl +++ b/view/tpl/field_richtext.tpl @@ -1,5 +1,5 @@ <div class='field richtext'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 9aca26e7b..95d1855d6 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,5 +1,5 @@ <div class='field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl index f0090cf98..e241be895 100644 --- a/view/tpl/field_select_disabled.tpl +++ b/view/tpl/field_select_disabled.tpl @@ -1,5 +1,5 @@ <div class='field select'> - <label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> <select disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl index 861be3201..74d575bd0 100755 --- a/view/tpl/field_select_raw.tpl +++ b/view/tpl/field_select_raw.tpl @@ -1,5 +1,5 @@ <div class='field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}'> {{$field.4}} </select> diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index b454045c0..dad89a145 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ <div class='field textarea'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <textarea name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> <span class='field_help'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index a0e454bf5..120727478 100755 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,6 +1,6 @@ <script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> <div class='field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl index e36e775c7..f5a909833 100755 --- a/view/tpl/field_yesno.tpl +++ b/view/tpl/field_yesno.tpl @@ -1,5 +1,5 @@ <div class='field yesno'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <div class='onoff' id="id_{{$field.0}}_onoff"> <input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> <a href="#" class='off'> |