Merge pull request #2877 from uswds/dw-update-palette-names

Update palette names
uswds · Nov 12, 2018 · 0c92d6d · 0c92d6d
2 parents 55b81d6 + 0af62b3
commit 0c92d6d
Show file tree

Hide file tree

Showing 43 changed files with 1,575 additions and 1,469 deletions.
diff --git a/src/stylesheets/core/_properties.scss b/src/stylesheets/core/_properties.scss
@@ -5,14 +5,14 @@ USWDS Properties
 */
 
 $standard-colors: map-collect(
-  $color-palette-theme,
-  $color-palette-state,
-  $system-required-colors
+  $tokens-color-theme,
+  $tokens-color-state,
+  $tokens-color-required
 );
 
 $extended-colors: map-collect(
   $system-colors,
-  $system-basic-colors
+  $tokens-color-basic
 );
 
 $partial-values: (
@@ -506,7 +506,7 @@ $system-properties: (
   ),
   outline-color: (
     standard: map-collect(
-      $system-required-colors
+      $tokens-color-required
     ),
     extended: $extended-colors,
   ),

diff --git a/src/stylesheets/core/_system-tokens.scss b/src/stylesheets/core/_system-tokens.scss
@@ -318,13 +318,13 @@ $system-colors: map-collect(
   $system-color-white-transparent
 );
 
-$system-required-colors: (
+$tokens-color-required: (
   'transparent':    transparent,
   'black':          black,
   'white':          white,
 );
 
-$system-basic-colors: (
+$tokens-color-basic: (
   'red':                get-system-color('red', 50, 'vivid'),
   'red-warm':           false,
   'orange-warm':        false,

diff --git a/src/stylesheets/core/_variables.scss b/src/stylesheets/core/_variables.scss
@@ -434,9 +434,9 @@ $all-project-colors: map-collect(
   $project-state-colors
 );
 
-$all-colors: map-collect(
+$palette-colors: map-collect(
   $all-project-colors,
-  $system-required-colors,
+  $tokens-color-required,
   $system-colors
 );
 
@@ -446,7 +446,7 @@ Theme color shortcodes
 ----------------------------------------
 */
 
-$color-palette-theme: (
+$tokens-color-theme: (
   'base-lightest':            color($theme-color-base-lightest),
   'base-lighter':             color($theme-color-base-lighter),
   'base-light':               color($theme-color-base-light),
@@ -487,7 +487,7 @@ $color-palette-theme: (
   'accent-cool-lightest':     color($theme-color-accent-cool-lightest),
 );
 
-$color-palette-state: (
+$tokens-color-state: (
   'error-lighter':            color($theme-color-error-lighter),
   'error-light':              color($theme-color-error-light),
   'error':                    color($theme-color-error),
@@ -514,12 +514,12 @@ $color-palette-state: (
 );
 
 $project-color-shortcodes: map-collect(
-  $color-palette-theme,
-  $color-palette-state
+  $tokens-color-theme,
+  $tokens-color-state
 );
 
 $all-color-shortcodes: map-collect(
-  $system-required-colors,
+  $tokens-color-required,
   $system-color-shortcodes,
   $project-color-shortcodes
 );

diff --git a/src/stylesheets/core/mixins/utilities/_text-indent.scss b/src/stylesheets/core/mixins/utilities/_text-indent.scss
@@ -0,0 +1,10 @@
+// Outputs text-indent property
+
+@mixin u-text-indent($value...) {
+  $important: null;
+  @if has-important($value) {
+    $value: remove($value, '!important');
+    $important: ' !important';
+  }
+  text-indent: get-uswds-value('text-indent', $value...) #{$important};
+}
diff --git a/src/stylesheets/core/mixins/utilities/_text.scss b/src/stylesheets/core/mixins/utilities/_text.scss
@@ -34,7 +34,7 @@ $text-utililies: (
     map-deep-get($system-properties, white-space, extended)
   ),
   color: map-collect(
-    $system-required-colors
+    $tokens-color-required
   ),
 );