From 653067f58ccf07e5964ae797e63595eec2b449a7 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Wed, 3 Jul 2019 01:22:34 +0800 Subject: [PATCH] Omit text for top bar items with icon in large This affects only top bar menu items for: * Language * Profile This does not update the "Log in" menu item, because the currently selected icon might not be self explanatory. --- app/assets/stylesheets/darkswarm/menu.css.scss | 15 +++++++++++++++ .../shared/menu/_language_selector.html.haml | 4 ++-- app/views/shared/menu/_signed_in.html.haml | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss index 87e731133c..564625d8e1 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.scss +++ b/app/assets/stylesheets/darkswarm/menu.css.scss @@ -13,6 +13,21 @@ nav.top-bar { height: $topbar-height; } +@media #{$large-only} { + .top-bar__menu-item-with-icon span { + display: none; + } +} + +.top-bar-section ul li > a.top-bar__menu-item-with-icon { + display: inline; +} + +.top-bar__menu-item-with-icon i, +.top-bar__menu-item-with-icon img { + line-height: $topbar-height; +} + .top-bar-section { a.icon { &:hover { diff --git a/app/views/shared/menu/_language_selector.html.haml b/app/views/shared/menu/_language_selector.html.haml index 3e38095272..2a5dd1439e 100644 --- a/app/views/shared/menu/_language_selector.html.haml +++ b/app/views/shared/menu/_language_selector.html.haml @@ -1,8 +1,8 @@ %li.language-switcher.has-dropdown - %a{href: '#'} + %a{href: '#', class: "top-bar__menu-item-with-icon"} %i.ofn-i_071-globe %span= t 'language_name' %ul.dropdown - OpenFoodNetwork::I18nConfig.selectable_locales.each do |l| %li - %a{href: "?locale=#{l.to_s}" }= t('language_name', locale: l) \ No newline at end of file + %a{href: "?locale=#{l.to_s}" }= t('language_name', locale: l) diff --git a/app/views/shared/menu/_signed_in.html.haml b/app/views/shared/menu/_signed_in.html.haml index 404600046d..063e98e9cc 100644 --- a/app/views/shared/menu/_signed_in.html.haml +++ b/app/views/shared/menu/_signed_in.html.haml @@ -6,7 +6,7 @@ %li.user-menu.has-dropdown.not-click - %a{href: "#"} + %a{href: "#", class: "top-bar__menu-item-with-icon"} %img{ src: "/assets/menu/icn-profile.svg" } %span = t '.profile'