kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

Add !default to some font variables missing it.

Browse source 
Fixes #333
This commit is contained in:
Thomas McDonald 2013-04-26 19:13:21 +01:00
parent ab370a3440
commit ad54b0c099
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Changelog
## 2.3.1.1
* Fix some font variables not having `!default` - *Thomas McDonald*
## 2.3.0.0
* [#290] Update to Bootstrap 2.3.0 - *Tristan Harward*
* Fix `rake:debug` with new file locations - *Thomas McDonald*

6
vendor/assets/stylesheets/bootstrap/_variables.scss vendored
View file

@ -62,9 +62,9 @@ $headingsColor: inherit !default; // empty to use BS default, $textColor
// -------------------------
// Based on 14px font-size and 20px line-height
$fontSizeLarge: $baseFontSize * 1.25; // ~18px
$fontSizeSmall: $baseFontSize * 0.85; // ~12px
$fontSizeMini: $baseFontSize * 0.75; // ~11px
$fontSizeLarge: $baseFontSize * 1.25 !default; // ~18px
$fontSizeSmall: $baseFontSize * 0.85 !default; // ~12px
$fontSizeMini: $baseFontSize * 0.75 !default; // ~11px
$paddingLarge: 11px 19px !default; // 44px
$paddingSmall: 2px 10px !default; // 26px