app/assets/stylesheets/twitter/bootstrap/_variables.scss in bootstrap-sass-rails-3.0.0.0.rc2 vs app/assets/stylesheets/twitter/bootstrap/_variables.scss in bootstrap-sass-rails-3.0.0.0
- old
+ new
@@ -53,11 +53,17 @@
$headings-font-family: $font-family-base !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
+// Iconography
+// -------------------------
+$icon-font-path: "twitter/bootstrap/fonts/" !default;
+$icon-font-name: "glyphicons-halflings-regular" !default;
+
+
// Components
// -------------------------
// Based on 14px font-size and 1.428 line-height (~20px to start)
$padding-base-vertical: 6px !default;
@@ -96,11 +102,11 @@
// Buttons
// -------------------------
-$btn-font-weight: bold !default;
+$btn-font-weight: normal !default;
$btn-default-color: #333 !default;
$btn-default-bg: #fff !default;
$btn-default-border: #ccc !default;
@@ -180,10 +186,11 @@
// Z-index master list
// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)
+$zindex-navbar: 1000 !default;
$zindex-dropdown: 1000 !default;
$zindex-popover: 1010 !default;
$zindex-tooltip: 1030 !default;
$zindex-navbar-fixed: 1030 !default;
$zindex-modal-background: 1040 !default;
@@ -191,30 +198,29 @@
// Media queries breakpoints
// --------------------------------------------------
// Extra small screen / phone
-$screen-xsmall: 480px !default;
-$screen-phone: $screen-xsmall !default;
+$screen-xs: 480px !default;
+$screen-phone: $screen-xs !default;
// Small screen / tablet
-$screen-small: 768px !default;
-$screen-tablet: $screen-small !default;
+$screen-sm: 768px !default;
+$screen-tablet: $screen-sm !default;
// Medium screen / desktop
-$screen-medium: 992px !default;
-$screen-desktop: $screen-medium !default;
+$screen-md: 992px !default;
+$screen-desktop: $screen-md !default;
// Large screen / wide desktop
-$screen-large: 1200px !default;
-$screen-large-desktop: $screen-large !default;
+$screen-lg: 1200px !default;
+$screen-lg-desktop: $screen-lg !default;
// So media queries don't overlap when required, provide a maximum
-$screen-phone-max: ($screen-small - 1) !default;
-$screen-small-max: ($screen-medium - 1) !default;
-$screen-tablet-max: ($screen-desktop - 1) !default;
-$screen-desktop-max: ($screen-large-desktop - 1) !default;
+$screen-xs-max: ($screen-sm - 1) !default;
+$screen-sm-max: ($screen-md - 1) !default;
+$screen-md-max: ($screen-lg - 1) !default;
// Grid system
// --------------------------------------------------
@@ -230,35 +236,35 @@
// -------------------------
// Basics of a navbar
$navbar-height: 50px !default;
$navbar-margin-bottom: $line-height-computed !default;
-$navbar-color: #777 !default;
-$navbar-bg: #f8f8f8 !default;
-$navbar-border: darken($navbar-bg, 6.5%) !default;
+$navbar-default-color: #777 !default;
+$navbar-default-bg: #f8f8f8 !default;
+$navbar-default-border: darken($navbar-default-bg, 6.5%) !default;
$navbar-border-radius: $border-radius-base !default;
$navbar-padding-horizontal: floor($grid-gutter-width / 2) !default;
$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
// 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, 6.5%) !default;
-$navbar-link-disabled-color: #ccc !default;
-$navbar-link-disabled-bg: transparent !default;
+$navbar-default-link-color: #777 !default;
+$navbar-default-link-hover-color: #333 !default;
+$navbar-default-link-hover-bg: transparent !default;
+$navbar-default-link-active-color: #555 !default;
+$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%) !default;
+$navbar-default-link-disabled-color: #ccc !default;
+$navbar-default-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-default-brand-color: $navbar-default-link-color !default;
+$navbar-default-brand-hover-color: darken($navbar-default-link-color, 10%) !default;
+$navbar-default-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;
+$navbar-default-toggle-hover-bg: #ddd !default;
+$navbar-default-toggle-icon-bar-bg: #ccc !default;
+$navbar-default-toggle-border-color: #ddd !default;
// Inverted navbar
//
// Reset inverted navbar basics
@@ -294,10 +300,11 @@
// Navs
// -------------------------
+$nav-link-padding: 10px 15px !default;
$nav-link-hover-bg: $gray-lighter !default;
$nav-disabled-link-color: $gray-light !default;
$nav-disabled-link-hover-color: $gray-light !default;
@@ -324,27 +331,34 @@
// Pagination
// -------------------------
$pagination-bg: #fff !default;
$pagination-border: #ddd !default;
-$pagination-active-bg: #f5f5f5 !default;
-$pagination-active-color: $gray-light !default;
+
+$pagination-hover-bg: $gray-lighter !default;
+
+$pagination-active-bg: $brand-primary !default;
+$pagination-active-color: #fff !default;
+
$pagination-disabled-color: $gray-light !default;
+
// Pager
// -------------------------
$pager-border-radius: 15px !default;
$pager-disabled-color: $gray-light !default;
// Jumbotron
// -------------------------
+$jumbotron-padding: 30px !default;
+$jumbotron-color: inherit !default;
$jumbotron-bg: $gray-lighter !default;
+
$jumbotron-heading-color: inherit !default;
-$jumbotron-lead-color: inherit !default;
// Form states and alerts
// -------------------------
@@ -394,10 +408,11 @@
// Labels
// -------------------------
$label-default-bg: $gray-light !default;
+$label-primary-bg: $brand-primary !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;
@@ -425,27 +440,27 @@
// -------------------------
$alert-padding: 15px !default;
$alert-border-radius: $border-radius-base !default;
$alert-link-font-weight: bold !default;
-$alert-bg: $state-warning-bg !default;
-$alert-text: $state-warning-text !default;
-$alert-border: $state-warning-border !default;
-
$alert-success-bg: $state-success-bg !default;
$alert-success-text: $state-success-text !default;
$alert-success-border: $state-success-border !default;
-$alert-danger-bg: $state-danger-bg !default;
-$alert-danger-text: $state-danger-text !default;
-$alert-danger-border: $state-danger-border !default;
-
$alert-info-bg: $state-info-bg !default;
$alert-info-text: $state-info-text !default;
$alert-info-border: $state-info-border !default;
+$alert-warning-bg: $state-warning-bg !default;
+$alert-warning-text: $state-warning-text !default;
+$alert-warning-border: $state-warning-border !default;
+$alert-danger-bg: $state-danger-bg !default;
+$alert-danger-text: $state-danger-text !default;
+$alert-danger-border: $state-danger-border !default;
+
+
// Progress bars
// -------------------------
$progress-bg: #f5f5f5 !default;
$progress-bar-color: #fff !default;
@@ -472,15 +487,18 @@
// Panels
// -------------------------
$panel-bg: #fff !default;
-$panel-border: #ddd !default;
+$panel-inner-border: #ddd !default;
$panel-border-radius: $border-radius-base !default;
-$panel-heading-bg: #f5f5f5 !default;
$panel-footer-bg: #f5f5f5 !default;
+$panel-default-text: $gray-dark !default;
+$panel-default-border: #ddd !default;
+$panel-default-heading-bg: #f5f5f5 !default;
+
$panel-primary-text: #fff !default;
$panel-primary-border: $brand-primary !default;
$panel-primary-heading-bg: $brand-primary !default;
$panel-success-text: $state-success-text !default;
@@ -514,15 +532,10 @@
// 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;
@@ -596,12 +609,12 @@
// Container sizes
// --------------------------------------------------
// Small screen / tablet
-$container-tablet: 720px !default;
+$container-tablet: ((720px + $grid-gutter-width)) !default;
// Medium screen / desktop
-$container-desktop: 940px !default;
+$container-desktop: ((940px + $grid-gutter-width)) !default;
// Large screen / wide desktop
-$container-large-desktop: 1140px !default;
+$container-lg-desktop: ((1140px + $grid-gutter-width)) !default;