Skip to content

Commit

Permalink
#884 Revamp Backstage navigation (design)
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick committed Aug 24, 2014
1 parent e1d3721 commit 2c6a2ce
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 43 deletions.
9 changes: 1 addition & 8 deletions backstage/css/accent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,8 @@

?>
<style>
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus, .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus, .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus, .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
color: <?php echo $accent ?>;
}

.panel-default .panel-heading, .pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus, .navbar-default .navbar-toggle, .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
.panel-default .panel-heading, .pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus {
background: <?php echo $accent ?>;
}

.pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus, .navbar {
border-color: <?php echo $accent ?>;
}
</style>
76 changes: 45 additions & 31 deletions backstage/css/style.css
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/*
* Copyright Studio 384
* Bootstrap Template: Aurore
* Version: 5.1
* Based on: Trent v1.1 (http://studio384.be/trent.php)
* Since: 3.3
* Bootstrap Template: Trent
* Version: 0.1
* Based on: Trent v1.2 (http://studio384.be/trent.php)
* Since: 0.1
* Bootstrap: 3.2.0
*/

/* General fixes */
Expand Down Expand Up @@ -62,52 +63,65 @@ label .help-block {
font-size: 85%;
}

/* Navbar */
.navbar {
background: #fff;
border: none;
border-bottom: 5px solid #14a3ff;
/* Navbars */
.navbar-default {
background: #0d4382;
background: linear-gradient(to right, #0d4382 0%, #3588e9 100%);
border-bottom-color: rgba(255,255,255,.2);
}

.navbar-default .navbar-nav > li > a, .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus, .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
background: none;
color: #14a3ff;
font-size: 14px;
.navbar-default .navbar-brand, .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus, .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus, .navbar-default .navbar-nav > li > a {
color: #fff;
}

.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
background: #fff;
.navbar-default .navbar-toggle {
border-color: #fff;
}

.navbar-default .navbar-brand {
font-size: 20px;
.navbar-default .navbar-toggle, .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
background-color: #fff;
}

.navbar-default .navbar-brand {
color: #bbb;
.navbar-default .navbar-toggle .icon-bar {
background-color: #0073c4;
}

.navbar-default .navbar-collapse {
border: none;
box-shadow: none;
.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
color: #fff;
background-color: transparent;
}

.navbar-default .navbar-nav > li > a {
color: #aaa;
/* Heading - jumbotron and navtabs */
.jumboheader {
color: #fff;
background: #0d4382;
background: linear-gradient(to right, #0d4382 0%, #3588e9 100%);
padding-top: 0;
padding-bottom: 0;
margin-bottom: 0;
}

.navbar-default .navbar-toggle {
.jumboheader h2 {
margin-top: 15px;
margin-bottom: 15px;
font-family: "Segoe UI Light";
}

.nav-tabs > li > a {
color: #fff;
}

.nav-tabs {
border: none;
}

.navbar-default .navbar-toggle .icon-bar {
background-color: #fff;
.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
border-color: #fff;
}

@media all and (min-width:768px) {
.nav-inner {
padding-left: 0;
}
.nav-tabs > li > a:hover, .nav > li > a:hover, .nav > li > a:focus {
border-color: rgba(255,255,255,.2);
background-color: rgba(255,255,255,.2);
}

/* Panels */
Expand Down
7 changes: 4 additions & 3 deletions include/backstage_functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ function generate_admin_menu($section ='', $page = '')

?>
<nav class="navbar navbar-fixed-top navbar-default" role="navigation">
<div class="nav-inner container">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand visible-xs-inline" href="../index.php">ModernBB</a>
<a class="navbar-brand visible-xs-inline" href="../index.php">Luna</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="hidden-xs"><a href="../"><span class="glyphicon glyphicon-chevron-left"></span></a></li>
<li class="hidden-xs"><a href="../"><span class="fa fa-arrow-left"></span></a></li>
<li class="<?php if ($section == 'backstage') echo 'active'; ?>"><a href="index.php"><span class="fa fa-dashboard"></span> <?php echo $lang['Backstage'] ?></a></li>
<li class="<?php if ($section == 'content') echo 'active'; ?>"><a href="board.php"><span class="fa fa-file"></span> <?php echo $lang['Content'] ?></a></li>
<li class="<?php if ($section == 'users') echo 'active'; ?>"><a href="users.php"><span class="fa fa-users"></span> <?php echo $lang['Users'] ?></a></li>
Expand Down
2 changes: 1 addition & 1 deletion include/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Version
const FORUM_VERSION = '3.5-dev';

// The ModernBB Core version
const FORUM_CORE_VERSION = '0.0.40.2911';
const FORUM_CORE_VERSION = '0.0.40.2913';

// The database version number, every change in the database requires this number to go one up
const FORUM_DB_VERSION = 77;
Expand Down

0 comments on commit 2c6a2ce

Please sign in to comment.