From 194c0370fb727397ac72dba03b223da3fc6cde9b Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 18 Jun 2018 17:17:42 +0200 Subject: [PATCH] Simplified top menu bar --- app/assets/stylesheets/customisations.scss | 33 ++++++++++++---------- app/views/layouts/_topbar.slim | 19 +++++++------ 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/customisations.scss b/app/assets/stylesheets/customisations.scss index a1ac2b1..2a685f1 100644 --- a/app/assets/stylesheets/customisations.scss +++ b/app/assets/stylesheets/customisations.scss @@ -62,19 +62,22 @@ body } } -.top-bar-left .menu .menu-text +.top-bar-left { - // Display the site name in a larger font - font-size: 26px; - padding: 8px 5px 3px 0; - color: $dark-gray; - font-weight: normal; - + .menu .menu-text + { + // Display the site name in a larger font + font-size: 26px; + padding: 8px 5px 3px 0; + color: $dark-gray; + font-weight: normal; + } + // Extra space around the Linux distribution's logo - // img - // { - // padding: 0 5px; - // } + img + { + padding: 5px; + } } // Make thumbnails equally high @@ -383,11 +386,11 @@ a.black width: inherit !important; } -.top-bar-title a { - font-size: 1.8rem; +// .top-bar-title a { + // font-size: 1.8rem; // font-weight: bold; - line-height: 1; -} + // line-height: 1; +// } .button { // box-shadow: 0px 0px 5px #000000; diff --git a/app/views/layouts/_topbar.slim b/app/views/layouts/_topbar.slim index 67665db..dc3bba0 100644 --- a/app/views/layouts/_topbar.slim +++ b/app/views/layouts/_topbar.slim @@ -1,18 +1,19 @@ nav.top-bar .top-bar-left ul.menu + li + img src="/images/logos/debian.svg" width="38" alt="Debian logo" li.menu-text a href='/' // TODO: Make the logo depend on the virtual host - img src="/images/logos/debian.svg" width="35" alt="Debian logo" // TODO: Use proper distribution name ' Debian Screenshots > - .top-bar-right - ul.dropdown.menu data-dropdown-menu=true - li class=('active' if controller_name=='welcome' and action_name=='home') + / .top-bar-right + / ul.menu + li.menu-text class=('active' if controller_name=='welcome' and action_name=='home') a href="/" Home - li class=('active' if controller_name=='packages') + li.menu-text class=('active' if controller_name=='packages') a href="/packages" Explore //li.has-dropdown //a href="#" Distributions @@ -22,23 +23,23 @@ nav.top-bar //a href="#" Debian //li //a href="#" Ubuntu - li class=('active' if controller_name=='welcome' and action_name=='about') + li.menu-text class=('active' if controller_name=='welcome' and action_name=='about') a href="/about" About // Add link if user has uploaded screenshots - if @current_users_screenshots and @current_users_screenshots.any? - li class=('active' if controller_name=='my' and action_name=='uploads') + li.menu-text class=('active' if controller_name=='my' and action_name=='uploads') = link_to my_uploads_path ' My uploads span.badge.secondary = @current_users_screenshots.count // TODO: Check correct classes in Zurb/Foundation for top bar! - if user_signed_in? and current_user.is_admin? - li + li.menu-text a href='#' Admin / ul.menu.vertical / li = link_to 'Moderate', moderate_path / li = link_to 'Logs', logs_path - li class=('active' if controller_name=='my') + li.menu-text class=('active' if controller_name=='my') - if user_signed_in? = link_to "My", my_profile_path - else