From 1e6b737d3c3e86b8221e12eed755c1548b34f3eb Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Fri, 15 Apr 2022 17:18:46 +0200 Subject: [PATCH] Corrected all code styles that need manual intervention --- slt/.stylelintrc.json | 4 ++- slt/css/core/_default-classes.scss | 14 +++++----- slt/css/layout/_menu.scss | 41 ++++++++++++++---------------- slt/css/layout/_mobile-menu.scss | 26 +++++++++---------- slt/css/layout/_topmenu.scss | 21 ++++++++++----- slt/css/style.scss | 8 +++--- 6 files changed, 59 insertions(+), 55 deletions(-) diff --git a/slt/.stylelintrc.json b/slt/.stylelintrc.json index 99e7990..8d9844d 100644 --- a/slt/.stylelintrc.json +++ b/slt/.stylelintrc.json @@ -6,6 +6,8 @@ ], "rules": { "indentation": 4, - "selector-class-pattern": "^([a-z][a-z0-9]*)((-|__)[a-z0-9]+)*$" + "selector-class-pattern": "^([a-z][a-z0-9]*)((-|__)[a-z0-9]+)*$", + "string-quotes": "single", + "declaration-colon-newline-after": null } } diff --git a/slt/css/core/_default-classes.scss b/slt/css/core/_default-classes.scss index eec656c..346362d 100644 --- a/slt/css/core/_default-classes.scss +++ b/slt/css/core/_default-classes.scss @@ -27,6 +27,13 @@ li.row-fluid { // background-color: initial; // } +.table-striped { + > thead > tr { + color: var(--color-effect-header, #000); + background-color: var(--color-effect-background-header, #aaa); + } +} + .list-striped li:nth-child(odd), .row-striped .row-fluid:nth-child(odd), .table-striped > tbody > tr:nth-child(odd) { @@ -41,13 +48,6 @@ li.row-fluid { background-color: var(--color-effect-background-header, #aaa); } -.table-striped { - > thead > tr { - color: var(--color-effect-header, #000); - background-color: var(--color-effect-background-header, #aaa); - } -} - .table-hover > tbody > tr:hover > * { color: unset; } diff --git a/slt/css/layout/_menu.scss b/slt/css/layout/_menu.scss index b267359..c2ac6b8 100644 --- a/slt/css/layout/_menu.scss +++ b/slt/css/layout/_menu.scss @@ -1,5 +1,14 @@ @use '../abstract' as abstract; +.nav, +.mod-menu__sub { + padding: 0; + + > li { + display: block; + } +} + .nav { font-size: inherit; color: var(--color-menu, #000); @@ -19,32 +28,20 @@ color: var(--color-menu-active, #000); background-color: var(--color-menu-background-active, #ccc); } -} -.mod-menu__sub { - font-size: small; + .mod-menu__sub { + font-size: small; + padding-left: 10px; + margin-left: 10px; - > li > a { - @include abstract.for-desktop { - display: block; - } - } -} + /* border-left: solid gray 1px; */ -.nav, -.mod-menu__sub { - padding: 0; + /* TODO */ - > li { - display: block; - - > .mod-menu__sub { - padding-left: 10px; - margin-left: 10px; - - /* border-left: solid gray 1px; */ - - /* TODO */ + > li > a { + @include abstract.for-desktop { + display: block; + } } } } diff --git a/slt/css/layout/_mobile-menu.scss b/slt/css/layout/_mobile-menu.scss index c03c6dd..3443de0 100644 --- a/slt/css/layout/_mobile-menu.scss +++ b/slt/css/layout/_mobile-menu.scss @@ -36,6 +36,18 @@ color: var(--color-menu-active, #000); background-color: var(--color-menu-background-active, #ccc); } + + margin-left: 5px; + margin-right: 5px; + + ul { + border: none; + } + + > ul.nav { + margin-left: -5px; + margin-right: -5px; + } } .nav { @@ -50,20 +62,6 @@ flex-direction: column; } - li { - margin-left: 5px; - margin-right: 5px; - } - - li > ul.nav { - margin-left: -5px; - margin-right: -5px; - } - - li ul { - border: none; - } - > ul.mod-menu { background-color: initial; color: initial; diff --git a/slt/css/layout/_topmenu.scss b/slt/css/layout/_topmenu.scss index 1b38a18..57ab572 100644 --- a/slt/css/layout/_topmenu.scss +++ b/slt/css/layout/_topmenu.scss @@ -42,13 +42,6 @@ padding: 0; border-style: none; height: 100%; - - &:hover, - &:focus, - &.active { - color: var(--color-fg-top-dark, #000); - background-color: var(--color-bg-top-dark, #aaa); - } } .nav { @@ -91,6 +84,13 @@ background-color: inherit; } + &:hover, + &:focus, + &.active { + color: var(--color-fg-top-dark, #000); + background-color: var(--color-bg-top-dark, #aaa); + } + > .mod-menu__sub { position: absolute; display: none; @@ -119,6 +119,13 @@ } } + &:hover, + &:focus, + &.active { + color: var(--color-fg-top-dark, #000); + background-color: var(--color-bg-top-dark, #aaa); + } + &:hover > a { text-decoration: none; } diff --git a/slt/css/style.scss b/slt/css/style.scss index 7a1cee1..c7ca936 100644 --- a/slt/css/style.scss +++ b/slt/css/style.scss @@ -1,7 +1,7 @@ -@use "abstract"; -@use "core"; -@use "layout"; -@use "components"; +@use 'abstract'; +@use 'core'; +@use 'layout'; +@use 'components'; /* * Debug