vendor/assets/stylesheets/variables.scss in anjlab-bootstrap-rails-2.0.0.2 vs vendor/assets/stylesheets/variables.scss in anjlab-bootstrap-rails-2.0.0.3

- old
+ new

@@ -6,94 +6,94 @@ // GLOBAL VALUES // -------------------------------------------------- // Links -$linkColor: #08c; -$linkColorHover: darken($linkColor, 15%); +$linkColor: #08c !default; +$linkColorHover: darken($linkColor, 15%) !default; // Grays -$black: #000; -$grayDarker: #222; -$grayDark: #333; -$gray: #555; -$grayLight: #999; -$grayLighter: #eee; -$white: #fff; +$black: #000 !default; +$grayDarker: #222 !default; +$grayDark: #333 !default; +$gray: #555 !default; +$grayLight: #999 !default; +$grayLighter: #eee !default; +$white: #fff !default; // Accent colors -$blue: #049cdb; -$blueDark: #0064cd; -$green: #46a546; -$red: #9d261d; -$yellow: #ffc40d; -$orange: #f89406; -$pink: #c3325f; -$purple: #7a43b6; +$blue: #049cdb !default; +$blueDark: #0064cd !default; +$green: #46a546 !default; +$red: #9d261d !default; +$yellow: #ffc40d !default; +$orange: #f89406 !default; +$pink: #c3325f !default; +$purple: #7a43b6 !default; // Typography -$baseFontSize: 13px; -$baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; -$baseLineHeight: 18px; -$textColor: $grayDark; +$baseFontSize: 13px !default; +$baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default; +$baseLineHeight: 18px !default; +$textColor: $grayDark !default; // Buttons -$primaryButtonBackground: $linkColor; +$primaryButtonBackground: $linkColor !default; // COMPONENT VARIABLES // -------------------------------------------------- // Z-index master list // Used for a bird's eye view of components dependent on the z-axis // Try to avoid customizing these :) -$zindexDropdown: 1000; -$zindexPopover: 1010; -$zindexTooltip: 1020; -$zindexFixedNavbar: 1030; -$zindexModalBackdrop: 1040; -$zindexModal: 1050; +$zindexDropdown: 1000 !default; +$zindexPopover: 1010 !default; +$zindexTooltip: 1020 !default; +$zindexFixedNavbar: 1030 !default; +$zindexModalBackdrop: 1040 !default; +$zindexModal: 1050 !default; // Input placeholder text color -$placeholderText: $grayLight; +$placeholderText: $grayLight !default; // Navbar -$navbarHeight: 40px; -$navbarBackground: $grayDarker; -$navbarBackgroundHighlight: $grayDark; +$navbarHeight: 40px !default; +$navbarBackground: $grayDarker !default; +$navbarBackgroundHighlight: $grayDark !default; -$navbarText: $grayLight; -$navbarLinkColor: $grayLight; -$navbarLinkColorHover: $white; +$navbarText: $grayLight !default; +$navbarLinkColor: $grayLight !default; +$navbarLinkColorHover: $white !default; // Form states and alerts -$warningText: #c09853; -$warningBackground: #fcf8e3; -$warningBorder: darken(adjust-hue($warningBackground, -10), 3%); +$warningText: #c09853 !default; +$warningBackground: #fcf8e3 !default; +$warningBorder: darken(adjust-hue($warningBackground, -10), 3%) !default; -$errorText: #b94a48; -$errorBackground: #f2dede; -$errorBorder: darken(adjust-hue($errorBackground, -10), 3%); +$errorText: #b94a48 !default; +$errorBackground: #f2dede !default; +$errorBorder: darken(adjust-hue($errorBackground, -10), 3%) !default; -$successText: #468847; -$successBackground: #dff0d8; -$successBorder: darken(adjust-hue($successBackground, -10), 5%); +$successText: #468847 !default; +$successBackground: #dff0d8 !default; +$successBorder: darken(adjust-hue($successBackground, -10), 5%) !default; -$infoText: #3a87ad; -$infoBackground: #d9edf7; -$infoBorder: darken(adjust-hue($infoBackground, -10), 7%); +$infoText: #3a87ad !default; +$infoBackground: #d9edf7 !default; +$infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default; // GRID // -------------------------------------------------- // Default 940px grid -$gridColumns: 12; -$gridColumnWidth: 60px; -$gridGutterWidth: 20px; -$gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)); +$gridColumns: 12 !default; +$gridColumnWidth: 60px !default; +$gridGutterWidth: 20px !default; +$gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default; // Fluid grid -$fluidGridColumnWidth: 6.382978723%; -$fluidGridGutterWidth: 2.127659574%; +$fluidGridColumnWidth: 6.382978723% !default; +$fluidGridGutterWidth: 2.127659574% !default;