app/assets/stylesheets/twitter/bootstrap/_variables.scss in bootstrap-sass-rails-2.3.2.1 vs app/assets/stylesheets/twitter/bootstrap/_variables.scss in bootstrap-sass-rails-3.0.0.0.rc1
- old
+ new
@@ -1,299 +1,568 @@
-/* Partial: twitter/bootstrap/_variables.scss */
//
// Variables
// --------------------------------------------------
// Global values
// --------------------------------------------------
// Grays
// -------------------------
-$black: #000 !default;
-$grayDarker: #222 !default;
-$grayDark: #333 !default;
-$gray: #555 !default;
-$grayLight: #999 !default;
-$grayLighter: #eee !default;
-$white: #fff !default;
+$gray-darker: lighten(#000, 13.5%) !default; // #222
+$gray-dark: lighten(#000, 20%) !default; // #333
+$gray: lighten(#000, 33.5%) !default; // #555
+$gray-light: lighten(#000, 60%) !default; // #999
+$gray-lighter: lighten(#000, 93.5%) !default; // #eee
-// Accent colors
+// Brand colors
// -------------------------
-$blue: #049cdb !default;
-$blueDark: #0064cd !default;
-$green: #46a546 !default;
-$red: #9d261d !default;
-$yellow: #ffc40d !default;
-$orange: #f89406 !default;
-$pink: #c3325f !default;
-$purple: #7a43b6 !default;
+$brand-primary: #428bca !default;
+$brand-success: #5cb85c !default;
+$brand-warning: #f0ad4e !default;
+$brand-danger: #d9534f !default;
+$brand-info: #5bc0de !default;
// Scaffolding
// -------------------------
-$bodyBackground: $white !default;
-$textColor: $grayDark !default;
+$body-bg: #fff !default;
+$text-color: $gray-dark !default;
// Links
// -------------------------
-$linkColor: #08c !default;
-$linkColorHover: darken($linkColor, 15%) !default;
+$link-color: $brand-primary !default;
+$link-hover-color: darken($link-color, 15%) !default;
// Typography
// -------------------------
-$sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
-$monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace !default;
-$baseFontSize: 14px !default;
-$baseFontFamily: $sansFontFamily !default;
-$baseLineHeight: 20px !default;
-$altFontFamily: $serifFontFamily !default;
+$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
+$font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace !default;
+$font-family-base: $font-family-sans-serif !default;
-$headingsFontFamily: inherit !default; // empty to use BS default, @baseFontFamily
-$headingsFontWeight: bold !default; // instead of browser default, bold
-$headingsColor: inherit !default; // empty to use BS default, @textColor
+$font-size-base: 14px !default;
+$font-size-large: ceil($font-size-base * 1.25) !default; // ~18px
+$font-size-small: ceil($font-size-base * 0.85) !default; // ~12px
+$line-height-base: 1.428571429 !default; // 20/14
+$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px
-// Component sizing
+$headings-font-family: $font-family-base !default;
+$headings-font-weight: 500 !default;
+$headings-line-height: 1.1 !default;
+
+
+// Components
// -------------------------
-// Based on 14px font-size and 20px line-height
+// Based on 14px font-size and 1.428 line-height (~20px to start)
-$fontSizeLarge: $baseFontSize * 1.25 !default; // ~18px
-$fontSizeSmall: $baseFontSize * 0.85 !default; // ~12px
-$fontSizeMini: $baseFontSize * 0.75 !default; // ~11px
+$padding-base-vertical: 8px !default;
+$padding-base-horizontal: 12px !default;
-$paddingLarge: 11px 19px !default; // 44px
-$paddingSmall: 2px 10px !default; // 26px
-$paddingMini: 0 6px !default; // 22px
+$padding-large-vertical: 14px !default;
+$padding-large-horizontal: 16px !default;
-$baseBorderRadius: 4px !default;
-$borderRadiusLarge: 6px !default;
-$borderRadiusSmall: 3px !default;
+$padding-small-vertical: 5px !default;
+$padding-small-horizontal: 10px !default;
+$border-radius-base: 4px !default;
+$border-radius-large: 6px !default;
+$border-radius-small: 3px !default;
+$component-active-bg: $brand-primary !default;
+
+
// Tables
// -------------------------
-$tableBackground: transparent !default; // overall background-color
-$tableBackgroundAccent: #f9f9f9 !default; // for striping
-$tableBackgroundHover: #f5f5f5 !default; // for hover
-$tableBorder: #ddd !default; // table and cell border
+$table-cell-padding: 8px !default;
+$table-condensed-cell-padding: 5px !default;
+
+$table-bg: transparent !default; // overall background-color
+$table-bg-accent: #f9f9f9 !default; // for striping
+$table-bg-hover: #f5f5f5 !default;
+$table-bg-active: $table-bg-hover !default;
+
+$table-border-color: #ddd !default; // table and cell border
+
+
// Buttons
// -------------------------
-$btnBackground: $white !default;
-$btnBackgroundHighlight: darken($white, 10%) !default;
-$btnBorder: #ccc !default;
-$btnPrimaryBackground: $linkColor !default;
-$btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 20%) !default;
+$btn-default-color: #fff !default;
+$btn-default-bg: #474949 !default;
+$btn-default-border: $btn-default-bg !default;
-$btnInfoBackground: #5bc0de !default;
-$btnInfoBackgroundHighlight: #2f96b4 !default;
+$btn-primary-color: $btn-default-color !default;
+$btn-primary-bg: $brand-primary !default;
+$btn-primary-border: $btn-primary-bg !default;
-$btnSuccessBackground: #62c462 !default;
-$btnSuccessBackgroundHighlight: #51a351 !default;
+$btn-success-color: $btn-default-color !default;
+$btn-success-bg: $brand-success !default;
+$btn-success-border: $btn-success-bg !default;
-$btnWarningBackground: lighten($orange, 15%) !default;
-$btnWarningBackgroundHighlight: $orange !default;
+$btn-warning-color: $btn-default-color !default;
+$btn-warning-bg: $brand-warning !default;
+$btn-warning-border: $btn-warning-bg !default;
-$btnDangerBackground: #ee5f5b !default;
-$btnDangerBackgroundHighlight: #bd362f !default;
+$btn-danger-color: $btn-default-color !default;
+$btn-danger-bg: $brand-danger !default;
+$btn-danger-border: $btn-danger-bg !default;
-$btnInverseBackground: #444 !default;
-$btnInverseBackgroundHighlight: $grayDarker !default;
+$btn-info-color: $btn-default-color !default;
+$btn-info-bg: $brand-info !default;
+$btn-info-border: $btn-info-bg !default;
+$btn-hover-color: $btn-default-color !default;
+
+
// Forms
// -------------------------
-$inputBackground: $white !default;
-$inputBorder: #ccc !default;
-$inputBorderRadius: $baseBorderRadius !default;
-$inputDisabledBackground: $grayLighter !default;
-$formActionsBackground: #f5f5f5 !default;
-$inputHeight: $baseLineHeight + 10px !default; // base line-height + 8px vertical padding + 2px top/bottom border
+$input-bg: #fff !default;
+$input-bg-disabled: $gray-lighter !default;
+$input-border: #ccc !default;
+$input-border-radius: $border-radius-base !default;
+
+$input-color-placeholder: $gray-light !default;
+
+$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
+$input-height-large: (ceil($font-size-large * $line-height-base) + ($padding-large-vertical * 2) + 2) !default;
+$input-height-small: (ceil($font-size-small * $line-height-base) + ($padding-small-vertical * 2) + 2) !default;
+
+$legend-border-color: #e5e5e5 !default;
+
+$input-group-addon-border-color: $input-border !default;
+
+
// Dropdowns
// -------------------------
-$dropdownBackground: $white !default;
-$dropdownBorder: rgba(0,0,0,.2) !default;
-$dropdownDividerTop: #e5e5e5 !default;
-$dropdownDividerBottom: $white !default;
-$dropdownLinkColor: $grayDark !default;
-$dropdownLinkColorHover: $white !default;
-$dropdownLinkColorActive: $white !default;
+$dropdown-bg: #fff !default;
+$dropdown-border: rgba(0,0,0,.15) !default;
+$dropdown-fallback-border: #ccc !default;
+$dropdown-divider-bg: #e5e5e5 !default;
-$dropdownLinkBackgroundActive: $linkColor !default;
-$dropdownLinkBackgroundHover: $dropdownLinkBackgroundActive !default;
+$dropdown-link-active-color: #fff !default;
+$dropdown-link-active-bg: $component-active-bg !default;
+$dropdown-link-color: $gray-dark !default;
+$dropdown-link-hover-color: #fff !default;
+$dropdown-link-hover-bg: $dropdown-link-active-bg !default;
+$dropdown-caret-color: #000 !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 !default;
-$zindexPopover: 1010 !default;
-$zindexTooltip: 1030 !default;
-$zindexFixedNavbar: 1030 !default;
-$zindexModalBackdrop: 1040 !default;
-$zindexModal: 1050 !default;
+$zindex-dropdown: 1000 !default;
+$zindex-popover: 1010 !default;
+$zindex-tooltip: 1030 !default;
+$zindex-navbar-fixed: 1030 !default;
+$zindex-modal-background: 1040 !default;
+$zindex-modal: 1050 !default;
-// Sprite icons path
+
+// Media queries breakpoints
+// --------------------------------------------------
+
+// Tiny screen / phone
+$screen-tiny: 480px !default;
+$screen-phone: $screen-tiny !default;
+
+// Small screen / tablet
+$screen-small: 768px !default;
+$screen-tablet: $screen-small !default;
+
+// Medium screen / desktop
+$screen-medium: 992px !default;
+$screen-desktop: $screen-medium !default;
+
+// So media queries don't overlap when required, provide a maximum
+$screen-small-max: ($screen-medium - 1) !default;
+$screen-tablet-max: $screen-small-max !default;
+
+// Large screen / wide desktop
+$screen-large: 1200px !default;
+$screen-large-desktop: $screen-large !default;
+
+
+// Container sizes
+// --------------------------------------------------
+
+// Small screen / tablet
+$container-tablet: 728px !default;
+
+// Medium screen / desktop
+$container-desktop: 940px !default;
+
+// Large screen / wide desktop
+$container-large-desktop: 1170px !default;
+
+
+// Grid system
+// --------------------------------------------------
+
+// Number of columns in the grid system
+$grid-columns: 12 !default;
+// Padding, to be divided by two and applied to the left and right of all columns
+$grid-gutter-width: 30px !default;
+// Point at which the navbar stops collapsing
+$grid-float-breakpoint: $screen-tablet !default;
+
+
+// Navbar
// -------------------------
-$iconSpritePath: "twitter/bootstrap/glyphicons-halflings.png" !default;
-$iconWhiteSpritePath: "twitter/bootstrap/glyphicons-halflings-white.png" !default;
+// Basics of a navbar
+$navbar-height: 50px !default;
+$navbar-color: #777 !default;
+$navbar-bg: #eee !default;
+$navbar-padding-horizontal: floor($grid-gutter-width / 2) !default; // ~15px
+$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
-// Input placeholder text color
+// Navbar links
+$navbar-link-color: #777 !default;
+$navbar-link-hover-color: #333 !default;
+$navbar-link-hover-bg: transparent !default;
+$navbar-link-active-color: #555 !default;
+$navbar-link-active-bg: darken($navbar-bg, 10%) !default;
+$navbar-link-disabled-color: #ccc !default;
+$navbar-link-disabled-bg: transparent !default;
+
+// Navbar brand label
+$navbar-brand-color: $navbar-link-color !default;
+$navbar-brand-hover-color: darken($navbar-link-color, 10%) !default;
+$navbar-brand-hover-bg: transparent !default;
+
+// Navbar toggle
+$navbar-toggle-hover-bg: #ddd !default;
+$navbar-toggle-icon-bar-bg: #ccc !default;
+$navbar-toggle-border-color: #ddd !default;
+
+
+// Inverted navbar
+//
+// Reset inverted navbar basics
+$navbar-inverse-color: $gray-light !default;
+$navbar-inverse-bg: #222 !default;
+
+// Inverted navbar links
+$navbar-inverse-link-color: $gray-light !default;
+$navbar-inverse-link-hover-color: #fff !default;
+$navbar-inverse-link-hover-bg: transparent !default;
+$navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default;
+$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) !default;
+$navbar-inverse-link-disabled-color: #444 !default;
+$navbar-inverse-link-disabled-bg: transparent !default;
+
+// Inverted navbar brand label
+$navbar-inverse-brand-color: $navbar-inverse-link-color !default;
+$navbar-inverse-brand-hover-color: #fff !default;
+$navbar-inverse-brand-hover-bg: transparent !default;
+
+// Inverted navbar search
+// Normal navbar needs no special styles or vars
+$navbar-inverse-search-bg: lighten($navbar-inverse-bg, 25%) !default;
+$navbar-inverse-search-bg-focus: #fff !default;
+$navbar-inverse-search-border: $navbar-inverse-bg !default;
+$navbar-inverse-search-placeholder-color: #ccc !default;
+
+// Inverted navbar toggle
+$navbar-inverse-toggle-hover-bg: #333 !default;
+$navbar-inverse-toggle-icon-bar-bg: #fff !default;
+$navbar-inverse-toggle-border-color: #333 !default;
+
+
+// Navs
// -------------------------
-$placeholderText: $grayLight !default;
+$nav-link-hover-bg: $gray-lighter !default;
-// Hr border color
+$nav-disabled-link-color: $gray-light !default;
+$nav-disabled-link-hover-color: $gray-light !default;
+
+$nav-open-link-hover-color: #fff !default;
+$nav-open-caret-border-color: #fff !default;
+
+// Tabs
+$nav-tabs-border-color: #ddd !default;
+
+$nav-tabs-link-hover-border-color: $gray-lighter !default;
+
+$nav-tabs-active-link-hover-bg: $body-bg !default;
+$nav-tabs-active-link-hover-color: $gray !default;
+$nav-tabs-active-link-hover-border-color: #ddd !default;
+
+$nav-tabs-justified-link-border-color: #ddd !default;
+$nav-tabs-justified-active-link-border-color: $body-bg !default;
+
+// Pills
+$nav-pills-active-link-hover-bg: $component-active-bg !default;
+$nav-pills-active-link-hover-color: #fff !default;
+
+
+// Pagination
// -------------------------
-$hrBorder: $grayLighter !default;
-// Horizontal forms & lists
+$pagination-bg: #fff !default;
+$pagination-border: #ddd !default;
+$pagination-active-bg: #f5f5f5 !default;
+$pagination-active-color: $gray-light !default;
+$pagination-disabled-color: $gray-light !default;
+
+// Pager
// -------------------------
-$horizontalComponentOffset: 180px !default;
+$pager-border-radius: 15px !default;
+$pager-disabled-color: $gray-light !default;
-// Wells
+
+// Jumbotron
// -------------------------
-$wellBackground: #f5f5f5 !default;
+$jumbotron-bg: $gray-lighter !default;
+$jumbotron-heading-color: inherit !default;
+$jumbotron-lead-color: inherit !default;
-// Navbar
+
+// Form states and alerts
// -------------------------
-$navbarCollapseWidth: 979px !default;
-$navbarCollapseDesktopWidth: $navbarCollapseWidth +1;
-$navbarHeight: 40px !default;
-$navbarBackgroundHighlight: #ffffff !default;
-$navbarBackground: darken($navbarBackgroundHighlight, 5%) !default;
-$navbarBorder: darken($navbarBackground, 12%) !default;
+$state-warning-text: #c09853 !default;
+$state-warning-bg: #fcf8e3 !default;
+$state-warning-border: darken(adjust-hue($state-warning-bg, -10), 3%) !default;
-$navbarText: #777 !default;
-$navbarLinkColor: #777 !default;
-$navbarLinkColorHover: $grayDark !default;
-$navbarLinkColorActive: $gray !default;
-$navbarLinkBackgroundHover: transparent !default;
-$navbarLinkBackgroundActive: darken($navbarBackground, 5%) !default;
+$state-danger-text: #b94a48 !default;
+$state-danger-bg: #f2dede !default;
+$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 3%) !default;
-$navbarBrandColor: $navbarLinkColor !default;
+$state-success-text: #468847 !default;
+$state-success-bg: #dff0d8 !default;
+$state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) !default;
-// Inverted navbar
-$navbarInverseBackground: #111111 !default;
-$navbarInverseBackgroundHighlight: #222222 !default;
-$navbarInverseBorder: #252525 !default;
+$state-info-text: #3a87ad !default;
+$state-info-bg: #d9edf7 !default;
+$state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
-$navbarInverseText: $grayLight !default;
-$navbarInverseLinkColor: $grayLight !default;
-$navbarInverseLinkColorHover: $white !default;
-$navbarInverseLinkColorActive: $navbarInverseLinkColorHover !default;
-$navbarInverseLinkBackgroundHover: transparent !default;
-$navbarInverseLinkBackgroundActive: $navbarInverseBackground !default;
-$navbarInverseSearchBackground: lighten($navbarInverseBackground, 25%) !default;
-$navbarInverseSearchBackgroundFocus: $white !default;
-$navbarInverseSearchBorder: $navbarInverseBackground !default;
-$navbarInverseSearchPlaceholderColor: #ccc !default;
+// Tooltips
+// -------------------------
+$tooltip-max-width: 200px;
+$tooltip-color: #fff !default;
+$tooltip-bg: rgba(0,0,0,.9) !default;
-$navbarInverseBrandColor: $navbarInverseLinkColor !default;
+$tooltip-arrow-width: 5px !default;
+$tooltip-arrow-color: $tooltip-bg !default;
+// Popovers
+// -------------------------
+$popover-bg: #fff !default;
+$popover-max-width: 276px !default;
+$popover-border-color: rgba(0,0,0,.2) !default;
+$popover-fallback-border-color: #ccc !default;
-// Pagination
+$popover-title-bg: darken($popover-bg, 3%) !default;
+
+$popover-arrow-width: 10px !default;
+$popover-arrow-color: #fff !default;
+
+$popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
+$popover-arrow-outer-color: rgba(0,0,0,.25) !default;
+$popover-arrow-outer-fallback-color: #999 !default;
+
+
+// Labels
// -------------------------
-$paginationBackground: #fff !default;
-$paginationBorder: #ddd !default;
-$paginationActiveBackground: #f5f5f5 !default;
+$label-success-bg: $brand-success !default;
+$label-info-bg: $brand-info !default;
+$label-warning-bg: $brand-warning !default;
+$label-danger-bg: $brand-danger !default;
+$label-color: #fff !default;
+$label-link-hover-color: #fff !default;
-// Hero unit
+
+// Modals
// -------------------------
-$heroUnitBackground: $grayLighter !default;
-$heroUnitHeadingColor: inherit !default;
-$heroUnitLeadColor: inherit !default;
+$modal-inner-padding: 20px !default;
+$modal-title-padding: 15px !default;
+$modal-title-line-height: $line-height-base !default;
-// Form states and alerts
+$modal-content-bg: #fff !default;
+$modal-content-border-color: rgba(0,0,0,.2) !default;
+$modal-content-fallback-border-color: #999 !default;
+
+$modal-backdrop-bg: #000 !default;
+$modal-header-border-color: #e5e5e5 !default;
+$modal-footer-border-color: $modal-header-border-color !default;
+
+
+// Alerts
// -------------------------
-$warningText: #c09853 !default;
-$warningBackground: #fcf8e3 !default;
-$warningBorder: darken(adjust_hue($warningBackground, -10deg), 3%) !default;
+$alert-bg: $state-warning-bg !default;
+$alert-text: $state-warning-text !default;
+$alert-border: $state-warning-border !default;
+$alert-border-radius: $border-radius-base !default;
-$errorText: #b94a48 !default;
-$errorBackground: #f2dede !default;
-$errorBorder: darken(adjust_hue($errorBackground, -10deg), 3%) !default;
+$alert-success-bg: $state-success-bg !default;
+$alert-success-text: $state-success-text !default;
+$alert-success-border: $state-success-border !default;
-$successText: #468847 !default;
-$successBackground: #dff0d8 !default;
-$successBorder: darken(adjust_hue($successBackground, -10deg), 5%) !default;
+$alert-danger-bg: $state-danger-bg !default;
+$alert-danger-text: $state-danger-text !default;
+$alert-danger-border: $state-danger-border !default;
-$infoText: #3a87ad !default;
-$infoBackground: #d9edf7 !default;
-$infoBorder: darken(adjust_hue($infoBackground, -10deg), 7%) !default;
+$alert-info-bg: $state-info-bg !default;
+$alert-info-text: $state-info-text !default;
+$alert-info-border: $state-info-border !default;
-// Tooltips and popovers
+// Progress bars
// -------------------------
-$tooltipColor: #fff !default;
-$tooltipBackground: #000 !default;
-$tooltipArrowWidth: 5px !default;
-$tooltipArrowColor: $tooltipBackground !default;
+$progress-bg: #f5f5f5 !default;
+$progress-bar-color: #fff !default;
-$popoverBackground: #fff !default;
-$popoverArrowWidth: 10px !default;
-$popoverArrowColor: #fff !default;
-$popoverTitleBackground: darken($popoverBackground, 3%) !default;
+$progress-bar-bg: $brand-primary !default;
+$progress-bar-success-bg: $brand-success !default;
+$progress-bar-warning-bg: $brand-warning !default;
+$progress-bar-danger-bg: $brand-danger !default;
+$progress-bar-info-bg: $brand-info !default;
-// Special enhancement for popovers
-$popoverArrowOuterWidth: $popoverArrowWidth + 1 !default;
-$popoverArrowOuterColor: rgba(0,0,0,.25) !default;
+// List group
+// -------------------------
+$list-group-bg: #fff !default;
+$list-group-border: #ddd !default;
+$list-group-border-radius: $border-radius-base !default;
+$list-group-hover-bg: #f5f5f5 !default;
+$list-group-active-color: #fff !default;
+$list-group-active-bg: $component-active-bg !default;
+$list-group-active-border: $list-group-active-bg !default;
-// GRID
-// --------------------------------------------------
+$list-group-link-color: #555 !default;
+$list-group-link-heading-color: #333 !default;
-// Default 940px grid
+// Panels
// -------------------------
-$gridColumns: 12 !default;
-$gridColumnWidth: 60px !default;
-$gridGutterWidth: 20px !default;
-$gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
+$panel-bg: #fff !default;
+$panel-border: #ddd !default;
+$panel-border-radius: $border-radius-base !default;
+$panel-heading-bg: #f5f5f5 !default;
+$panel-footer-bg: #f5f5f5 !default;
-// 1200px min
-$gridColumnWidth1200: 70px !default;
-$gridGutterWidth1200: 30px !default;
-$gridRowWidth1200: ($gridColumns * $gridColumnWidth1200) + ($gridGutterWidth1200 * ($gridColumns - 1)) !default;
+$panel-primary-text: #fff !default;
+$panel-primary-border: $brand-primary !default;
+$panel-primary-heading-bg: $brand-primary !default;
-// 768px-979px
-$gridColumnWidth768: 42px !default;
-$gridGutterWidth768: 20px !default;
-$gridRowWidth768: ($gridColumns * $gridColumnWidth768) + ($gridGutterWidth768 * ($gridColumns - 1)) !default;
+$panel-success-text: $state-success-text !default;
+$panel-success-border: $state-success-border !default;
+$panel-success-heading-bg: $state-success-bg !default;
+$panel-warning-text: $state-warning-text !default;
+$panel-warning-border: $state-warning-border !default;
+$panel-warning-heading-bg: $state-warning-bg !default;
-// Fluid grid
+$panel-danger-text: $state-danger-text !default;
+$panel-danger-border: $state-danger-border !default;
+$panel-danger-heading-bg: $state-danger-bg !default;
+
+$panel-info-text: $state-info-text !default;
+$panel-info-border: $state-info-border !default;
+$panel-info-heading-bg: $state-info-bg !default;
+
+
+// Thumbnails
// -------------------------
-$fluidGridColumnWidth: percentage($gridColumnWidth/$gridRowWidth) !default;
-$fluidGridGutterWidth: percentage($gridGutterWidth/$gridRowWidth) !default;
+$thumbnail-caption-color: $text-color !default;
+$thumbnail-bg: $body-bg !default;
+$thumbnail-border: #ddd !default;
+$thumbnail-border-radius: $border-radius-base !default;
-// 1200px min
-$fluidGridColumnWidth1200: percentage($gridColumnWidth1200/$gridRowWidth1200) !default;
-$fluidGridGutterWidth1200: percentage($gridGutterWidth1200/$gridRowWidth1200) !default;
-// 768px-979px
-$fluidGridColumnWidth768: percentage($gridColumnWidth768/$gridRowWidth768) !default;
-$fluidGridGutterWidth768: percentage($gridGutterWidth768/$gridRowWidth768) !default;
+// Wells
+// -------------------------
+$well-bg: #f5f5f5 !default;
+
+
+// Accordion
+// -------------------------
+$accordion-border-color: #e5e5e5 !default;
+
+
+// Badges
+// -------------------------
+$badge-color: #fff !default;
+$badge-link-hover-color: #fff !default;
+
+$badge-bg: $gray-light !default;
+$badge-active-color: $link-color !default;
+$badge-active-bg: #fff !default;
+
+
+// Breadcrumbs
+// -------------------------
+$breadcrumb-bg: #f5f5f5 !default;
+$breadcrumb-color: #ccc !default;
+$breadcrumb-active-color: $gray-light !default;
+
+
+// Carousel
+// ------------------------
+$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default;
+
+$carousel-control-color: #fff !default;
+
+$carousel-indicator-border-color: #fff !default;
+$carousel-indicator-active-bg: #fff !default;
+
+$carousel-caption-color: #fff !default;
+
+
+// Close
+// ------------------------
+$close-color: #000 !default;
+$close-text-shadow: 0 1px 0 #fff !default;
+
+
+// Code
+// ------------------------
+$code-color: #c7254e !default;
+$code-bg: #f9f2f4 !default;
+
+$pre-bg: #f5f5f5 !default;
+$pre-border-color: #ccc !default;
+
+// Type
+// ------------------------
+$text-muted: $gray-light !default;
+$abbr-border-color: $gray-light !default;
+$headings-small-color: $gray-light !default;
+$blockquote-small-color: $gray-light !default;
+$blockquote-border-color: $gray-lighter !default;
+$page-header-border-color: $gray-lighter !default;
+
+
+// Miscellaneous
+// -------------------------
+
+// Hr border color
+$hr-border: $gray-lighter !default;
+
+// Horizontal forms & lists
+$component-offset-horizontal: 180px !default;