From 12ad550a4ab4a7ea12368fd203b350203363ff90 Mon Sep 17 00:00:00 2001 From: REJack Date: Tue, 28 Jun 2022 23:11:35 +0200 Subject: [PATCH] fix(stylelint): config extend broken & fontawesome class lint error --- .stylelintrc | 2 +- build/scss/_buttons.scss | 2 ++ build/scss/_cards.scss | 2 ++ build/scss/_carousel.scss | 2 ++ build/scss/_dropdown.scss | 2 +- build/scss/_forms.scss | 3 ++- build/scss/_main-header.scss | 3 ++- build/scss/_main-sidebar.scss | 10 ++++++---- build/scss/_miscellaneous.scss | 4 ++++ build/scss/_sidebar-mini.scss | 6 +++--- build/scss/_timeline.scss | 3 +++ build/scss/mixins/_animations.scss | 8 +++----- build/scss/mixins/_sidebar.scss | 10 +++++----- build/scss/pages/_iframe.scss | 4 ++-- 14 files changed, 38 insertions(+), 23 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index fd1002fa3..f6d2b27a5 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,6 +1,6 @@ { "extends": [ - "stylelint-config-twbs-bootstrap/scss" + "stylelint-config-twbs-bootstrap" ], "rules": { "declaration-no-important": null, diff --git a/build/scss/_buttons.scss b/build/scss/_buttons.scss index b7d4e0041..c754d0381 100644 --- a/build/scss/_buttons.scss +++ b/build/scss/_buttons.scss @@ -86,6 +86,7 @@ position: relative; text-align: center; + /* stylelint-disable selector-class-pattern */ // Icons within the btn > .fa, > .fas, @@ -102,6 +103,7 @@ > .svg-inline--fa { margin: 0 auto; } + /* stylelint-enable selector-class-pattern */ &:hover { background-color: $button-default-background-color; diff --git a/build/scss/_cards.scss b/build/scss/_cards.scss index 9899fa84c..026829dc6 100644 --- a/build/scss/_cards.scss +++ b/build/scss/_cards.scss @@ -411,6 +411,7 @@ html.maximized-card { display: none; float: right; + /* stylelint-disable selector-class-pattern */ // icons > .fa, > .fas, @@ -423,6 +424,7 @@ html.maximized-card { cursor: pointer; margin-right: 5px; } + /* stylelint-enable selector-class-pattern */ } &:hover .tools { diff --git a/build/scss/_carousel.scss b/build/scss/_carousel.scss index 539e1b54d..efdff26db 100644 --- a/build/scss/_carousel.scss +++ b/build/scss/_carousel.scss @@ -10,6 +10,7 @@ margin-right: 20px; } + /* stylelint-disable selector-class-pattern */ > .fa, > .fas, > .far, @@ -25,4 +26,5 @@ top: 50%; z-index: 5; } + /* stylelint-enable selector-class-pattern */ } diff --git a/build/scss/_dropdown.scss b/build/scss/_dropdown.scss index a8e101401..cebf18c1c 100644 --- a/build/scss/_dropdown.scss +++ b/build/scss/_dropdown.scss @@ -117,7 +117,7 @@ // Add fade animation to dropdown menus by appending // the class .animated-dropdown-menu to the .dropdown-menu ul (or ol) .open:not(.dropup) > .animated-dropdown-menu { - @include animation(flipInX .7s both); + @include animation(flip-in-x .7s both); backface-visibility: visible !important; } diff --git a/build/scss/_forms.scss b/build/scss/_forms.scss index cd795740b..bdc1e8c6a 100644 --- a/build/scss/_forms.scss +++ b/build/scss/_forms.scss @@ -33,7 +33,7 @@ } } } - +/* stylelint-disable selector-class-pattern */ // Support icons in form-control .form-control-feedback { &.fa, @@ -105,6 +105,7 @@ } } } +/* stylelint-enable selector-class-pattern */ label:not(.form-check-label):not(.custom-file-label) { font-weight: $font-weight-bold; diff --git a/build/scss/_main-header.scss b/build/scss/_main-header.scss index 43d25abe3..903ae8b9a 100644 --- a/build/scss/_main-header.scss +++ b/build/scss/_main-header.scss @@ -17,6 +17,7 @@ height: $nav-link-sm-height; padding: $nav-link-sm-padding-y $nav-link-padding-x; + /* stylelint-disable selector-class-pattern */ > .fa, > .fas, > .far, @@ -27,8 +28,8 @@ > .ion { font-size: $font-size-sm; } + /* stylelint-enable selector-class-pattern */ } - } .navbar-nav { diff --git a/build/scss/_main-sidebar.scss b/build/scss/_main-sidebar.scss index 32df3bdea..b2833b8a7 100644 --- a/build/scss/_main-sidebar.scss +++ b/build/scss/_main-sidebar.scss @@ -131,6 +131,7 @@ text-align: center; width: $sidebar-nav-icon-width; + /* stylelint-disable selector-class-pattern */ &.fa, &.fas, &.far, @@ -141,6 +142,7 @@ &.ion { font-size: 1.1rem; } + /* stylelint-enable selector-class-pattern */ } .float-right { @@ -202,7 +204,7 @@ .sidebar-is-opening .sidebar .nav-sidebar { .nav-link p { - animation-name: fadeIn; + animation-name: fade-in; animation-duration: $transition-speed; animation-fill-mode: both; } @@ -857,7 +859,7 @@ .nav-collapse-hide-child { .menu-open > .nav-treeview { max-height: min-content; - animation-name: fadeIn; + animation-name: fade-in; animation-duration: $transition-speed; animation-fill-mode: both; } @@ -865,7 +867,7 @@ .sidebar-collapse .sidebar:not(:hover) & { .menu-open > .nav-treeview { max-height: 0; - animation-name: fadeOut; + animation-name: fade-out; animation-duration: $transition-speed; animation-fill-mode: both; } @@ -878,7 +880,7 @@ .main-sidebar:not(.sidebar-no-expand):hover & { .menu-open > .nav-treeview { max-height: min-content; - animation-name: fadeIn; + animation-name: fade-in; animation-duration: $transition-speed; animation-fill-mode: both; } diff --git a/build/scss/_miscellaneous.scss b/build/scss/_miscellaneous.scss index 06ad37649..104d621af 100644 --- a/build/scss/_miscellaneous.scss +++ b/build/scss/_miscellaneous.scss @@ -264,6 +264,7 @@ justify-content: center; z-index: 50; + /* stylelint-disable selector-class-pattern */ > .fa, > .fas, > .far, @@ -274,10 +275,12 @@ > .ion { color: $gray-800; } + /* stylelint-enable selector-class-pattern */ &.dark { background-color: rgba($black, .5); + /* stylelint-disable selector-class-pattern */ > .fa, > .fas, > .far, @@ -288,6 +291,7 @@ > .ion { color: $gray-400; } + /* stylelint-enable selector-class-pattern */ } } } diff --git a/build/scss/_sidebar-mini.scss b/build/scss/_sidebar-mini.scss index 53983e985..6d89dcb65 100644 --- a/build/scss/_sidebar-mini.scss +++ b/build/scss/_sidebar-mini.scss @@ -436,14 +436,14 @@ } .logo-xs { - animation-name: fadeIn; + animation-name: fade-in; animation-duration: $transition-speed; animation-fill-mode: both; visibility: visible; } .logo-xl { - animation-name: fadeOut; + animation-name: fade-out; animation-duration: $transition-speed; animation-fill-mode: both; visibility: hidden; @@ -458,7 +458,7 @@ .user-panel > .info, .nav-sidebar .nav-link p { margin-left: -10px; - animation-name: fadeOut; + animation-name: fade-out; animation-duration: $transition-speed; animation-fill-mode: both; visibility: hidden; diff --git a/build/scss/_timeline.scss b/build/scss/_timeline.scss index efd3d8fa0..fce993169 100644 --- a/build/scss/_timeline.scss +++ b/build/scss/_timeline.scss @@ -83,6 +83,8 @@ } } } + + /* stylelint-disable selector-class-pattern */ // The icons at line > .fa, > .fas, @@ -106,6 +108,7 @@ > .svg-inline--fa { padding: 7px; } + /* stylelint-enable selector-class-pattern */ } // Time label > .time-label { diff --git a/build/scss/mixins/_animations.scss b/build/scss/mixins/_animations.scss index e8c67d813..61794b41f 100644 --- a/build/scss/mixins/_animations.scss +++ b/build/scss/mixins/_animations.scss @@ -3,7 +3,7 @@ // -@keyframes flipInX { +@keyframes flip-in-x { 0% { transform: perspective(400px) rotate3d(1, 0, 0, 90deg); transition-timing-function: ease-in; @@ -30,7 +30,7 @@ } -@keyframes fadeIn { +@keyframes fade-in { from { opacity: 0; } @@ -40,7 +40,7 @@ } } -@keyframes fadeOut { +@keyframes fade-out { from { opacity: 1; } @@ -115,5 +115,3 @@ transform: none; } } - -// diff --git a/build/scss/mixins/_sidebar.scss b/build/scss/mixins/_sidebar.scss index 3a799f2a1..917bf9005 100644 --- a/build/scss/mixins/_sidebar.scss +++ b/build/scss/mixins/_sidebar.scss @@ -54,14 +54,14 @@ .sidebar .nav-sidebar .nav-link p, .brand-text { margin-left: -10px; - animation-name: fadeOut; + animation-name: fade-out; animation-duration: $transition-speed; animation-fill-mode: both; visibility: hidden; } .logo-xl { - animation-name: fadeOut; + animation-name: fade-out; animation-duration: $transition-speed; animation-fill-mode: both; visibility: hidden; @@ -69,7 +69,7 @@ .logo-xs { display: inline-block; - animation-name: fadeIn; + animation-name: fade-in; animation-duration: $transition-speed; animation-fill-mode: both; visibility: visible; @@ -115,14 +115,14 @@ .logo-xl { display: inline-block; margin-left: 0; - animation-name: fadeIn; + animation-name: fade-in; animation-duration: $transition-speed; animation-fill-mode: both; visibility: visible; } .logo-xs { - animation-name: fadeOut; + animation-name: fade-out; animation-duration: $transition-speed; animation-fill-mode: both; visibility: hidden; diff --git a/build/scss/pages/_iframe.scss b/build/scss/pages/_iframe.scss index 54d80cd07..905103335 100644 --- a/build/scss/pages/_iframe.scss +++ b/build/scss/pages/_iframe.scss @@ -36,7 +36,7 @@ body.iframe-mode-fullscreen { &:hover, &:focus { - animation-name: fadeIn; + animation-name: fade-in; animation-duration: $transition-speed; animation-fill-mode: both; visibility: visible; @@ -59,7 +59,7 @@ body.iframe-mode-fullscreen { &:hover, &:focus { .btn-iframe-close { - animation-name: fadeIn; + animation-name: fade-in; animation-duration: $transition-speed; animation-fill-mode: both; visibility: visible;