Skip to content

Commit

Permalink
Update colors in _data and theming.md to match _variables.scss (#24355)
Browse files Browse the repository at this point in the history
  • Loading branch information
supergibbs authored and XhmikosR committed Oct 13, 2017
1 parent c8ee850 commit 991cbe7
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 25 deletions.
24 changes: 12 additions & 12 deletions _data/colors.yml
Original file line number Diff line number Diff line change
@@ -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"
16 changes: 8 additions & 8 deletions _data/grays.yml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion _data/theme-colors.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- name: primary
hex: "#007aff"
hex: "#007bff"
- name: secondary
hex: "#868e96"
- name: success
Expand Down
10 changes: 6 additions & 4 deletions docs/4.0/getting-started/theming.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down

0 comments on commit 991cbe7

Please sign in to comment.