From dc55c710da8b52c9a8e60663ad00aae28bbc8c6b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 31 Mar 2017 13:38:55 +0200 Subject: add max height to #navbar-collapse-2 --- view/css/bootstrap-red.css | 1 + view/tpl/nav.tpl | 1 + 2 files changed, 2 insertions(+) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 1c7bdd864..9aed24385 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 { 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}} +
{{$addapps}} {{/if}} -- cgit v1.2.3 From 614366e499eb5735673ebceb6814440f66968826 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 31 Mar 2017 13:59:28 +0200 Subject: css fixes --- view/css/widgets.css | 16 ++++++---------- view/theme/redbasic/css/style.css | 2 +- view/tpl/cover_photo_widget.tpl | 8 ++------ 3 files changed, 9 insertions(+), 17 deletions(-) (limited to 'view') 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..f96bd8dda 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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); 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 @@
{{$photo_html}}
-
- {{$title}} -
-
- {{$subtitle}} -
+

{{$title}}

+

{{$subtitle}}

-- cgit v1.2.3 From 572a04b40acf39530e86175a71da898c851ca710 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 31 Mar 2017 14:20:13 +0200 Subject: make btn-outline-secondary color slightly darker --- view/css/bootstrap-red.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 9aed24385..1f005989d 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -60,6 +60,10 @@ nav.navbar { } /* nav overrides end */ +.btn-outline-secondary { + color: #777; +} + .wall-item-tools .dropdown-menu { min-width: auto; } -- cgit v1.2.3 From 1bcee2f11c10ef6844383ea3ba8d15862604f8d1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 31 Mar 2017 16:13:58 +0200 Subject: various form css fixes --- view/css/bootstrap-red.css | 7 ++++--- view/theme/redbasic/css/style.css | 18 ++++++++---------- view/tpl/acl_selector.tpl | 2 +- view/tpl/field_checkbox.tpl | 7 +++---- view/tpl/field_input.tpl | 9 ++++----- view/tpl/field_intcheckbox.tpl | 9 ++++----- view/tpl/field_password.tpl | 8 ++++---- view/tpl/field_select.tpl | 8 ++++---- view/tpl/field_textarea.tpl | 8 ++++---- view/tpl/field_yesno.tpl | 4 ++-- 10 files changed, 38 insertions(+), 42 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 1f005989d..2d2f3ba8c 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -72,6 +72,7 @@ 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; +padding-left: 0px; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f96bd8dda..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; } @@ -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 @@
-
{{$showlimitedDesc}}
+ {{$showlimitedDesc}}
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 @@ -
+
-
- {{$field.3}} +
+ {{$field.3}}
-
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 @@ -
- - - {{$field.3}} -
+
+ + + {{$field.3}}
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 @@ -
- -
- {{$field.4}} +
+ +
+ {{$field.4}}
-
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 @@ -
- - {{if $field.4}} {{$field.4}} {{/if}} - {{$field.3}} +
+ + {{if $field.4}} {{$field.4}} {{/if}} + {{$field.3}}
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 @@ -
- - {{foreach $field.4 as $opt=>$val}}{{/foreach}} - {{$field.3}} + {{$field.3}}
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 @@ -
- - - {{$field.3}} +
+ + + {{$field.3}}
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 @@ -
+
@@ -9,5 +9,5 @@ {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
- {{$field.3}} + {{$field.3}}
-- cgit v1.2.3 From 391854058ea6b14ddb3cfe09dbf2999595afc2e1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 31 Mar 2017 18:13:36 +0200 Subject: minor css adjustments --- view/css/bootstrap-red.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 2d2f3ba8c..eaa51e79c 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -74,5 +74,9 @@ code { .form-group label { font-weight: bold; -padding-left: 0px; +} + +small, +.small { + font-size: 0.75rem; } -- cgit v1.2.3 From 95f4f14dca1ea982f67cccb31d860f7b8ed9055c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 31 Mar 2017 19:14:24 +0200 Subject: triple a is more sane --- view/css/bootstrap-red.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index eaa51e79c..bbce5339f 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -61,7 +61,7 @@ nav.navbar { /* nav overrides end */ .btn-outline-secondary { - color: #777; + color: #aaa; } .wall-item-tools .dropdown-menu { -- cgit v1.2.3