From 991cbe74d0004f443fc14c748dd1d8da424d7dde Mon Sep 17 00:00:00 2001 From: Jesse Mandel Date: Fri, 13 Oct 2017 03:34:27 -0700 Subject: [PATCH] Update colors in _data and theming.md to match _variables.scss (#24355) --- _data/colors.yml | 24 ++++++++++++------------ _data/grays.yml | 16 ++++++++-------- _data/theme-colors.yml | 2 +- docs/4.0/getting-started/theming.md | 10 ++++++---- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/_data/colors.yml b/_data/colors.yml index 4208ec75ac..202270cdcb 100644 --- a/_data/colors.yml +++ b/_data/colors.yml @@ -1,26 +1,26 @@ - name: blue - hex: "#007aff" + hex: "#007bff" - name: indigo - hex: "#2b29bb" + hex: "#6610f2" - name: purple - hex: "#882ae0" + hex: "#6f42c1" - name: pink - hex: "#f14095" + hex: "#e83e8c" - name: red - hex: "#ea0242" + hex: "#dc3545" - name: orange - hex: "#ff8d00" + hex: "#fd7e14" - name: yellow - hex: "#ffec00" + hex: "#ffc107" - name: green - hex: "#34da36" + hex: "#28a745" - name: teal - hex: "#1dde8e" + hex: "#20c997" - name: cyan - hex: "#08eff3" + hex: "#17a2b8" - name: white hex: "#fff" - name: gray - hex: "#464a4c" + hex: "#868e96" - name: gray-dark - hex: "#292b2c" + hex: "#343a40" diff --git a/_data/grays.yml b/_data/grays.yml index bf9750ee9c..d6e50f9e14 100644 --- a/_data/grays.yml +++ b/_data/grays.yml @@ -1,18 +1,18 @@ - name: 100 hex: "#f8f9fa" - name: 200 - hex: "#ebedef" + hex: "#e9ecef" - name: 300 - hex: "#ced3d8" + hex: "#dee2e6" - name: 400 - hex: "#abb3bd" + hex: "#ced4da" - name: 500 - hex: "#7c8a99" + hex: "#adb5bd" - name: 600 - hex: "#55626f" + hex: "#868e96" - name: 700 - hex: "#4a5560" + hex: "#495057" - name: 800 - hex: "#384048" + hex: "#343a40" - name: 900 - hex: "#131619" + hex: "#212529" diff --git a/_data/theme-colors.yml b/_data/theme-colors.yml index 92ea288384..bef5002acd 100644 --- a/_data/theme-colors.yml +++ b/_data/theme-colors.yml @@ -1,5 +1,5 @@ - name: primary - hex: "#007aff" + hex: "#007bff" - name: secondary hex: "#868e96" - name: success diff --git a/docs/4.0/getting-started/theming.md b/docs/4.0/getting-started/theming.md index c4c50dc4b1..15c5caa0be 100644 --- a/docs/4.0/getting-started/theming.md +++ b/docs/4.0/getting-started/theming.md @@ -228,17 +228,19 @@ Within `_variables.scss`, you'll find our color variables and Sass map. Here's a {% highlight scss %} $colors: ( + "blue": $blue, + "indigo": $indigo, + "purple": $purple, + "pink": $pink, "red": $red, "orange": $orange, "yellow": $yellow, "green": $green, "teal": $teal, - "blue": $blue, - "pink": $pink, - "purple": $purple, + "cyan": $cyan, "white": $white, "gray": $gray-600, - "gray-dark": $gray-900 + "gray-dark": $gray-800 ) !default; {% endhighlight %}