From a9845cb079b415dc9a0d23b538cacb97af430551 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 18 Feb 2025 12:00:49 -0800 Subject: [PATCH] some tweaks --- scss/_variables.scss | 2 +- scss/mixins/_border-radius.scss | 19 ++++++++++--------- .../docs/getting-started/browsers-devices.mdx | 2 +- site/src/scss/_component-examples.scss | 1 + 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index b8b4af92d4..6c6655f20a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -8,7 +8,7 @@ // consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs. // scss-docs-start theme-color-variables -$primary: $purple-500 !default; +$primary: $blue-500 !default; $secondary: $gray-600 !default; $success: $green-500 !default; $info: $cyan-500 !default; diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss index dce0139972..e4ecdda04f 100644 --- a/scss/mixins/_border-radius.scss +++ b/scss/mixins/_border-radius.scss @@ -1,4 +1,5 @@ @use "../config" as *; +// @use "../variables" as *; // stylelint-disable property-disallowed-list // Single side border-radius @@ -17,7 +18,7 @@ } // scss-docs-start border-radius-mixins -@mixin border-radius($radius: $border-radius, $fallback-border-radius: false) { +@mixin border-radius($radius: var(--#{$prefix}border-radius), $fallback-border-radius: false) { @if $enable-rounded { border-radius: valid-radius($radius); } @@ -26,53 +27,53 @@ } } -@mixin border-top-radius($radius: $border-radius) { +@mixin border-top-radius($radius: var(--#{$prefix}border-radius)) { @if $enable-rounded { border-top-left-radius: valid-radius($radius); border-top-right-radius: valid-radius($radius); } } -@mixin border-end-radius($radius: $border-radius) { +@mixin border-end-radius($radius: var(--#{$prefix}border-radius)) { @if $enable-rounded { border-top-right-radius: valid-radius($radius); border-bottom-right-radius: valid-radius($radius); } } -@mixin border-bottom-radius($radius: $border-radius) { +@mixin border-bottom-radius($radius: var(--#{$prefix}border-radius)) { @if $enable-rounded { border-bottom-right-radius: valid-radius($radius); border-bottom-left-radius: valid-radius($radius); } } -@mixin border-start-radius($radius: $border-radius) { +@mixin border-start-radius($radius: var(--#{$prefix}border-radius)) { @if $enable-rounded { border-top-left-radius: valid-radius($radius); border-bottom-left-radius: valid-radius($radius); } } -@mixin border-top-start-radius($radius: $border-radius) { +@mixin border-top-start-radius($radius: var(--#{$prefix}border-radius)) { @if $enable-rounded { border-top-left-radius: valid-radius($radius); } } -@mixin border-top-end-radius($radius: $border-radius) { +@mixin border-top-end-radius($radius: var(--#{$prefix}border-radius)) { @if $enable-rounded { border-top-right-radius: valid-radius($radius); } } -@mixin border-bottom-end-radius($radius: $border-radius) { +@mixin border-bottom-end-radius($radius: var(--#{$prefix}border-radius)) { @if $enable-rounded { border-bottom-right-radius: valid-radius($radius); } } -@mixin border-bottom-start-radius($radius: $border-radius) { +@mixin border-bottom-start-radius($radius: var(--#{$prefix}border-radius)) { @if $enable-rounded { border-bottom-left-radius: valid-radius($radius); } diff --git a/site/src/content/docs/getting-started/browsers-devices.mdx b/site/src/content/docs/getting-started/browsers-devices.mdx index 2ea5a7d2f3..2e38f9d826 100644 --- a/site/src/content/docs/getting-started/browsers-devices.mdx +++ b/site/src/content/docs/getting-started/browsers-devices.mdx @@ -12,7 +12,7 @@ Alternative browsers which use the latest version of WebKit, Blink, or Gecko, wh You can find our supported range of browsers and their versions [in our `.browserslistrc file`]([[config:repo]]/blob/v[[config:current_version]]/.browserslistrc): - +/* Code lang="plaintext" filePath=".browserslistrc" */ We use [Autoprefixer](https://github.com/postcss/autoprefixer) to handle intended browser support via CSS prefixes, which uses [Browserslist](https://github.com/browserslist/browserslist) to manage these browser versions. Consult their documentation for how to integrate these tools into your projects. diff --git a/site/src/scss/_component-examples.scss b/site/src/scss/_component-examples.scss index e6b2af0d19..e3e99ddc0f 100644 --- a/site/src/scss/_component-examples.scss +++ b/site/src/scss/_component-examples.scss @@ -4,6 +4,7 @@ @use "../../../scss/layout/breakpoints" as *; @use "../../../scss/mixins/clearfix" as *; @use "../../../scss/mixins/border-radius" as *; + // // Docs examples //