From fd93112bebd5ba5354d9a8a835a690b5ca94d933 Mon Sep 17 00:00:00 2001 From: drmason13 Date: Sat, 31 Aug 2024 12:28:51 +0100 Subject: [PATCH] reorder scss files to match build output --- scss/components/_card.scss | 6 +++--- scss/components/_modal.scss | 2 +- scss/components/_nav.scss | 2 +- scss/components/_tooltip.scss | 6 +++--- scss/content/_typography.scss | 4 ++-- scss/forms/_basics.scss | 14 +++++++------- scss/forms/_checkbox-radio-switch.scss | 2 +- scss/forms/_input-date.scss | 6 ++++-- scss/layout/_container.scss | 6 +++--- scss/layout/_landmarks.scss | 4 ++-- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/scss/components/_card.scss b/scss/components/_card.scss index 2fa070e5..0c13d10e 100644 --- a/scss/components/_card.scss +++ b/scss/components/_card.scss @@ -16,8 +16,8 @@ > header, > footer { - margin-inline-end: calc(var(#{$css-var-prefix}block-spacing-horizontal) * -1); margin-inline-start: calc(var(#{$css-var-prefix}block-spacing-horizontal) * -1); + margin-inline-end: calc(var(#{$css-var-prefix}block-spacing-horizontal) * -1); padding: calc(var(#{$css-var-prefix}block-spacing-vertical) * 0.66) var(#{$css-var-prefix}block-spacing-horizontal); background-color: var(#{$css-var-prefix}card-sectioning-background-color); @@ -29,8 +29,8 @@ border-block-end: var(#{$css-var-prefix}border-width) solid var(#{$css-var-prefix}card-border-color); - border-end-start-radius: var(#{$css-var-prefix}border-radius); border-start-start-radius: var(#{$css-var-prefix}border-radius); + border-end-start-radius: var(#{$css-var-prefix}border-radius); } > footer { @@ -39,8 +39,8 @@ border-block-start: var(#{$css-var-prefix}border-width) solid var(#{$css-var-prefix}card-border-color); - border-end-end-radius: var(#{$css-var-prefix}border-radius); border-start-end-radius: var(#{$css-var-prefix}border-radius); + border-end-end-radius: var(#{$css-var-prefix}border-radius); } } } diff --git a/scss/components/_modal.scss b/scss/components/_modal.scss index 7df312c4..33614fda 100644 --- a/scss/components/_modal.scss +++ b/scss/components/_modal.scss @@ -85,9 +85,9 @@ display: block; width: 1rem; height: 1rem; + margin-inline-start: auto; margin-block-start: calc(var(#{$css-var-prefix}spacing) * -1); margin-block-end: var(#{$css-var-prefix}spacing); - margin-inline-start: auto; border: none; background-image: var(#{$css-var-prefix}icon-close); background-position: center; diff --git a/scss/components/_nav.scss b/scss/components/_nav.scss index 049187c4..aa5e17ec 100644 --- a/scss/components/_nav.scss +++ b/scss/components/_nav.scss @@ -68,9 +68,9 @@ input:not([type="checkbox"], [type="radio"], [type="range"], [type="file"]), select { height: auto; + margin-inline-start: inherit; margin-inline-end: inherit; margin-block-end: 0; - margin-inline-start: inherit; padding: calc( var(#{$css-var-prefix}nav-link-spacing-vertical) - (var(#{$css-var-prefix}border-width) * 2) diff --git a/scss/components/_tooltip.scss b/scss/components/_tooltip.scss index 1a142f14..c5396584 100644 --- a/scss/components/_tooltip.scss +++ b/scss/components/_tooltip.scss @@ -46,10 +46,10 @@ &::after { padding: 0; transform: translate(-50%, 0rem); - border-block-start: 0.3rem solid; - border-inline-end: 0.3rem solid transparent; - border-inline-start: 0.3rem solid transparent; border-radius: 0; + border-inline-start: 0.3rem solid transparent; + border-inline-end: 0.3rem solid transparent; + border-block-start: 0.3rem solid; background-color: transparent; content: ""; color: var(#{$css-var-prefix}tooltip-background-color); diff --git a/scss/content/_typography.scss b/scss/content/_typography.scss index 327ff828..42fd80c8 100644 --- a/scss/content/_typography.scss +++ b/scss/content/_typography.scss @@ -145,9 +145,9 @@ display: block; margin: var(#{$css-var-prefix}typography-spacing-vertical) 0; padding: var(#{$css-var-prefix}spacing); + border-inline-start: 0.25rem solid var(#{$css-var-prefix}blockquote-border-color); + border-inline-start: 0.25rem solid var(#{$css-var-prefix}blockquote-border-color); border-inline-end: none; - border-inline-start: 0.25rem solid var(#{$css-var-prefix}blockquote-border-color); - border-inline-start: 0.25rem solid var(#{$css-var-prefix}blockquote-border-color); border-inline-end: none; footer { diff --git a/scss/forms/_basics.scss b/scss/forms/_basics.scss index 0e607e8b..4131706e 100644 --- a/scss/forms/_basics.scss +++ b/scss/forms/_basics.scss @@ -264,18 +264,18 @@ ) { &[aria-invalid] { @if $enable-important { - padding-inline-end: calc( - var(#{$css-var-prefix}form-element-spacing-horizontal) + 1.5rem - ) !important; padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal) !important; padding-inline-end: calc( var(#{$css-var-prefix}form-element-spacing-horizontal) + 1.5rem ) !important; + padding-inline-end: calc( + var(#{$css-var-prefix}form-element-spacing-horizontal) + 1.5rem + ) !important; } @else { + padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); + padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); padding-inline-end: calc(var(#{$css-var-prefix}form-element-spacing-horizontal) + 1.5rem); - padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); - padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); padding-inline-end: calc(var(#{$css-var-prefix}form-element-spacing-horizontal) + 1.5rem); } background-position: center right 0.75rem; @@ -393,9 +393,9 @@ } &:not([multiple], [size]) { + padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); + padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); padding-inline-end: calc(var(#{$css-var-prefix}form-element-spacing-horizontal) + 1.5rem); - padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); - padding-inline-start: var(#{$css-var-prefix}form-element-spacing-horizontal); padding-inline-end: calc(var(#{$css-var-prefix}form-element-spacing-horizontal) + 1.5rem); background-image: var(#{$css-var-prefix}icon-chevron); background-position: center right 0.75rem; diff --git a/scss/forms/_checkbox-radio-switch.scss b/scss/forms/_checkbox-radio-switch.scss index e2c395b4..3d60613a 100644 --- a/scss/forms/_checkbox-radio-switch.scss +++ b/scss/forms/_checkbox-radio-switch.scss @@ -22,8 +22,8 @@ appearance: none; width: 1.25em; height: 1.25em; - margin-block-start: -0.125em; margin-inline-end: 0.5em; + margin-block-start: -0.125em; border-width: var(#{$css-var-prefix}border-width); vertical-align: middle; cursor: pointer; diff --git a/scss/forms/_input-date.scss b/scss/forms/_input-date.scss index 9d0c57d8..799c6205 100644 --- a/scss/forms/_input-date.scss +++ b/scss/forms/_input-date.scss @@ -11,7 +11,9 @@ &:is([type="date"], [type="datetime-local"], [type="month"], [type="time"], [type="week"]) { #{$css-var-prefix}icon-position: 0.75rem; #{$css-var-prefix}icon-width: 1rem; - padding-inline-end: calc(var(#{$css-var-prefix}icon-width) + var(#{$css-var-prefix}icon-position)); + padding-inline-end: calc( + var(#{$css-var-prefix}icon-width) + var(#{$css-var-prefix}icon-position) + ); background-image: var(#{$css-var-prefix}icon-date); background-position: center right var(#{$css-var-prefix}icon-position); background-size: var(#{$css-var-prefix}icon-width) auto; @@ -32,8 +34,8 @@ #{$parent-selector} [type="week"] { &::-webkit-calendar-picker-indicator { width: var(#{$css-var-prefix}icon-width); - margin-inline-end: calc(var(#{$css-var-prefix}icon-width) * -1); margin-inline-start: var(#{$css-var-prefix}icon-position); + margin-inline-end: calc(var(#{$css-var-prefix}icon-width) * -1); opacity: 0; } } diff --git a/scss/layout/_container.scss b/scss/layout/_container.scss index f9a584d9..941c51cc 100644 --- a/scss/layout/_container.scss +++ b/scss/layout/_container.scss @@ -9,10 +9,10 @@ .container, .container-fluid { width: 100%; - margin-inline-end: auto; margin-inline-start: auto; - padding-inline-end: var(#{$css-var-prefix}spacing); + margin-inline-end: auto; padding-inline-start: var(#{$css-var-prefix}spacing); + padding-inline-end: var(#{$css-var-prefix}spacing); } .container { @@ -23,8 +23,8 @@ max-width: map.get($values, "viewport"); @if $first-breakpoint { $first-breakpoint: false; - padding-inline-end: 0; padding-inline-start: 0; + padding-inline-end: 0; } } } diff --git a/scss/layout/_landmarks.scss b/scss/layout/_landmarks.scss index a16602d3..aef15494 100644 --- a/scss/layout/_landmarks.scss +++ b/scss/layout/_landmarks.scss @@ -32,8 +32,8 @@ @if $enable-semantic-container { $first-breakpoint: true; width: 100%; - margin-inline-end: auto; margin-inline-start: auto; + margin-inline-end: auto; padding: var(#{$css-var-prefix}block-spacing-vertical) var(#{$css-var-prefix}block-spacing-horizontal); @@ -44,8 +44,8 @@ max-width: map.get($values, "viewport"); @if $first-breakpoint { $first-breakpoint: false; - padding-inline-end: 0; padding-inline-start: 0; + padding-inline-end: 0; } } }