optimized file structure

Author: extrabright

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@webpixels/css",
   "description": "Utility and component-centric design system based on Bootstrap for fast, responsive UI development.",
-  "version": "1.2.13",
+  "version": "1.2.2",
   "version_short": "1.2",
   "license": "MIT",
   "style": "dist/index.css",

scss/base/_reboot.scss

@@ -41,3 +41,7 @@ svg {
 a {
   outline: none;
 }
+
+h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
+  color: var(--#{$prefix}headings-color);
+}

scss/base/_root.scss

@@ -11,8 +11,6 @@
 
   @each $color, $value in $theme-colors {
     --#{$prefix}#{$color}: #{$value};
-    --#{$prefix}shade-#{$color}: #{shade-color($value, 10%)};
-    --#{$prefix}tint-#{$color}: #{tint-color($value, 10%)};
   }
 
   @each $color, $value in $surface-colors {
@@ -85,8 +83,9 @@
   --#{$prefix}link-color: #{$link-color};
   --#{$prefix}link-hover-color: #{$link-hover-color};
 
-  --#{$prefix}code-color: #{$code-color};
+  --#{$prefix}headings-color: #{$gray-900};
 
+  --#{$prefix}code-color: #{$code-color};
   --#{$prefix}highlight-bg: #{$mark-bg};
 
 }

scss/base/_type.scss

@@ -1,45 +1,42 @@
 //
 // Type
 // Typography styles
-// 
+//
 
 @import "bootstrap/scss/type";
 
 // Surtitle
-
 .surtitle {
-    color: $surtitle-color;
-    font-size: $surtitle-font-size;
-    font-weight: $surtitle-font-weight;
-    text-transform: $surtitle-text-transform;
+  color: $surtitle-color;
+  font-size: $surtitle-font-size;
+  font-weight: $surtitle-font-weight;
+  text-transform: $surtitle-text-transform;
 }
 
 // Text highlight
-
 @each $color, $value in $theme-colors {
-    .text-highlight-#{$color} {
-        background-image: linear-gradient(transparent 66%, rgba($value, .15) 34%);
-        background-repeat: repeat-x;
-    }
+  .text-highlight-#{$color} {
+    background-image: linear-gradient(transparent 66%, rgba($value, .15) 34%);
+    background-repeat: repeat-x;
+  }
 }
 
 
 // Dropcaps  (add a dropcase on the first letter of the first paragraph)
-
 .dropcaps {
-    > p {
-        margin-top: 1.25rem;
-        margin-bottom: 1.25rem;
-
-        &:first-child {
-            &:first-letter {
-                font-size: 3.5em;
-                font-weight: 700;
-                float: left;
-                line-height: 1;
-                margin-top: .05em;
-                margin-right: .15em
-            }
-        }
+  > p {
+    margin-top: 1.25rem;
+    margin-bottom: 1.25rem;
+
+    &:first-child {
+      &:first-letter {
+        font-size: 3.5em;
+        font-weight: 700;
+        float: left;
+        line-height: 1;
+        margin-top: .05em;
+        margin-right: .15em
+      }
     }
+  }
 }

scss/core/_index.scss

@@ -1,17 +1,4 @@
-// Webpixels CSS functions
 @import "functions";
-
-// Webpixels CSS overrides
 @import "variables";
 @import "maps";
-
-// Bootstrap functions, bariables, and mixins
-@import "bootstrap/scss/maps";
-@import "bootstrap/scss/variables";
-@import "bootstrap/scss/mixins";
-
-// Webpixels CSS mixins
-@import "mixins/forms";
-@import "mixins/link";
-@import "mixins/modals";
-@import "mixins/popover";
+@import "mixins"

scss/core/_functions.scss scss/core/functions/_functions.scssscss/core/_functions.scss renamed to scss/core/functions/_functions.scss

@@ -3,9 +3,6 @@
 // overrides or extension after the Bootstrap's defaults
 //
 
-// Bootstrap functions
-@import 'bootstrap/scss/functions';
-
 @function map-collect($maps...) {
   	$collection: ();
 

scss/core/functions/_index.scss

@@ -0,0 +1,3 @@
+// Bootstrap functions
+@import 'bootstrap/scss/functions';
+@import './functions';

scss/core/maps/_index.scss

@@ -0,0 +1,2 @@
+@import "./maps";
+@import "bootstrap/scss/maps";

scss/core/_maps.scss scss/core/maps/_maps.scssscss/core/_maps.scss renamed to scss/core/maps/_maps.scss

@@ -0,0 +1,8 @@
+// Bootstrap functions, bariables, and mixins
+@import "bootstrap/scss/mixins";
+
+// Webpixels CSS mixins
+@import "./forms";
+@import "./link";
+@import "./modals";
+@import "./popover";