diff --git a/src/nginxconfig/scss/_callout.scss b/src/nginxconfig/scss/_callout.scss index 38d3e3f..29aefe6 100644 --- a/src/nginxconfig/scss/_callout.scss +++ b/src/nginxconfig/scss/_callout.scss @@ -1,5 +1,5 @@ /* -Copyright 2021 DigitalOcean +Copyright 2022 DigitalOcean This code is licensed under the MIT License. You may obtain a copy of the License at @@ -42,8 +42,7 @@ THE SOFTWARE. .close { display: flex; - flex-direction: row; - flex-wrap: nowrap; + flex-flow: row nowrap; margin: 0 0 1.25rem; p { diff --git a/src/nginxconfig/scss/_fields.scss b/src/nginxconfig/scss/_fields.scss index e2ba0ae..8ff4c24 100644 --- a/src/nginxconfig/scss/_fields.scss +++ b/src/nginxconfig/scss/_fields.scss @@ -26,8 +26,7 @@ THE SOFTWARE. .field-row { display: flex; - flex-direction: row; - flex-wrap: wrap; + flex-flow: row wrap; margin: 0 -.5rem; .field { @@ -87,7 +86,7 @@ THE SOFTWARE. .is-changed { input { - &:not(.vs__search) { + &:not(.vs__search) { // stylelint-disable-line selector-class-pattern &, &:focus { background: rgba($highlight, .35); @@ -108,7 +107,7 @@ THE SOFTWARE. } .v-select { - .vs__dropdown-toggle { // sass-lint:disable-line class-name-format + .vs__dropdown-toggle { // stylelint-disable-line selector-class-pattern background: rgba($highlight, .35); } } diff --git a/src/nginxconfig/scss/_panel.scss b/src/nginxconfig/scss/_panel.scss index 275a5cf..5a8bf60 100644 --- a/src/nginxconfig/scss/_panel.scss +++ b/src/nginxconfig/scss/_panel.scss @@ -1,5 +1,5 @@ /* -Copyright 2020 DigitalOcean +Copyright 2022 DigitalOcean This code is licensed under the MIT License. You may obtain a copy of the License at @@ -36,8 +36,7 @@ THE SOFTWARE. .header-group, .buttons-group { display: flex; - flex-direction: row; - flex-wrap: wrap; + flex-flow: row wrap; justify-content: space-between; } diff --git a/src/nginxconfig/scss/_tabs.scss b/src/nginxconfig/scss/_tabs.scss index 207d897..9a8d2fb 100644 --- a/src/nginxconfig/scss/_tabs.scss +++ b/src/nginxconfig/scss/_tabs.scss @@ -1,5 +1,5 @@ /* -Copyright 2020 DigitalOcean +Copyright 2022 DigitalOcean This code is licensed under the MIT License. You may obtain a copy of the License at @@ -28,8 +28,7 @@ THE SOFTWARE. ul { li { display: flex; - flex-direction: row; - flex-wrap: nowrap; + flex-flow: row nowrap; &:hover, &:focus { diff --git a/src/nginxconfig/scss/_vue-select.scss b/src/nginxconfig/scss/_vue-select.scss index b17574c..7244e69 100644 --- a/src/nginxconfig/scss/_vue-select.scss +++ b/src/nginxconfig/scss/_vue-select.scss @@ -1,5 +1,5 @@ /* -Copyright 2020 DigitalOcean +Copyright 2022 DigitalOcean This code is licensed under the MIT License. You may obtain a copy of the License at @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -// sass-lint:disable-block class-name-format +// stylelint-disable selector-class-pattern .v-select { &.vs--open { > ul { @@ -49,7 +49,7 @@ THE SOFTWARE. } > ul { - display: block !important; // sass-lint:disable-line no-important + display: block !important; margin: 0; opacity: 0; transition: opacity $transition; diff --git a/src/nginxconfig/scss/style.scss b/src/nginxconfig/scss/style.scss index 2b24018..b652cfc 100644 --- a/src/nginxconfig/scss/style.scss +++ b/src/nginxconfig/scss/style.scss @@ -1,5 +1,5 @@ /* -Copyright 2021 DigitalOcean +Copyright 2022 DigitalOcean This code is licensed under the MIT License. You may obtain a copy of the License at @@ -27,21 +27,25 @@ THE SOFTWARE. $header: #0071fe; $highlight: #f2c94c; $callout: #f3f5f9; + @import "~do-bulma/src/style"; .do-bulma { @import "../../../build/prism"; - $pretty--color-dark: $primary; - $pretty--color-default: $primary; + $pretty--color-dark: $primary; // stylelint-disable-line scss/dollar-variable-pattern + $pretty--color-default: $primary; // stylelint-disable-line scss/dollar-variable-pattern + @import "~pretty-checkbox/src/pretty-checkbox"; $vs-border-color: $border; $vs-border-radius: $border-radius; $vs-dropdown-box-shadow: 0 2px 4px rgba($dark-blue, .06); $vs-state-active-bg: $primary; + @import "~vue-select/src/scss/vue-select"; + // Local imports @import "header"; @import "tabs"; @import "panel";