From 95e0a94a8d7933bdff0b914f1e8d3fd2623fed48 Mon Sep 17 00:00:00 2001
From: m5o
Date: Mon, 23 Oct 2017 16:00:55 +0200
Subject: [PATCH 1/6] use descriptive docs btn naming
* rename `btn-bd-yellow` to `btn-bd-download`
---
_includes/docs-navbar.html | 2 +-
assets/scss/_buttons.scss | 12 ++++++------
assets/scss/_variables.scss | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/_includes/docs-navbar.html b/_includes/docs-navbar.html
index 6000c35b85f9..eb4be14743a3 100644
--- a/_includes/docs-navbar.html
+++ b/_includes/docs-navbar.html
@@ -59,5 +59,5 @@
- Download
+ Download
diff --git a/assets/scss/_buttons.scss b/assets/scss/_buttons.scss
index 82027459fa95..03735aaeba73 100644
--- a/assets/scss/_buttons.scss
+++ b/assets/scss/_buttons.scss
@@ -15,15 +15,15 @@
}
}
-.btn-bd-yellow {
+.btn-bd-download {
font-weight: 500;
- color: $bd-yellow;
- border-color: $bd-yellow;
+ color: $bd-download;
+ border-color: $bd-download;
&:hover,
&:active {
- color: $bd-graphite;
- background-color: $bd-yellow;
- border-color: $bd-yellow;
+ color: $bd-dark;
+ background-color: $bd-download;
+ border-color: $bd-download;
}
}
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index e3aed2e8257d..968e670bb521 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -2,8 +2,8 @@
$bd-purple: #563d7c;
$bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%);
$bd-purple-light: #cdbfe3;
-$bd-graphite: #2a2730;
-$bd-yellow: #ffe484;
+$bd-dark: #2a2730;
+$bd-download: #ffe484;
$bd-danger: #d9534f;
$bd-warning: #f0ad4e;
$bd-info: #5bc0de;
From 56a913c3f62e3146d9cd43bc22c823502d7cc263 Mon Sep 17 00:00:00 2001
From: m5o
Date: Mon, 23 Oct 2017 16:01:46 +0200
Subject: [PATCH 2/6] sort state vars
* sort state vars
* info, warning, danger
---
assets/scss/_variables.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index 968e670bb521..686c074c3999 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -4,6 +4,6 @@ $bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%);
$bd-purple-light: #cdbfe3;
$bd-dark: #2a2730;
$bd-download: #ffe484;
-$bd-danger: #d9534f;
-$bd-warning: #f0ad4e;
$bd-info: #5bc0de;
+$bd-warning: #f0ad4e;
+$bd-danger: #d9534f;
From ed8f5432deca4388b0062e82dd2726db7e52da73 Mon Sep 17 00:00:00 2001
From: m5o
Date: Mon, 23 Oct 2017 16:06:32 +0200
Subject: [PATCH 3/6] rename btn-bd-purple
* rename `.btn-bd-purple` to `.btn-bd-primary`
---
assets/scss/_buttons.scss | 2 +-
docs/4.0/getting-started/download.md | 4 ++--
index.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/assets/scss/_buttons.scss b/assets/scss/_buttons.scss
index 03735aaeba73..9be5f3cfe28a 100644
--- a/assets/scss/_buttons.scss
+++ b/assets/scss/_buttons.scss
@@ -2,7 +2,7 @@
//
// Custom buttons for the docs.
-.btn-bd-purple {
+.btn-bd-primary {
font-weight: 500;
color: $bd-purple-bright;
border-color: $bd-purple-bright;
diff --git a/docs/4.0/getting-started/download.md b/docs/4.0/getting-started/download.md
index c93d6dc34ab9..de40145f7fa3 100644
--- a/docs/4.0/getting-started/download.md
+++ b/docs/4.0/getting-started/download.md
@@ -15,7 +15,7 @@ Download ready-to-use compiled code for **Bootstrap v{{ site.current_version}}**
This doesn't include documentation, source files, or any optional JavaScript dependencies (jQuery and Popper.js).
-Download
+Download
## Source files
@@ -26,7 +26,7 @@ Compile Bootstrap with your own asset pipeline by downloading our source Sass, J
Should you require [build tools]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/build-tools/#tooling-setup), they are included for developing Bootstrap and its docs, but they're likely unsuitable for your own purposes.
-Download source
+Download source
## Bootstrap CDN
diff --git a/index.html b/index.html
index 62fdc71d148f..54b069fd92ec 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@ Bootstrap
Bootstrap is an open source toolkit for developing with HTML, CSS, and JS. Quickly prototype your ideas or build your entire app with our Sass variables and mixins, responsive grid system, extensive prebuilt components, and powerful plugins built on jQuery.
From fd601e17fede6a2f55cdd715c0dcb98154463717 Mon Sep 17 00:00:00 2001
From: m5o
Date: Mon, 23 Oct 2017 16:07:08 +0200
Subject: [PATCH 4/6] align docs color variables
---
assets/scss/_variables.scss | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index 686c074c3999..06ba0d320f54 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -1,9 +1,9 @@
// Local docs variables
-$bd-purple: #563d7c;
-$bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%);
-$bd-purple-light: #cdbfe3;
-$bd-dark: #2a2730;
-$bd-download: #ffe484;
-$bd-info: #5bc0de;
-$bd-warning: #f0ad4e;
-$bd-danger: #d9534f;
+$bd-purple: #563d7c;
+$bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%);
+$bd-purple-light: #cdbfe3;
+$bd-dark: #2a2730;
+$bd-download: #ffe484;
+$bd-info: #5bc0de;
+$bd-warning: #f0ad4e;
+$bd-danger: #d9534f;
From de45f588e4eddd8bde5de92070a6731df08eddf5 Mon Sep 17 00:00:00 2001
From: m5o
Date: Mon, 23 Oct 2017 16:16:14 +0200
Subject: [PATCH 5/6] generate $bd-purple-light color
* with http://razorltd.github.io/sasscolourfunctioncalculator/
---
assets/scss/_variables.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index 06ba0d320f54..45321c3f0694 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -1,7 +1,7 @@
// Local docs variables
$bd-purple: #563d7c;
$bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%);
-$bd-purple-light: #cdbfe3;
+$bd-purple-light: lighten(saturate($bd-purple, 5%), 45%);
$bd-dark: #2a2730;
$bd-download: #ffe484;
$bd-info: #5bc0de;
From f12fb830f98623e284ba51d9ca04475492a181e6 Mon Sep 17 00:00:00 2001
From: m5o
Date: Mon, 23 Oct 2017 16:18:45 +0200
Subject: [PATCH 6/6] allow overide of docs variables
---
assets/scss/_variables.scss | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index 45321c3f0694..b60a21368b60 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -1,9 +1,9 @@
// Local docs variables
-$bd-purple: #563d7c;
-$bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%);
-$bd-purple-light: lighten(saturate($bd-purple, 5%), 45%);
-$bd-dark: #2a2730;
-$bd-download: #ffe484;
-$bd-info: #5bc0de;
-$bd-warning: #f0ad4e;
-$bd-danger: #d9534f;
+$bd-purple: #563d7c !default;
+$bd-purple-bright: lighten(saturate($bd-purple, 5%), 15%) !default;
+$bd-purple-light: lighten(saturate($bd-purple, 5%), 45%) !default;
+$bd-dark: #2a2730 !default;
+$bd-download: #ffe484 !default;
+$bd-info: #5bc0de !default;
+$bd-warning: #f0ad4e !default;
+$bd-danger: #d9534f !default;