From 3e37c8a3f1980f59376073b58bcfae72cb5d6c1b Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Wed, 3 Jul 2019 04:43:35 +0800 Subject: [PATCH] Change underscores in CSS classes to hyphens These were triggering a warning from scss-lint. --- app/assets/stylesheets/darkswarm/menu.css.scss | 14 +++++++------- app/views/shared/menu/_language_selector.html.haml | 2 +- app/views/shared/menu/_large_menu.html.haml | 4 ++-- app/views/shared/menu/_signed_in.html.haml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss index 077d12219e..5d2a07e3a6 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.scss +++ b/app/assets/stylesheets/darkswarm/menu.css.scss @@ -14,17 +14,17 @@ nav.top-bar { } @media #{$large-only} { - .top-bar__menu-item-with-icon span { + .top-bar--menu-item-with-icon span { display: none; } - .top-bar__current-hub-prefix, - .top-bar__current-hub-name { + .top-bar--current-hub-prefix, + .top-bar--current-hub-name { display: inline-block; vertical-align: middle; } - .top-bar__current-hub-name { + .top-bar--current-hub-name { max-width: 10em; overflow: hidden; text-overflow: ellipsis; @@ -32,12 +32,12 @@ nav.top-bar { } } -.top-bar-section ul li > a.top-bar__menu-item-with-icon { +.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 { +.top-bar--menu-item-with-icon i, +.top-bar--menu-item-with-icon img { line-height: $topbar-height; } diff --git a/app/views/shared/menu/_language_selector.html.haml b/app/views/shared/menu/_language_selector.html.haml index 2a5dd1439e..b69205f61e 100644 --- a/app/views/shared/menu/_language_selector.html.haml +++ b/app/views/shared/menu/_language_selector.html.haml @@ -1,5 +1,5 @@ %li.language-switcher.has-dropdown - %a{href: '#', class: "top-bar__menu-item-with-icon"} + %a{href: '#', class: "top-bar--menu-item-with-icon"} %i.ofn-i_071-globe %span= t 'language_name' %ul.dropdown diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index a756ebfc11..aa814a2a36 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -29,9 +29,9 @@ %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.hub.id", "ng-cloak" => true} %a{href: main_app.shop_path} - %span{ class: "top-bar__current-hub-prefix" } + %span{ class: "top-bar--current-hub-prefix" } = t 'label_shopping' = '@' - %span{ class: "top-bar__current-hub-name" } {{ CurrentHub.hub.name | truncate:25 }} + %span{ class: "top-bar--current-hub-name" } {{ CurrentHub.hub.name | truncate:25 }} %li.cart{"ng-cloak" => true} = render partial: "shared/menu/cart" diff --git a/app/views/shared/menu/_signed_in.html.haml b/app/views/shared/menu/_signed_in.html.haml index 063e98e9cc..d7b3715c4f 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: "#", class: "top-bar__menu-item-with-icon"} + %a{href: "#", class: "top-bar--menu-item-with-icon"} %img{ src: "/assets/menu/icn-profile.svg" } %span = t '.profile'