From a58a23dd92f2a1dced9da8c8b2100b0c09b7acff Mon Sep 17 00:00:00 2001 From: David Suissa <12232-DYdave@users.noreply.drupalcode.org> Date: Fri, 2 Aug 2024 16:09:22 +0000 Subject: [PATCH] Issue #3462195: GitlabCI: Fix Stylelint validation errors --- .gitlab-ci.yml | 7 ++++++ css/admin.toolbar.css | 45 +++++++++++++++++++++++------------- css/admin.toolbar_search.css | 8 +++---- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 359886f..794c761 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,3 +30,10 @@ variables: OPT_IN_TEST_NEXT_MINOR: 1 OPT_IN_TEST_NEXT_MAJOR: 1 OPT_IN_TEST_MAX_PHP: 1 + +# +# Stylelint overrides and configuration. +# +stylelint: + # Require stylelint to pass. + allow_failure: false diff --git a/css/admin.toolbar.css b/css/admin.toolbar.css index a397cf2..154ce87 100644 --- a/css/admin.toolbar.css +++ b/css/admin.toolbar.css @@ -6,16 +6,19 @@ background: #abeae4; } -.toolbar-tray-horizontal .toolbar-menu:not(:first-child) li.menu-item--expanded > a:focus { - background-position: center right; +.toolbar-tray-horizontal + .toolbar-menu:not(:first-child) + li.menu-item--expanded + > a:focus { background-image: url(../misc/icons/0074bd/chevron-right.svg); background-repeat: no-repeat; + background-position: center right; } .toolbar-tray-horizontal .menu-item--expanded .menu { - background: #fff; width: auto; height: auto; + background: #fff; } .toolbar-tray-horizontal .menu-item--expanded { @@ -30,8 +33,8 @@ } .toolbar .toolbar-tray-horizontal .menu-item:last-child { - border-left: 1px solid #ddd; border-right: 1px solid #ddd; + border-left: 1px solid #ddd; } .toolbar .toolbar-tray-horizontal ul ul li.menu-item:first-child { @@ -42,8 +45,8 @@ .toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul, .toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul ul, .toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul ul ul { - display: none; left: -999em; /* LTR */ + display: none; } /* Lists nested under hovered list items */ @@ -52,8 +55,8 @@ .toolbar-tray-horizontal li li li.menu-item--expanded.hover-intent ul, .toolbar-tray-horizontal li li li li.menu-item--expanded.hover-intent ul, .toolbar-tray-horizontal li li li li li.menu-item--expanded.hover-intent ul { - display: block; left: auto; /* LTR */ + display: block; } .toolbar-tray-horizontal .menu ul li a, @@ -62,11 +65,11 @@ } .toolbar-tray-horizontal ul li.menu-item--expanded.hover-intent ul { - display: block; position: absolute; + z-index: 1; + display: block; width: 200px; box-shadow: 2px 2px 3px hsla(0, 0%, 0%, 0.4); - z-index: 1; } .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item > ul { @@ -74,9 +77,9 @@ } .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded { - background-position: center right; background-image: url(../misc/icons/0074bd/chevron-right.svg); background-repeat: no-repeat; + background-position: center right; } .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item.hover-intent ul { @@ -94,29 +97,39 @@ .toolbar-tray-horizontal .toolbar .level-2 > ul { position: absolute; - padding-top: 0; top: 0; left: 200px; width: 200px; + padding-top: 0; } .toolbar .toolbar-tray-vertical li.open > ul.toolbar-menu.clearfix { display: block; } -.toolbar-menu .menu-item > span { - padding: 1em 1.3333em; +.toolbar-menu .menu-item > span { display: block; - color: #434343; + padding: 1em 1.3333em; cursor: pointer; + color: #434343; } -[dir="rtl"] .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded { - background-position: center left; +[dir="rtl"] + .toolbar-tray-horizontal + ul + li.menu-item--expanded + ul + li.menu-item--expanded { background-image: url(../misc/icons/0074bd/chevron-left.svg); + background-position: center left; } -[dir="rtl"] .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item.hover-intent ul { +[dir="rtl"] + .toolbar-tray-horizontal + ul + li.menu-item--expanded + .menu-item.hover-intent + ul { margin: -40px 197px 0 0; } diff --git a/css/admin.toolbar_search.css b/css/admin.toolbar_search.css index d4a18da..a48620d 100644 --- a/css/admin.toolbar_search.css +++ b/css/admin.toolbar_search.css @@ -2,19 +2,19 @@ padding-left: 1em; } -#admin-toolbar-search-tab .toolbar-item:before { +#admin-toolbar-search-tab .toolbar-item::before { background-image: url(../misc/icons/bebebe/loupe.svg); } -#admin-toolbar-search-tab .toolbar-item:active:before, -#admin-toolbar-search-tab .toolbar-item.is-active:before { +#admin-toolbar-search-tab .toolbar-item:active::before, +#admin-toolbar-search-tab .toolbar-item.is-active::before { background-image: url(../misc/icons/ffffff/loupe.svg); } #toolbar-item-administration-search-tray label { display: inline-block; + margin-right: 0.5em; color: #000; - margin-right: .5em; font-weight: bold; } -- GitLab