From 89f0f38c83931f7bdf97e7d9dcf9a24506311b2f Mon Sep 17 00:00:00 2001 From: Paul Adam Davis Date: Fri, 28 Nov 2014 10:21:14 +0000 Subject: [PATCH] Swap nav item & logo style order Closes #4532 - Swaps the order of nav-item and .ghost-logo styles, as .ghost-logo was being overwritten by .nav-item, allowing a hover state --- .../assets/sass/components/navigation.scss | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/ghost/admin/assets/sass/components/navigation.scss b/ghost/admin/assets/sass/components/navigation.scss index a843f90c22..0e8948f725 100644 --- a/ghost/admin/assets/sass/components/navigation.scss +++ b/ghost/admin/assets/sass/components/navigation.scss @@ -4,8 +4,8 @@ // Styles for the main top bar & mobile navigation // // * Main wrapper -// * Ghost branding // * Nav Items +// * Ghost branding // * User Menu // * Mobile // ------------------------------------------------------------ @@ -37,34 +37,6 @@ } -// -// Ghost branding -// -------------------------------------------------- - -.ghost-logo { - width: 60px; - padding-right: 0; - text-align: center; - color: lighten($grey, 20%); - font-size: 1.2rem; - line-height: 1em; - transition: color 0.5s; - - span { - display: none; - } -} -.ghost-logo:hover, -.ghost-logo:focus { - color: $lightgrey; - transition: color 0.1s; - - .nav-label { - background: transparent; - } -} - - // // Nav Items // -------------------------------------------------- @@ -103,6 +75,34 @@ } +// +// Ghost branding +// -------------------------------------------------- + +.ghost-logo { + width: 60px; + padding-right: 0; + text-align: center; + color: lighten($grey, 20%); + font-size: 1.2rem; + line-height: 1em; + transition: color 0.5s; + + span { + display: none; + } +} +.ghost-logo:hover, +.ghost-logo:focus { + color: $lightgrey; + transition: color 0.1s; + + .nav-label { + background: transparent; + } +} + + // // User Menu // --------------------------------------------------