From 2074b2976a9be41195c436d1f8ae9a37ed941fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 22 Apr 2020 18:21:41 +0200 Subject: [PATCH] Fix stylelint issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/collections.css | 7 +++--- css/icons.scss | 50 ++++++++++++++++++++++--------------------- css/print.scss | 4 +--- docs/extra.css | 2 +- src/BoardSelector.vue | 6 ++++++ src/CardSelector.vue | 7 ++++++ stylelint.config.js | 26 ++++++++++++++++++++++ 7 files changed, 71 insertions(+), 31 deletions(-) create mode 100644 stylelint.config.js diff --git a/css/collections.css b/css/collections.css index 333101086..dbbb2efd7 100644 --- a/css/collections.css +++ b/css/collections.css @@ -1,10 +1,11 @@ .icon-deck { - background-image: url('../img/deck-dark.svg'); + background-image: url('../img/deck-dark.svg'); } .resource-type-deck img { - opacity: 0.4 !important; + opacity: 0.4 !important; } + .resource-type-deck:hover img { - opacity: 0.7 !important; + opacity: 0.7 !important; } diff --git a/css/icons.scss b/css/icons.scss index f0e68d979..f58b8b28d 100644 --- a/css/icons.scss +++ b/css/icons.scss @@ -2,66 +2,66 @@ * Custom icons */ .icon-deck { - background-image: url('../img/deck-dark.svg'); + background-image: url('../img/deck-dark.svg'); } .icon-help { - background-image: url('../../../settings/img/help.svg'); + background-image: url('../../../settings/img/help.svg'); } .icon-add-white { - background-image: url('../img/add-white.svg'); + background-image: url('../img/add-white.svg'); } .icon-attach { - background-image: url('../img/attach.svg'); + background-image: url('../img/attach.svg'); } .icon-archive { - background-image: url('../img/archive.svg'); + background-image: url('../img/archive.svg'); } .icon-archive-white { - background-image: url('../img/archive-white.svg'); + background-image: url('../img/archive-white.svg'); } .icon-details { - background-image: url('../img/details.svg'); + background-image: url('../img/details.svg'); } .icon-details-white { - background-image: url('../img/details-white.svg'); + background-image: url('../img/details-white.svg'); } .icon-home { - background-image: var(--icon-home-000, url('../../../core/img/places/home.svg')); + background-image: var(--icon-home-000, url('../../../core/img/places/home.svg')); } .icon-description { - background-image: var(--icon-text-000, url('../img/description.svg')); + background-image: var(--icon-text-000, url('../img/description.svg')); } .icon-badge { - background-image: url('../img/calendar-dark.svg'); + background-image: url('../img/calendar-dark.svg'); } .icon-toggle-compact-collapsed { - background-image: url('../img/toggle-view-expand.svg'); + background-image: url('../img/toggle-view-expand.svg'); } .icon-toggle-compact-expanded { - background-image: url('../img/toggle-view-collapse.svg'); + background-image: url('../img/toggle-view-collapse.svg'); } @if mixin-exists('icon-black-white') { - @include icon-black-white('deck', 'deck', 1); - @include icon-black-white('archive', 'deck', 1); - @include icon-black-white('circles', 'deck', 1); - @include icon-black-white('clone', 'deck', 1); - @include icon-black-white('filter', 'deck', 1); - @include icon-black-white('attach', 'deck', 1); - @include icon-black-white('reply', 'deck', 1); + @include icon-black-white('deck', 'deck', 1); + @include icon-black-white('archive', 'deck', 1); + @include icon-black-white('circles', 'deck', 1); + @include icon-black-white('clone', 'deck', 1); + @include icon-black-white('filter', 'deck', 1); + @include icon-black-white('attach', 'deck', 1); + @include icon-black-white('reply', 'deck', 1); .icon-toggle-compact-collapsed { @include icon-color('toggle-view-expand', 'deck', $color-black); @@ -76,13 +76,15 @@ } .avatardiv.circles { - background: var(--color-primary); + background: var(--color-primary); } + .icon-circles { - opacity: 1; - background-size: 20px; - background-position: center center; + opacity: 1; + background-size: 20px; + background-position: center center; } + .icon-colorpicker { background-image: url('../img/color_picker.svg'); } diff --git a/css/print.scss b/css/print.scss index 142bad18b..666de044c 100644 --- a/css/print.scss +++ b/css/print.scss @@ -59,8 +59,6 @@ white-space: nowrap; } - span.due { } - div.card-assigned-users { margin-right:10px; } @@ -75,7 +73,7 @@ @page { size: A4 landscape; margin: 2cm; - } + } div#innerBoard { display:flex; diff --git a/docs/extra.css b/docs/extra.css index b3b4d28e1..13bd1bb4a 100644 --- a/docs/extra.css +++ b/docs/extra.css @@ -1,3 +1,3 @@ .subnav ul { - padding-left: 20px; + padding-left: 20px; } diff --git a/src/BoardSelector.vue b/src/BoardSelector.vue index a9d4d9a9c..6fc841804 100644 --- a/src/BoardSelector.vue +++ b/src/BoardSelector.vue @@ -45,19 +45,24 @@ max-width: 400px; padding: 20px; } + ul { min-height: 100px; } + li { padding: 6px; border: 1px solid transparent; } + li:hover, li:focus { background-color: var(--color-background-dark); } + li.selected { border: 1px solid var(--color-primary); } + .board-bullet { display: inline-block; width: 12px; @@ -66,6 +71,7 @@ border-radius: 50%; cursor: pointer; } + li > span, .avatar { vertical-align: middle; diff --git a/src/CardSelector.vue b/src/CardSelector.vue index b78affbfc..a490baa7d 100644 --- a/src/CardSelector.vue +++ b/src/CardSelector.vue @@ -114,19 +114,24 @@ export default { padding: 20px; height: 500px; } + ul { min-height: 100px; } + li { padding: 6px; border: 1px solid transparent; } + li:hover, li:focus { background-color: var(--color-background-dark); } + li.selected { border: 1px solid var(--color-primary); } + .board-bullet { display: inline-block; width: 12px; @@ -135,10 +140,12 @@ export default { border-radius: 50%; cursor: pointer; } + li > span, .avatar { vertical-align: middle; } + button { float: right; } diff --git a/stylelint.config.js b/stylelint.config.js new file mode 100644 index 000000000..b9937526d --- /dev/null +++ b/stylelint.config.js @@ -0,0 +1,26 @@ +module.exports = { + extends: 'stylelint-config-recommended-scss', + rules: { + indentation: 'tab', + 'selector-type-no-unknown': null, + 'number-leading-zero': null, + 'rule-empty-line-before': [ + 'always', + { + ignore: ['after-comment', 'inside-block'] + } + ], + 'declaration-empty-line-before': [ + 'never', + { + ignore: ['after-declaration'] + } + ], + 'comment-empty-line-before': null, + 'selector-type-case': null, + 'selector-list-comma-newline-after': null, + 'no-descending-specificity': null, + 'string-quotes': 'single' + }, + plugins: ['stylelint-scss'] +}