From 2dbc6eff0146e007287ecf897b790940446eefc8 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Mon, 20 Apr 2020 00:04:01 +0200 Subject: [PATCH] Adjust navbar styling --- app/assets/stylesheets/scss/navbar.scss | 42 +++---------------------- app/views/layouts/_header.html.haml | 2 +- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss index d6ee5188..6dd81f30 100644 --- a/app/assets/stylesheets/scss/navbar.scss +++ b/app/assets/stylesheets/scss/navbar.scss @@ -123,49 +123,17 @@ } .profile--image-avatar { - min-height: 50px; - min-width: 50px; - height: 50px; - width: 50px; + min-height: 40px; + min-width: 40px; + height: 40px; + width: 40px; + border-radius: 4px; } .navbar-inverse { border: none; } -@media (min-width: 769px) { - nav.navbar .nav > li:not(.profile--image-dropdown) { - -moz-osx-font-smoothing: grayscale; - position: relative; - - &:before { - content: ""; - position: absolute; - left: 0; - right: 0; - bottom: 0; - background: $navbar-inverse-link-color; - height: 0px; - -webkit-transition-property: height; - transition-property: height; - -webkit-transition-duration: 0.3s; - transition-duration: 0.3s; - -webkit-transition-timing-function: ease-out; - transition-timing-function: ease-out; - } - - &:hover, &:focus, &:active { - &:before { - height: 4px - } - } - - &.active:before { - height: 4px; - } - } -} - @media (max-width: 768px) { nav.navbar .nav { margin-bottom: 0; diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index bbd1d14d..897295f9 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -1,4 +1,4 @@ -%nav.navbar.navbar-light.navbar-expand-lg.bg-primary.fixed-top{role: "navigation"} +%nav.navbar.navbar-dark.navbar-expand-lg.bg-primary.fixed-top{role: "navigation"} .container{class: ios_web_app? ? "ios-web-app" : ''} %a.navbar-brand{href: "/"}= APP_CONFIG['site_name'] %button.navbar-toggler{"data-target" => "#j2-main-navbar-collapse", "data-toggle" => "collapse", type: "button"}