From 548a6f8d2e016af8a3b5486203a0d2f5d3c06b6a Mon Sep 17 00:00:00 2001 From: David Cook Date: Tue, 23 May 2023 16:51:58 +1000 Subject: [PATCH] Prettify app/webpacker/css/admin/plugins/ --- .../css/admin/plugins/font-awesome.scss | 36 +++++------ app/webpacker/css/admin/plugins/jstree.scss | 30 ++++----- app/webpacker/css/admin/plugins/powertip.scss | 64 ++++++++++++++----- app/webpacker/css/admin/plugins/select2.scss | 14 ++-- 4 files changed, 90 insertions(+), 54 deletions(-) diff --git a/app/webpacker/css/admin/plugins/font-awesome.scss b/app/webpacker/css/admin/plugins/font-awesome.scss index c78ac6591c..d4f8f5533c 100644 --- a/app/webpacker/css/admin/plugins/font-awesome.scss +++ b/app/webpacker/css/admin/plugins/font-awesome.scss @@ -26,12 +26,12 @@ /* FONT PATH * -------------------------- */ @font-face { - font-family: 'FontAwesome'; - src: url('../fonts/fontawesome-webfont.eot?v=3.2.1'); - src: url('../fonts/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), - url('../fonts/fontawesome-webfont.woff?v=3.2.1') format('woff'), - url('../fonts/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), - url('../fonts/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); + font-family: "FontAwesome"; + src: url("../fonts/fontawesome-webfont.eot?v=3.2.1"); + src: url("../fonts/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"), + url("../fonts/fontawesome-webfont.woff?v=3.2.1") format("woff"), + url("../fonts/fontawesome-webfont.ttf?v=3.2.1") format("truetype"), + url("../fonts/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg"); font-weight: normal; font-style: normal; } @@ -44,7 +44,7 @@ text-decoration: inherit; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - *margin-right: .3em; + *margin-right: 0.3em; } [class^="icon-"]:before, [class*=" icon-"]:before { @@ -104,7 +104,7 @@ a [class*=" icon-"] { } .icon-border { border: solid 1px #eeeeee; - padding: .2em .25em .15em; + padding: 0.2em 0.25em 0.15em; -webkit-border-radius: 3px; border-radius: 3px; } @@ -148,11 +148,11 @@ a [class*=" icon-"] { } [class^="icon-"].pull-left, [class*=" icon-"].pull-left { - margin-right: .3em; + margin-right: 0.3em; } [class^="icon-"].pull-right, [class*=" icon-"].pull-right { - margin-left: .3em; + margin-left: 0.3em; } /* BOOTSTRAP SPECIFIC CLASSES * -------------------------- */ @@ -190,7 +190,7 @@ a [class*=" icon-"] { .nav [class^="icon-"].icon-large, .btn [class*=" icon-"].icon-large, .nav [class*=" icon-"].icon-large { - line-height: .9em; + line-height: 0.9em; } .btn [class^="icon-"].icon-spin, .nav [class^="icon-"].icon-spin, @@ -206,23 +206,23 @@ a [class*=" icon-"] { .nav-pills [class^="icon-"].icon-large, .nav-tabs [class*=" icon-"].icon-large, .nav-pills [class*=" icon-"].icon-large { - line-height: .9em; + line-height: 0.9em; } .btn [class^="icon-"].pull-left.icon-2x, .btn [class*=" icon-"].pull-left.icon-2x, .btn [class^="icon-"].pull-right.icon-2x, .btn [class*=" icon-"].pull-right.icon-2x { - margin-top: .18em; + margin-top: 0.18em; } .btn [class^="icon-"].icon-spin.icon-large, .btn [class*=" icon-"].icon-spin.icon-large { - line-height: .8em; + line-height: 0.8em; } .btn.btn-small [class^="icon-"].pull-left.icon-2x, .btn.btn-small [class*=" icon-"].pull-left.icon-2x, .btn.btn-small [class^="icon-"].pull-right.icon-2x, .btn.btn-small [class*=" icon-"].pull-right.icon-2x { - margin-top: .25em; + margin-top: 0.25em; } .btn.btn-large [class^="icon-"], .btn.btn-large [class*=" icon-"] { @@ -232,15 +232,15 @@ a [class*=" icon-"] { .btn.btn-large [class*=" icon-"].pull-left.icon-2x, .btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn.btn-large [class*=" icon-"].pull-right.icon-2x { - margin-top: .05em; + margin-top: 0.05em; } .btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large [class*=" icon-"].pull-left.icon-2x { - margin-right: .2em; + margin-right: 0.2em; } .btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn.btn-large [class*=" icon-"].pull-right.icon-2x { - margin-left: .2em; + margin-left: 0.2em; } /* Fixes alignment in nav lists */ .nav-list [class^="icon-"], diff --git a/app/webpacker/css/admin/plugins/jstree.scss b/app/webpacker/css/admin/plugins/jstree.scss index 0fad9d6578..b16fd23a1a 100644 --- a/app/webpacker/css/admin/plugins/jstree.scss +++ b/app/webpacker/css/admin/plugins/jstree.scss @@ -1,16 +1,17 @@ #taxonomy_tree { - > ul, .jstree-icon { + > ul, + .jstree-icon { background-image: none; } - + .jstree-icon { @extend [class^="icon-"], :before; } - .jstree-open > .jstree-icon { + .jstree-open > .jstree-icon { @extend .icon-caret-down; } - .jstree-closed > .jstree-icon { + .jstree-closed > .jstree-icon { @extend .icon-caret-right; } @@ -31,13 +32,13 @@ .jstree-icon { padding-left: 0px; - @extend .icon-move; + @extend .icon-move; } } } } -#vakata-dragged.jstree-apple .jstree-invalid, +#vakata-dragged.jstree-apple .jstree-invalid, #vakata-dragged.jstree-apple .jstree-ok, #jstree-marker { background-image: none !important; @@ -45,7 +46,7 @@ @extend [class^="icon-"], :before; } #vakata-dragged.jstree-apple .jstree-invalid { - @extend .icon-remove; + @extend .icon-remove; color: $color-5; } #vakata-dragged.jstree-apple .jstree-ok { @@ -66,12 +67,11 @@ margin-top: -2px !important; border: none !important; border-bottom: 1px solid $color-body-text !important; - background-color: very-light($color-3) !important; + background-color: very-light($color-3) !important; -webkit-box-shadow: none !important; - -moz-box-shadow: none !important; - box-shadow: none !important; - + -moz-box-shadow: none !important; + box-shadow: none !important; } #vakata-contextmenu { @@ -83,7 +83,7 @@ @include border-radius($border-radius !important); &:before { - content: ''; + content: ""; position: absolute; border-left: 10px solid transparent; border-right: 10px solid transparent; @@ -109,12 +109,12 @@ -webkit-box-shadow: none !important; line-height: inherit !important; padding: 5px 10px !important; - margin: 0 !important; + margin: 0 !important; } } li:first-child a:hover:before { - content: ''; + content: ""; position: absolute; border-left: 10px solid transparent; border-right: 10px solid transparent; @@ -128,4 +128,4 @@ li.vakata-separator { display: none; } -} \ No newline at end of file +} diff --git a/app/webpacker/css/admin/plugins/powertip.scss b/app/webpacker/css/admin/plugins/powertip.scss index b53f47a7e4..4afc7dfddb 100644 --- a/app/webpacker/css/admin/plugins/powertip.scss +++ b/app/webpacker/css/admin/plugins/powertip.scss @@ -3,7 +3,9 @@ padding: 5px 15px; @include border-radius($border-radius); - &.n:before, &.ne:before, &.nw:before { + &.n:before, + &.ne:before, + &.nw:before { border-top-width: 5px; border-top-color: $color-3; bottom: -5px; @@ -14,7 +16,9 @@ border-right-color: $color-3; left: -5px; } - &.s:before, &.se:before, &.sw:before { + &.s:before, + &.se:before, + &.sw:before { border-bottom-width: 5px; border-bottom-color: $color-3; top: -5px; @@ -24,59 +28,87 @@ border-left-color: $color-3; right: -5px; } - &.ne:before, &.se:before { + &.ne:before, + &.se:before { border-right-width: 5px; border-right-color: $color-3; left: -5px; } - &.nw:before, &.sw:before { + &.nw:before, + &.sw:before { border-left-width: 5px; border-right-color: $color-3; right: -5px; } - &.clone, &.yellow, &.cancel { + &.clone, + &.yellow, + &.cancel { background-color: $color-notice; - &.n:before, &.ne:before, &.nw:before { + &.n:before, + &.ne:before, + &.nw:before { border-top-color: $color-notice; } - &.e:before, &.nw:before, &.sw:before { + &.e:before, + &.nw:before, + &.sw:before { border-right-color: $color-notice; } - &.s:before, &.se:before, &.sw:before { + &.s:before, + &.se:before, + &.sw:before { border-bottom-color: $color-notice; } &.w:before { border-left-color: $color-notice; } } - &.edit, &.green, &.capture, &.save, &.add { + &.edit, + &.green, + &.capture, + &.save, + &.add { background-color: $color-success; - &.n:before, &.ne:before, &.nw:before { + &.n:before, + &.ne:before, + &.nw:before { border-top-color: $color-success; } - &.e:before, &.nw:before, &.sw:before { + &.e:before, + &.nw:before, + &.sw:before { border-right-color: $color-success; } - &.s:before, &.se:before, &.sw:before { + &.s:before, + &.se:before, + &.sw:before { border-bottom-color: $color-success; } &.w:before { border-left-color: $color-success; } } - &.remove, &.red, &.void { + &.remove, + &.red, + &.void { background-color: $color-error; - &.n:before, &.ne:before, &.nw:before { + &.n:before, + &.ne:before, + &.nw:before { border-top-color: $color-error; } - &.e:before, &.nw:before, &.sw:before { + &.e:before, + &.nw:before, + &.sw:before { border-right-color: $color-error; } - &.s:before, &.se:before, &.sw:before { + &.s:before, + &.se:before, + &.sw:before { border-bottom-color: $color-error; } &.w:before { diff --git a/app/webpacker/css/admin/plugins/select2.scss b/app/webpacker/css/admin/plugins/select2.scss index 705385207c..6ef2d5887b 100644 --- a/app/webpacker/css/admin/plugins/select2.scss +++ b/app/webpacker/css/admin/plugins/select2.scss @@ -1,5 +1,6 @@ .select2-container { - &:hover .select2-choice, &.select2-container-active .select2-choice { + &:hover .select2-choice, + &.select2-container-active .select2-choice { background-color: $color-sel-hover-bg !important; border-color: $color-sel-hover-bg !important; } @@ -35,7 +36,7 @@ } &.select2-dropdown-open .select2-choice div b { - @extend .icon-caret-up + @extend .icon-caret-up; } } } @@ -105,7 +106,8 @@ &.select2-highlighted { .select2-result-label { - &, h6 { + &, + h6 { color: $color-1 !important; } } @@ -118,7 +120,8 @@ overflow: auto; } - &.select2-no-results, &.select2-searching { + &.select2-no-results, + &.select2-searching { padding: 5px; background-color: transparent; color: $color-body-text; @@ -134,7 +137,8 @@ } .select2-container-multi { - &.select2-container-active, &.select2-dropdown-open { + &.select2-container-active, + &.select2-dropdown-open { .select2-choices { border-color: $color-sel-hover-bg !important; box-shadow: none;