Skip to content

Loading…

Component variables should be configurable #268

Closed
wants to merge 1 commit into from

2 participants

@rubylibre

This commit allows that component variables can be defined before loading bootstrap.

@trisweb

Duplicate of #267, and already fixed upstream. Included and resolved in #270.

@trisweb trisweb closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 10, 2012
  1. @rubylibre
Showing with 9 additions and 9 deletions.
  1. +9 −9 vendor/assets/stylesheets/bootstrap/_variables.scss
View
18 vendor/assets/stylesheets/bootstrap/_variables.scss
@@ -62,17 +62,17 @@ $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; // 44px
-$paddingSmall: 2px 10px; // 26px
-$paddingMini: 1px 6px; // 24px
+$paddingLarge: 11px 19px !default; // 44px
+$paddingSmall: 2px 10px !default; // 26px
+$paddingMini: 1px 6px !default; // 24px
-$baseBorderRadius: 4px;
-$borderRadiusLarge: 6px;
-$borderRadiusSmall: 3px;
+$baseBorderRadius: 4px !default;
+$borderRadiusLarge: 6px !default;
+$borderRadiusSmall: 3px !default;
// Tables
Something went wrong with that request. Please try again.