chore: remove duplicate scss, (#17005)

Co-authored-by: Nick Schonning <nschonni@gmail.com>
eslint · Mar 25, 2023 · ad9dd6a · ad9dd6a
1 parent 10022b1
commit ad9dd6a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 56 deletions.
diff --git a/docs/.stylelintrc.json b/docs/.stylelintrc.json
@@ -14,7 +14,6 @@
         "indentation": 4,
         "max-line-length": null,
         "no-descending-specificity": null,
-        "no-duplicate-selectors": null,
         "number-leading-zero": null,
         "number-no-trailing-zeros": null,
         "selector-class-pattern": null,

diff --git a/docs/src/assets/scss/components/alert.scss b/docs/src/assets/scss/components/alert.scss
@@ -16,6 +16,7 @@
         color: var(--color-rose-600);
 
         [data-theme="dark"] & {
+            border: 1px solid var(--color-rose-300);
             color: var(--color-rose-300);
             background-color: var(--color-rose-900);
         }
@@ -27,6 +28,7 @@
 
         [data-theme="dark"] & {
             color: var(--color-warning-300);
+            border: 1px solid var(--color-warning-300);
             background-color: var(--color-warning-900);
         }
     }
@@ -37,23 +39,8 @@
 
         [data-theme="dark"] & {
             color: var(--color-success-300);
-            background-color: var(--color-success-900);
-        }
-    }
-}
-
-[data-theme="dark"] {
-    .alert {
-        &.alert--warning {
-            border: 1px solid var(--color-rose-300);
-        }
-
-        &.alert--important {
-            border: 1px solid var(--color-warning-300);
-        }
-
-        &.alert--tip {
             border: 1px solid var(--color-success-300);
+            background-color: var(--color-success-900);
         }
     }
 }

diff --git a/docs/src/assets/scss/components/theme-switcher.scss b/docs/src/assets/scss/components/theme-switcher.scss
@@ -75,9 +75,3 @@
         }
     }
 }
-
-.theme-switcher__button:hover {
-    .theme-switcher__icon {
-        color: var(--link-color);
-    }
-}
diff --git a/docs/src/assets/scss/components/toc.scss b/docs/src/assets/scss/components/toc.scss
@@ -1,17 +1,13 @@
 .docs-toc {
     margin: 2rem 0;
-}
-
-.docs-toc {
-    .docs-aside & {
-        display: none;
-    }
 
     @media all and (min-width: 1400px) {
         display: none;
     }
 
     .docs-aside & {
+        display: none;
+
         @media all and (min-width: 1400px) {
             display: block;
         }

diff --git a/docs/src/assets/scss/foundations.scss b/docs/src/assets/scss/foundations.scss
@@ -62,6 +62,7 @@ html {
 }
 
 body {
+    font-size: var(--step-0);
     position: relative;
     margin: 0 auto;
     line-height: 1.5;
@@ -171,11 +172,6 @@ code {
     }
 }
 
-p:empty {
-    display: none;
-    margin: 0;
-}
-
 .c-icon {
     color: var(--icon-color);
     flex: none;
@@ -346,10 +342,6 @@ nav {
 }
 
 /* typography */
-body {
-    font-size: var(--step-0);
-    line-height: 1.5;
-}
 
 .eyebrow {
     color: var(--link-color);

diff --git a/docs/src/assets/scss/tokens/spacing.scss b/docs/src/assets/scss/tokens/spacing.scss
@@ -6,15 +6,7 @@
 
     --fluid-screen: 100vw;
     --fluid-bp: calc((var(--fluid-screen) - var(--fluid-min-width) / 16 * 1rem) / (var(--fluid-max-width) - var(--fluid-min-width)));
-}
-
-@media screen and (min-width: 1024px) {
-    :root {
-        --fluid-screen: calc(var(--fluid-max-width) * 1px);
-    }
-}
 
-:root {
     --fc-3xs-min: (var(--fc-s-min) * 0.25);
     --fc-3xs-max: (var(--fc-s-max) * 0.25);
 

diff --git a/docs/src/assets/scss/tokens/typography.scss b/docs/src/assets/scss/tokens/typography.scss
@@ -1,20 +1,18 @@
 /* @link https://utopia.fyi/type/calculator?c=320,16,1.125,1280,16,1.25,6,2,&s=0.75|0.5|0.25,1.5|2|3|4|6,s-l */
 
-:root {
-    --fluid-min-width: 320;
-    --fluid-max-width: 1280;
-
-    --fluid-screen: 100vw;
-    --fluid-bp: calc((var(--fluid-screen) - var(--fluid-min-width) / 16 * 1rem) / (var(--fluid-max-width) - var(--fluid-min-width)));
-}
-
 @media screen and (min-width: 1280px) {
     :root {
         --fluid-screen: calc(var(--fluid-max-width) * 1px);
     }
 }
 
 :root {
+    --fluid-min-width: 320;
+    --fluid-max-width: 1280;
+
+    --fluid-screen: 100vw;
+    --fluid-bp: calc((var(--fluid-screen) - var(--fluid-min-width) / 16 * 1rem) / (var(--fluid-max-width) - var(--fluid-min-width)));
+
     --f--2-min: 12.64;
     --f--2-max: 10.24;
     --step--2: calc(((var(--f--2-min) / 16) * 1rem) + (var(--f--2-max) - var(--f--2-min)) * var(--fluid-bp));
@@ -50,9 +48,7 @@
     --f-6-min: 32.44;
     --f-6-max: 61.04;
     --step-6: calc(((var(--f-6-min) / 16) * 1rem) + (var(--f-6-max) - var(--f-6-min)) * var(--fluid-bp));
-}
 
-:root {
     --mono-font: "Mono Punctuators", "Space Mono", monospace;
     --text-font:
         "Inter",