]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d16144c)
Fix use of LESS var syntax in docs when referencing SCSS
authorDavid Richardson <david@tankski.co.uk>
Thu, 20 Aug 2015 09:33:45 +0000 (10:33 +0100)
committerChris Rebert <code@chrisrebert.com>
Thu, 20 Aug 2015 20:03:12 +0000 (13:03 -0700)
Example:
> ... SCSS variables (e.g., `@enable-gradients: true`) ...
Referenced SCSS but used the LESS syntax. Changed to:
> ... SCSS variables (e.g., `$enable-gradients: true`) ...

Closes #17114

docs/content/typography.md patch | blob | blame | history
docs/migration.md patch | blob | blame | history

diff --git a/docs/content/typography.md b/docs/content/typography.md
index f84a44c4d18ce64768c60555c4d6d1783205211d..ada3bc2b690d03dd3c33bf997f7e3734b7341723 100644 (file)
--- a/docs/content/typography.md
+++ b/docs/content/typography.md
@@ -16,10 +16,10 @@ Bootstrap includes simple and easily customized typography for headings, body te
 Bootstrap sets basic global display, typography, and link styles. Specifically, we:
 
 - Set `background-color: #fff;` on the `<body>`
-- Use the `@font-family-base`, `@font-size-base`, and `@line-height-base` attributes as our typographic base
-- Set the global link color via `@link-color` and apply link underlines only on `:hover`
+- Use the `$font-family-base`, `$font-size-base`, and `$line-height-base` attributes as our typographic base
+- Set the global link color via `$link-color` and apply link underlines only on `:hover`
 
-These styles can be found within `scaffolding.less`.
+These styles can be found within `_reboot.scss`.
 
 
 ## Headings
diff --git a/docs/migration.md b/docs/migration.md
index aa918695119417962401bebcec882da1854b2e61..78eca6032bf56b266621a53f801958152465c9f0 100644 (file)
--- a/docs/migration.md
+++ b/docs/migration.md
@@ -26,7 +26,7 @@ Here are the big ticket items you'll want to be aware of when moving from v3 to
 - Media queries are now in `em`s instead of `px`s.
 - Global font-size increased from `14px` to `16px`.
 - Added a new grid tier for ~`480px` and below.
-- Replaced the separate optional theme with configurable options via SCSS variables (e.g., `@enable-gradients: true`).
+- Replaced the separate optional theme with configurable options via SCSS variables (e.g., `$enable-gradients: true`).
 
 ### Components
 
Mirror of https://github.com/twbs/bootstrap.git