From 41235f9f0224b97a1e47c9ec0d0941b7ddccc8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 15 May 2021 17:49:34 +0200 Subject: [PATCH] Remove obsolete menu-text styles Since commit dcec003d0 we're only using the menu-text class in the admin layouts. So instead of defining styles for menu-text and then overwriting them in the admin section, we can define them just in the admin section. Since we don't have tags in the menu-text element in the admin section, we can remove their styles. And we can also remove the styles we were overriding twice (like `line-height`). --- app/assets/stylesheets/admin.scss | 13 +++++++------ app/assets/stylesheets/layout.scss | 27 --------------------------- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 6115a94aa..bb38174e3 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -116,6 +116,7 @@ $table-header: #ecf1f6; } .menu .menu-text { + padding: 0; h1 { margin-top: $line-height / 2; @@ -133,12 +134,12 @@ $table-header: #ecf1f6; } a { - color: #000 !important; - line-height: $line-height !important; - - @include breakpoint(medium) { - line-height: $line-height !important; - } + color: #000; + display: inline-block; + font-family: "Lato" !important; + font-size: rem-calc(24); + font-weight: lighter; + padding: 0; } } diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 93bd17600..9b5b95a29 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -550,33 +550,6 @@ body > header, padding-right: rem-calc(15); } - .menu .menu-text { - padding: 0; - - a { - color: #fff; - display: inline-block; - font-family: "Lato" !important; - font-size: rem-calc(24); - font-weight: lighter; - line-height: $line-height * 2; - padding: 0; - - @include breakpoint(medium) { - line-height: rem-calc(80); - margin-top: 0; - } - - img { - - @include breakpoint(medium) { - margin-right: $line-height / 2; - margin-top: 0; - } - } - } - } - .menu > li { display: block; width: 100%;