diff options
| -rwxr-xr-x | boot.php | 4 | ||||
| -rw-r--r-- | view/css/bootstrap-red.css | 16 | ||||
| -rw-r--r-- | view/css/widgets.css | 16 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 20 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/cover_photo_widget.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_checkbox.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/field_input.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/field_intcheckbox.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/field_password.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_select.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_textarea.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_yesno.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 1 |
14 files changed, 60 insertions, 60 deletions
@@ -48,7 +48,6 @@ require_once('include/xchan.php'); require_once('include/hubloc.php'); - define ( 'PLATFORM_NAME', 'red' ); define ( 'STD_VERSION', '5.3' ); @@ -2301,7 +2300,10 @@ function cert_bad_email() { ) ] ); +<<<<<<< HEAD +======= +>>>>>>> 95f4f14dca1ea982f67cccb31d860f7b8ed9055c } diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 8e6f4c882..feddc652a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -48,6 +48,7 @@ nav.navbar { #navbar-collapse-2 { flex-basis: 100%; + max-height: 70vh; } #navbar-collapse-2.show { @@ -59,6 +60,10 @@ nav.navbar { } /* nav overrides end */ +.btn-outline-secondary { + color: #aaa; +} + .wall-item-tools .dropdown-menu { min-width: auto; } @@ -67,6 +72,11 @@ code { white-space: normal; } -/* Bootstrap assumes that checkboxes are on the left of labels, while it's usually the opposite in Red */ -.field.checkbox input[type="checkbox"] { margin-left: 0px; } -.field.checkbox label { padding-left: 0px; font-weight: 700} +.form-group label { + font-weight: bold; +} + +small, +.small { + font-size: 0.75rem; +} diff --git a/view/css/widgets.css b/view/css/widgets.css index c6eea1f41..6cd61ae6f 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -143,18 +143,14 @@ li:hover .group-edit-icon { bottom: 0px; left: 0px; width: 100%; - padding: 15px; - color: #fff; - font-weight: bold; - text-shadow: 1px 1px 3px rgba(0,0,0,.7); -} - -.cover-photo-title { - font-size: 30px; + padding: 1rem; } -.cover-photo-subtitle { - font-size: 20px; +#cover-photo-caption h1, +#cover-photo-caption h3 { + color: #fff; + font-weight: bold; + text-shadow: 1px 1px 3px rgba(0,0,0,0.5); } a.wikilist { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 29242db27..1e8d18269 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -117,7 +117,7 @@ a:focus, } input, optgroup, select, textarea { - color: $font_colour; + font-size: 0.9rem !important; resize: vertical; } @@ -196,7 +196,7 @@ nav { width: 100%; max-height: 50%; background: $comment_item_colour; - padding: 20px; + padding: 1rem; border-bottom: #ccc 1px solid; overflow: auto; -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); @@ -1059,8 +1059,6 @@ img.mail-conv-sender-photo { height: $reply_photo; } - - .wall-item-ago, .dropdown-sub-text { color: #777; @@ -1480,17 +1478,17 @@ dl.bb-dl > dd > li { /* Turn checkboxes into switches */ -.field.checkbox > div { +.form-group.checkbox > div { position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } -.field.checkbox input { +.form-group.checkbox input { display: none; } -.field.checkbox > div label { +.form-group.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; border-radius: 4px; @@ -1500,11 +1498,11 @@ dl.bb-dl > dd > li { transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } -.field.checkbox:hover label { +.form-group.checkbox:hover label { color: $link_colour; } -.field.checkbox:hover > div label { +.form-group.checkbox:hover > div label { border-color: $link_colour; } @@ -1543,11 +1541,11 @@ dl.bb-dl > dd > li { -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } -.field.checkbox > div > input:checked + label .onoffswitch-inner { +.form-group.checkbox > div > input:checked + label .onoffswitch-inner { margin-left: 0px; } -.field.checkbox > div > input:checked + label .onoffswitch-switch { +.form-group.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; background-color: #0275d8; } diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index e0b31162a..f4f851c8a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -32,7 +32,7 @@ <div id="acl-wrapper"> <div id="acl-list"> <input class="form-control" type="text" id="acl-search" placeholder=" {{$search}}"> - <div class="p-2 dropdown-sub-text">{{$showlimitedDesc}}</div> + <small class="text-muted">{{$showlimitedDesc}}</small> <div id="acl-list-content"></div> </div> </div> diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index 806866212..a9c384d2f 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -70,11 +70,7 @@ <div id="cover-photo" title="{{$hovertitle}}"> {{$photo_html}} <div id="cover-photo-caption"> - <div class="cover-photo-title"> - {{$title}} - </div> - <div class="cover-photo-subtitle"> - {{$subtitle}} - </div> + <h1>{{$title}}</h1> + <h3>{{$subtitle}}</h3> </div> </div> diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 6785e522a..f779f937c 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,6 +1,5 @@ - <div id="{{$field.0}}_container" class="form-group field checkbox"> + <div id="{{$field.0}}_container" class="clearfix form-group checkbox"> <label for="id_{{$field.0}}">{{$field.1}}</label> - <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> - <span class="help-block">{{$field.3}}</span> + <div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> + <small class="form-text text-muted">{{$field.3}}</small> </div> - <div class="clear"></div> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index d6a7f56b2..65a837e5f 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,5 @@ - <div id="id_{{$field.0}}_wrapper" class='form-group field input'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> - <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> - <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> - <div class="clear"></div> + <div id="id_{{$field.0}}_wrapper" class="form-group"> + <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> + <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> + <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 565f97760..abfe6e189 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,6 +1,5 @@ - <div class="form-group field checkbox"> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div> - <span class='help-block'>{{$field.4}}</span> + <div class="clearfix form-group checkbox"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div> + <small class="form-text text-muted">{{$field.4}}</small> </div> - <div class="clear"></div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 1643fa855..fa5e14582 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ - <div class='form-group field password'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <input class="form-control" type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span id="help_{{$field.0}}" class="help-block">{{$field.3}}</span> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 762447290..cda9a823a 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,7 +1,7 @@ - <div class='form-group field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <select class="form-control" 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> - <span class='help-block'>{{$field.3}}</span> + <small class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index 01fdc23f5..437dece93 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ - <div class='form-group field textarea'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <textarea class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> - <span class='help-block'>{{$field.3}}</span> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> + <small class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl index f5a909833..8a4cda55b 100755 --- a/view/tpl/field_yesno.tpl +++ b/view/tpl/field_yesno.tpl @@ -1,4 +1,4 @@ - <div class='field yesno'> + <div class='clearfix form-group'> <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}}"> @@ -9,5 +9,5 @@ {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}} </a> </div> - <span class='field_help'>{{$field.3}}</span> + <small class='form-text text-muted'>{{$field.3}}</small> </div> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index f7953c5f3..c5b378b4f 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -206,6 +206,7 @@ {{$navapp|replace:'dropdown-item':'nav-link'}} {{/foreach}} {{if $localuser}} + <div class="dropdown-divider"></div> <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> {{/if}} </div> |