Permalink
Browse files

Design: freshen up navbar style

  • Loading branch information...
hnrch02 committed Jun 11, 2017
1 parent edb9d79 commit 2463d276cd5fe423cf756cdcf571f5a4c5cc016d
View
8 app.js
@@ -228,8 +228,8 @@ app.use(function(req, res, next) {
if(user) {
nav.main.push(
// { href: '/groups', name: 'Gruppen', view: /^groups/ },
{ href: '/support', name: 'Support', view: /^support/ },
{ href: '/members', name: 'Mitglieder', view: 'members' }
{ href: '/members', name: 'Mitglieder', view: 'members' },
{ href: '/support', name: 'Support', view: /^support/ }
)
// Admin
@@ -251,6 +251,10 @@ app.use(function(req, res, next) {
{ href: '/logout', form: true, content: '<button type="submit" class="btn btn-link" title="Ausloggen"><span class="icon icon-logout"></span></button>' }
)
} else { // Not logged-in
nav.main.push(
{ href: '/support', name: 'Support', view: /^support/ }
)
nav.right.push(
{ href: '/login', name: 'Login' },
{ href: '/signup', name: 'Registrieren' }
View
@@ -1,5 +1,4 @@
body {
padding-top: 40px;
background-color: @brand-darkest;
}
@@ -26,7 +25,7 @@ body {
}
#wrapper {
padding: 30px 0 70px;
padding: 20px 0 70px;
background-repeat: no-repeat;
background-position: center top;
background-size: cover;
@@ -156,42 +155,77 @@ body {
}
.navbar {
margin: 0;
border: none;
transform: translateZ(0);
will-change: transform;
}
.navbar-brand {
padding-right: 10px;
padding-left: 10px;
font-size: 20px;
color: @brand-primary;
}
@media (max-width: @grid-float-breakpoint) {
body {
padding-top: @navbar-height;
}
.navbar {
position: absolute;
top: 0;
left: 0;
right: 0;
z-index: @zindex-navbar;
}
}
@media (min-width: @grid-float-breakpoint) {
.navbar-header {
padding-left: 5px;
.navbar {
background: none;
}
.navbar-brand {
padding-right: 10px;
}
}
.navbar-inverse .navbar-brand {
color: @brand-primary;
}
.navbar-nav.navbar-right {
.navbar-nav {
@media (min-width: @grid-float-breakpoint) {
> li {
> a,
.btn-link {
padding: 10px 8px;
&.navbar-right {
> li {
> a,
.btn-link {
padding: @navbar-padding-vertical 8px;
}
}
}
&:last-child {
padding-right: 5px;
}
> .active {
> a,
.btn-link {
box-shadow: inset 0 -2px @brand-primary;
// position: relative;
// overflow: hidden;
// &::after {
// content: '';
// position: absolute;
// bottom: -4px;
// left: 50%;
// margin-left: -4px;
// width: 8px;
// height: 8px;
// transform: rotate(45deg);
// background-color: @brand-primary;
// }
}
}
}
.icon {
@@ -204,6 +238,14 @@ body {
}
}
.navbar-inverse .navbar-collapse {
background-color: @brand-darkest;
border-radius: 4px;
// border-radius: 4px 4px 0 0;
// border-bottom: 2px solid @brand-primary;
.tile-box-shadow();
}
.small-pulled-right {
display: block;
font-weight: 400;
View
@@ -179,7 +179,7 @@ pre {
}
}
.navbar-inverse .navbar-nav > .open > a {
.navbar .navbar-nav > .open > a {
&,
&:hover,
&:focus {
@@ -188,9 +188,12 @@ pre {
}
.navbar-toggle {
margin: 0;
padding: @navbar-padding-vertical @navbar-padding-horizontal;
height: @navbar-height;
border: 0;
.navbar-inverse & {
.navbar & {
&:hover,
&:focus {
background-color: transparent;
@@ -5,7 +5,6 @@
}
.account-column-right {
padding-right: 0;
padding-left: 10px;
}
}
View
@@ -1,12 +1,17 @@
.flash {
position: relative;
.tile-box-shadow;
&-message {
margin: 0;
padding-right: 0;
padding-left: 0;
border: 0;
border-radius: 0;
.close {
top: 0;
right: 0;
color: #000;
}
View
@@ -1,13 +1,11 @@
.hero {
padding-top: 6px;
color: @brand-text;
background-color: @brand-darkest;
counter-reset: hero-progress;
&-inner {
position: relative;
padding: 20px 40px 20px @grid-gutter-width / 2;
border-top: 1px solid @brand-darker;
}
button&-close {
@@ -136,7 +134,6 @@
padding-left: 0;
width: 100%;
max-width: @container-tablet - @grid-gutter-width;
border-top: 1px solid @brand-darker;
&-center {
justify-content: center;
View
@@ -1,5 +1,4 @@
.vista {
position: relative;
min-height: 500px;
color: @brand-text;
@@ -39,6 +38,17 @@
}
}
@media (min-width: @grid-float-breakpoint) {
> .navbar {
padding-top: 20px;
.navbar-collapse,
.dropdown-menu {
background-color: rgba(22, 25, 29, 0.75);
}
}
}
&-box {
display: block;
margin-bottom: 20px;
@@ -54,13 +64,16 @@
&-backdrop {
position: absolute;
top: 0;
left: 0;
right: 0;
height: 500px;
z-index: -10;
overflow: hidden;
@media (min-width: @grid-float-breakpoint) {
top: 0;
}
&-image {
position: absolute;
top: 50%;
@@ -353,7 +353,7 @@
//##
// Basics of a navbar
@navbar-height: 40px;
@navbar-height: 48px;
@navbar-margin-bottom: @line-height-computed;
@navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
@@ -388,14 +388,14 @@
// Reset inverted navbar basics
@navbar-inverse-color: #fff;
@navbar-inverse-bg: @brand-darkest;
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
@navbar-inverse-border: @brand-primary;
// Inverted navbar links
@navbar-inverse-link-color: #fff;
@navbar-inverse-link-hover-color: @brand-primary;
@navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-active-color: #fff;
@navbar-inverse-link-active-bg: @brand-primary;
@navbar-inverse-link-active-color: ;
@navbar-inverse-link-active-bg: transparent;
@navbar-inverse-link-disabled-color: #ccc;
@navbar-inverse-link-disabled-bg: transparent;
View
@@ -4,8 +4,6 @@ block content
.small-container
include ../partials/flash
.panel.panel-default.panel-lg
.panel-heading
@@ -9,8 +9,6 @@ block content
+profileCard(profile)
.col-md-9
include ../partials/flash
.panel.panel-default
.panel-heading
h3.panel-title Deine Freunde
View
@@ -8,8 +8,6 @@ block content
.col-md-9
.row
include ../partials/flash
.account-column-left.col-md-6
- var hasCustomAvatar = user.avatar.type === 'upload'
.panel.panel-default
@@ -25,8 +25,6 @@ block content
- var isViewingOwnProfile = user && user.username === profile.username
if !hasContent && !isViewingOwnProfile
include ../partials/flash
.profile.is-empty
+profileCard(profile)
@@ -36,8 +34,6 @@ block content
+profileCard(profile)
.col-md-9
include ../partials/flash
if isViewingOwnProfile
.panel.panel-default
if hasContent
@@ -10,8 +10,6 @@ block content
.col-md-9
include ../partials/flash
.panel.panel-default
.panel-heading
h3.panel-title Sessions
View
@@ -4,8 +4,6 @@ block content
.small-container
include ../../partials/flash
.panel.panel-default.panel-lg
.panel-heading
View
@@ -2,8 +2,6 @@ extends ../../layout
block content
include ../../partials/flash
.row.u-mb
.col-md-12
a.btn.btn-default.pull-right(href=url('./new')) Neuen Eintrag erstellen
@@ -7,8 +7,6 @@ block content
.col-md-9
include ../../partials/flash
.panel.panel-default.panel-lg
.panel-heading
@@ -9,8 +9,6 @@ block content
.col-md-9
include ../../partials/flash
.panel.panel-default
.panel-heading
@@ -2,8 +2,6 @@ extends ../../layout
block content
include ../../partials/flash
.row
.col-md-12
.panel.panel-default
@@ -9,8 +9,6 @@ block content
.col-md-9
include ../../partials/flash
.panel.panel-default
.panel-heading
h3.panel-title XP
Oops, something went wrong.

0 comments on commit 2463d27

Please sign in to comment.