diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-02 18:58:43 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-02 18:58:43 -0700 |
| commit | 48063fa5ef93e4e6880553fd4f9831cbc9ef4ef1 (patch) | |
| tree | faa91eda94b438680cb4795280a7d9c61d2913e1 /view | |
| parent | 64cad0a041e44940f75bf351fc3755b3202f9029 (diff) | |
| parent | 133292e241f9408ff793aa95aceec00c808fbd68 (diff) | |
| download | volse-hubzilla-48063fa5ef93e4e6880553fd4f9831cbc9ef4ef1.tar.gz volse-hubzilla-48063fa5ef93e4e6880553fd4f9831cbc9ef4ef1.tar.bz2 volse-hubzilla-48063fa5ef93e4e6880553fd4f9831cbc9ef4ef1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 4 | ||||
| -rw-r--r-- | view/php/default.php | 2 | ||||
| -rw-r--r-- | view/php/full.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
| -rw-r--r-- | view/tpl/chatrooms.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/item_categories.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 321778d39..1918f399b 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 @@ <body <?php if($page['direction']) echo 'dir="rtl"' ?> > <?php if(x($page,'banner')) echo $page['banner']; ?> <header><?php if(x($page,'header')) echo $page['header']; ?></header> - <nav class="navbar fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <main> <aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> 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 @@ </head> <body> <header><?php if(x($page,'header')) echo $page['header']; ?></header> - <nav class="navbar fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <section><?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> </section> diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0dee7dead..71ae085ea 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1344,13 +1344,17 @@ main.fullscreen .section-content-wrapper-np { /* bootstrap overrides */ .btn, -.rounded-top, .form-control, .nav-pills .nav-link, .nav-tabs .nav-link { border-radius: $radius; } +.rounded-top { + border-top-left-radius: $radius !important; + border-top-right-radius: $radius !important; +} + blockquote { font-size: 1rem; font-style: italic; @@ -1380,17 +1384,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 @@ <ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </td> - <td><span class="badge badge-default">{{$room.cr_inroom}}</span></td> + <td><span class="badge badge-secondary">{{$room.cr_inroom}}</span></td> </tr> {{/foreach}} </table> 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}} <!--div class="categorytags"--> {{foreach $categories as $cat}} -<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i> {{if $cat.url}}<a class="text-white" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> +<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i> {{if $cat.url}}<a class="text-dark" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> {{/foreach}} <!--/div--> {{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index e1ee07935..051797658 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -79,7 +79,7 @@ <li class="nav-item dropdown net-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu"> <i class="fa fa-fw fa-th"></i> - <span class="badge badge-pill badge-default net-update"></span> + <span class="badge badge-pill badge-secondary net-update"></span> </a> <div id="nav-network-menu" class="dropdown-menu" rel="network"> <a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a> @@ -118,7 +118,7 @@ <li class="nav-item dropdown all_events-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu"> <i class="fa fa-fw fa-calendar"></i> - <span class="badge badge-pill badge-default all_events-update"></span> + <span class="badge badge-pill badge-secondary all_events-update"></span> </a> <div id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> <a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a> diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index a238e61bc..83bdd95e7 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -5,7 +5,7 @@ {{if $albums}} {{foreach $albums as $al}} {{if $al.shorttext}} - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-secondary float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li> {{/if}} {{/foreach}} {{/if}} |