From: m5o
Date: Mon, 6 Nov 2017 22:21:03 +0000 (+0100)
Subject: descriptive docs variable naming (#24521)
X-Git-Tag: v4.0.0-beta.3~115^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09ae92a0a097fd3b90108d6c7363dccdd32f5888;p=thirdparty%2Fbootstrap.git
descriptive docs variable naming (#24521)
* use descriptive docs btn naming
* rename `btn-bd-yellow` to `btn-bd-download`
* sort state vars
* sort state vars
* info, warning, danger
* rename btn-bd-purple
* rename `.btn-bd-purple` to `.btn-bd-primary`
* align docs color variables
* generate $bd-purple-light color
* with http://razorltd.github.io/sasscolourfunctioncalculator/
* allow overide of docs variables
---
diff --git a/_includes/docs-navbar.html b/_includes/docs-navbar.html
index 6000c35b85..eb4be14743 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 82027459fa..9be5f3cfe2 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;
@@ -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 e3aed2e825..b60a21368b 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-graphite: #2a2730;
-$bd-yellow: #ffe484;
-$bd-danger: #d9534f;
-$bd-warning: #f0ad4e;
-$bd-info: #5bc0de;
+$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;
diff --git a/docs/4.0/getting-started/download.md b/docs/4.0/getting-started/download.md
index c93d6dc34a..de40145f7f 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 62fdc71d14..54b069fd92 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@ layout: home
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.