From 133292e241f9408ff793aa95aceec00c808fbd68 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 2 Jul 2017 11:24:17 +0200 Subject: update bs-dev and min version bump --- view/css/bootstrap-red.css | 4 ---- view/php/default.php | 2 +- view/php/full.php | 2 +- view/theme/redbasic/css/style.css | 8 ++++---- view/theme/redbasic/php/style.php | 2 +- view/tpl/chatrooms.tpl | 2 +- view/tpl/item_categories.tpl | 2 +- view/tpl/nav.tpl | 4 ++-- view/tpl/photo_albums.tpl | 2 +- 9 files changed, 12 insertions(+), 16 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 1bb82f11c..04db6193d 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -66,10 +66,6 @@ nav .dropdown-menu { } /* nav overrides end */ -.btn-outline-secondary { - color: #aaa; -} - .wall-item-tools .dropdown-menu { min-width: auto; } diff --git a/view/php/default.php b/view/php/default.php index e4553a17f..bd4d7dc22 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -8,7 +8,7 @@ >
- +
diff --git a/view/php/full.php b/view/php/full.php index 64e32c5bd..094874766 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -7,7 +7,7 @@
- +
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c7869de8f..510f7c80b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1380,17 +1380,17 @@ blockquote { background-color: $item_colour; } -.bg-inverse { +.bg-dark { background-color: $nav_bg !important; } -.navbar-inverse .navbar-nav .nav-link, +.navbar-dark .navbar-nav .nav-link, .usermenu i { color: $nav_icon_colour; } -.navbar-inverse .navbar-nav .nav-link:focus, -.navbar-inverse .navbar-nav .nav-link:hover, +.navbar-dark .navbar-nav .nav-link:focus, +.navbar-dark .navbar-nav .nav-link:hover, .usermenu:focus i, .usermenu:hover i { color: $nav_active_icon_colour; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 06cf23ba2..ad8220028 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -74,7 +74,7 @@ if ((!$schema) || ($schema == '---')) { //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) - $nav_bg = '#222'; + $nav_bg = '#343a40'; if (! $nav_icon_colour) $nav_icon_colour = 'rgba(255, 255, 255, 0.5)'; if (! $nav_active_icon_colour) diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index d3eeed24f..0e6847608 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -27,7 +27,7 @@ {{/if}} - {{$room.cr_inroom}} + {{$room.cr_inroom}} {{/foreach}} diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl index e1b183c0d..fa07fa39f 100644 --- a/view/tpl/item_categories.tpl +++ b/view/tpl/item_categories.tpl @@ -1,7 +1,7 @@ {{if $categories}} {{foreach $categories as $cat}} - {{if $cat.url}}{{$cat.term}}{{else}}{{$cat.term}}{{/if}} + {{if $cat.url}}{{$cat.term}}{{else}}{{$cat.term}}{{/if}} {{/foreach}} {{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 4719e1b17..f71feafe6 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -79,7 +79,7 @@
  • {{$al.total}}{{$al.shorttext}}
    • +
  • {{$al.total}}{{$al.shorttext}}
    • {{/if}} {{/foreach}} {{/if}} -- cgit v1.2.3