1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 11:21:23 +02:00

Update colors in _data and theming.md to match _variables.scss (#24355)

This commit is contained in:
Jesse Mandel
2017-10-13 03:34:27 -07:00
committed by XhmikosR
parent c8ee8509cb
commit 991cbe74d0
4 changed files with 27 additions and 25 deletions

View File

@@ -1,26 +1,26 @@
- name: blue - name: blue
hex: "#007aff" hex: "#007bff"
- name: indigo - name: indigo
hex: "#2b29bb" hex: "#6610f2"
- name: purple - name: purple
hex: "#882ae0" hex: "#6f42c1"
- name: pink - name: pink
hex: "#f14095" hex: "#e83e8c"
- name: red - name: red
hex: "#ea0242" hex: "#dc3545"
- name: orange - name: orange
hex: "#ff8d00" hex: "#fd7e14"
- name: yellow - name: yellow
hex: "#ffec00" hex: "#ffc107"
- name: green - name: green
hex: "#34da36" hex: "#28a745"
- name: teal - name: teal
hex: "#1dde8e" hex: "#20c997"
- name: cyan - name: cyan
hex: "#08eff3" hex: "#17a2b8"
- name: white - name: white
hex: "#fff" hex: "#fff"
- name: gray - name: gray
hex: "#464a4c" hex: "#868e96"
- name: gray-dark - name: gray-dark
hex: "#292b2c" hex: "#343a40"

View File

@@ -1,18 +1,18 @@
- name: 100 - name: 100
hex: "#f8f9fa" hex: "#f8f9fa"
- name: 200 - name: 200
hex: "#ebedef" hex: "#e9ecef"
- name: 300 - name: 300
hex: "#ced3d8" hex: "#dee2e6"
- name: 400 - name: 400
hex: "#abb3bd" hex: "#ced4da"
- name: 500 - name: 500
hex: "#7c8a99" hex: "#adb5bd"
- name: 600 - name: 600
hex: "#55626f" hex: "#868e96"
- name: 700 - name: 700
hex: "#4a5560" hex: "#495057"
- name: 800 - name: 800
hex: "#384048" hex: "#343a40"
- name: 900 - name: 900
hex: "#131619" hex: "#212529"

View File

@@ -1,5 +1,5 @@
- name: primary - name: primary
hex: "#007aff" hex: "#007bff"
- name: secondary - name: secondary
hex: "#868e96" hex: "#868e96"
- name: success - name: success

View File

@@ -228,17 +228,19 @@ Within `_variables.scss`, you'll find our color variables and Sass map. Here's a
{% highlight scss %} {% highlight scss %}
$colors: ( $colors: (
"blue": $blue,
"indigo": $indigo,
"purple": $purple,
"pink": $pink,
"red": $red, "red": $red,
"orange": $orange, "orange": $orange,
"yellow": $yellow, "yellow": $yellow,
"green": $green, "green": $green,
"teal": $teal, "teal": $teal,
"blue": $blue, "cyan": $cyan,
"pink": $pink,
"purple": $purple,
"white": $white, "white": $white,
"gray": $gray-600, "gray": $gray-600,
"gray-dark": $gray-900 "gray-dark": $gray-800
) !default; ) !default;
{% endhighlight %} {% endhighlight %}