diff --git a/.scss-lint.yml b/.scss-lint.yml index 95fbe2c80..a8223addd 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -85,7 +85,7 @@ linters: enabled: false SelectorFormat: - convention: hyphenated_lowercase + convention: hyphenated_BEM ignored_names: - js_class ignored_types: diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_dropdowns.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_dropdowns.scss index 01e96dd05..4e135ce45 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_dropdowns.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_dropdowns.scss @@ -233,9 +233,8 @@ // Listing view smaller dropdowns // ============================================================================= -.c-dropdown { - -} +// .c-dropdown { +// } .o-icon { display: inline-block; @@ -318,9 +317,9 @@ // Default dropdown theme // ============================================================================= -.t-default { +// .t-default { -} +// } .t-default .u-btn-current { border-color: rgba(0, 0, 0, 0.15); @@ -380,6 +379,7 @@ 0% { opacity: 0; } + 100% { opacity: 1; } diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss index b0c2fa426..6b4d42a70 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_forms.scss @@ -472,11 +472,11 @@ button { } - .button-small { - padding: 0 0.8em; - height: 2em; - font-size: 0.85em; - } +.button-small { + padding: 0 0.8em; + height: 2em; + font-size: 0.85em; +} .button-secondary { color: $color-button; diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_indicator.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_indicator.scss index cd8e75245..bb2af009a 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_indicator.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/_indicator.scss @@ -3,10 +3,6 @@ // ============================================================================= -.o-icon-text { - -} - // ============================================================================= // Indicator light // ============================================================================= @@ -28,10 +24,10 @@ $c-indicator-margin: .25rem; // States // ============================================================================= -$color-state-live: #59B524; -$color-state-draft: grey; -$color-state-absent: #FF8F11; -$color-state-live-draft: #43B1B0; +$color-state-live: #59b524; +$color-state-draft: #808080; +$color-state-absent: #ff8f11; +$color-state-live-draft: #43b1b0; .is-absent .c-indicator { background: $color-state-absent;