small variable fixes, change space-y component

tabler · Aug 23, 2022 · 22cd9e3 · 22cd9e3
1 parent b3ff7e7
commit 22cd9e3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
@@ -18,7 +18,7 @@ $font-google-monospaced: null !default;
 $font-local: null !default;
 $font-icons: () !default;
 
-$font-family-sans-serif: unquote("#{if($font-local, "#{$font-local}, ", ' ')}#{if($font-google, "#{$font-google}, ", ' ')}")-apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif !default;
+$font-family-sans-serif: unquote("#{if($font-local, "#{$font-local}, ", ' ')}#{if($font-google, "#{$font-google}, ", ' ')}") -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif !default;
 $font-family-monospace: unquote("#{if($font-google-monospaced, "#{$font-google-monospaced}, ", '')}") Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
 $font-family-serif: "Georgia", "Times New Roman", times, serif !default;
 
@@ -85,21 +85,21 @@ $border-light-opacity: .08 !default;
 $border-dark-opacity: .24 !default;
 $border-active-opacity: .48 !default;
 
-$gray-50: #fafbfc !default;
+$gray-50:  #f8fafc !default;
 $gray-100: #f1f5f9 !default;
 $gray-200: #e2e8f0 !default;
-$gray-300: #cbd5e1 !default;
-$gray-400: #94a3b8 !default;
-$gray-500: #64748b !default;
-$gray-600: #475569 !default;
-$gray-700: #334155 !default;
-$gray-800: #1e293b !default;
+$gray-300: #c8d3e1 !default;
+$gray-400: #9ba9be !default;
+$gray-500: #6c7a91 !default;
+$gray-600: #49566c !default;
+$gray-700: #313c52 !default;
+$gray-800: #1d273b !default;
 $gray-900: #0f172a !default;
 
 $light: $gray-50 !default;
 $dark: $gray-800 !default;
 
-$body-bg: #f5f7fb !default;
+$body-bg: $gray-100 !default;
 $body-color: $dark !default;
 
 $color-contrast-dark: $dark !default;
@@ -154,7 +154,7 @@ $theme-colors: (
   "warning": $warning,
   "danger": $danger,
   "light": $light,
-  "dark":  $dark,
+  "dark": $dark,
   "muted": $text-muted
 ) !default;
 

diff --git a/src/scss/ui/_grid.scss b/src/scss/ui/_grid.scss
@@ -74,15 +74,14 @@
   $name-prefixed: if($name == null, null, '-#{$name}');
 
   .space-y#{$name-prefixed} {
-    > :not(template) ~ :not(template) {
-      margin-top: $size !important;
-    }
+    display: flex;
+    flex-direction: column;
+    gap: $size;
   }
 
   .space-x#{$name-prefixed} {
-    > :not(template) ~ :not(template) {
-      margin-left: $size !important;
-    }
+    display: flex;
+    gap: $size;
   }
 }