.
+
.list-group {
// No need to set list-style: none; since .list-group-item is block level
margin-bottom: 20px;
padding-left: 0; // reset padding because ul and ol
}
+
// Individual list items
-// -------------------------
+//
+// Use on `li`s or `div`s within the `.list-group` parent.
.list-group-item {
position: relative;
@@ -41,7 +45,12 @@
}
}
+
// Linked list items
+//
+// Use anchor elements instead of `li`s or `div`s to create linked list items.
+// Includes an extra `.active` modifier class for showing selected items.
+
a.list-group-item {
color: $list-group-link-color;
@@ -70,13 +79,26 @@ a.list-group-item {
color: inherit;
}
.list-group-item-text {
- color: lighten($list-group-active-bg, 40%);
+ color: $list-group-active-text-color;
}
}
}
+
+// Contextual variants
+//
+// Add modifier classes to change text and background color on individual items.
+// Organizationally, this must come after the `:hover` states.
+
+@include list-group-item-variant(success, $state-success-bg, $state-success-text);
+@include list-group-item-variant(info, $state-info-bg, $state-info-text);
+@include list-group-item-variant(warning, $state-warning-bg, $state-warning-text);
+@include list-group-item-variant(danger, $state-danger-bg, $state-danger-text);
+
+
// Custom content options
-// -------------------------
+//
+// Extra classes for creating well-formatted content within `.list-group-item`s.
.list-group-item-heading {
margin-top: 0;
diff --git a/_assets/stylesheets/bootstrap/_mixins.scss b/_assets/stylesheets/bootstrap/_mixins.scss
index 146805b..232a408 100644
--- a/_assets/stylesheets/bootstrap/_mixins.scss
+++ b/_assets/stylesheets/bootstrap/_mixins.scss
@@ -115,6 +115,10 @@
}
// Drop shadows
+//
+// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
+// supported browsers that have box shadow capabilities now support the
+// standard `box-shadow` property.
@mixin box-shadow($shadow...) {
-webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1
box-shadow: $shadow;
@@ -147,17 +151,17 @@
// Transformations
@mixin rotate($degrees) {
-webkit-transform: rotate($degrees);
- -ms-transform: rotate($degrees); // IE9+
+ -ms-transform: rotate($degrees); // IE9 only
transform: rotate($degrees);
}
-@mixin scale($ratio) {
- -webkit-transform: scale($ratio);
- -ms-transform: scale($ratio); // IE9+
- transform: scale($ratio);
+@mixin scale($ratio, $ratio-y...) {
+ -webkit-transform: scale($ratio, $ratio-y);
+ -ms-transform: scale($ratio, $ratio-y); // IE9 only
+ transform: scale($ratio, $ratio-y);
}
@mixin translate($x, $y) {
-webkit-transform: translate($x, $y);
- -ms-transform: translate($x, $y); // IE9+
+ -ms-transform: translate($x, $y); // IE9 only
transform: translate($x, $y);
}
@mixin skew($x, $y) {
@@ -172,12 +176,12 @@
@mixin rotateX($degrees) {
-webkit-transform: rotateX($degrees);
- -ms-transform: rotateX($degrees); // IE9+
+ -ms-transform: rotateX($degrees); // IE9 only
transform: rotateX($degrees);
}
@mixin rotateY($degrees) {
-webkit-transform: rotateY($degrees);
- -ms-transform: rotateY($degrees); // IE9+
+ -ms-transform: rotateY($degrees); // IE9 only
transform: rotateY($degrees);
}
@mixin perspective($perspective) {
@@ -193,6 +197,7 @@
@mixin transform-origin($origin) {
-webkit-transform-origin: $origin;
-moz-transform-origin: $origin;
+ -ms-transform-origin: $origin; // IE9 only
transform-origin: $origin;
}
@@ -201,6 +206,30 @@
-webkit-animation: $animation;
animation: $animation;
}
+@mixin animation-name($name) {
+ -webkit-animation-name: $name;
+ animation-name: $name;
+}
+@mixin animation-duration($duration) {
+ -webkit-animation-duration: $duration;
+ animation-duration: $duration;
+}
+@mixin animation-timing-function($timing-function) {
+ -webkit-animation-timing-function: $timing-function;
+ animation-timing-function: $timing-function;
+}
+@mixin animation-delay($delay) {
+ -webkit-animation-delay: $delay;
+ animation-delay: $delay;
+}
+@mixin animation-iteration-count($iteration-count) {
+ -webkit-animation-iteration-count: $iteration-count;
+ animation-iteration-count: $iteration-count;
+}
+@mixin animation-direction($direction) {
+ -webkit-animation-direction: $direction;
+ animation-direction: $direction;
+}
// Backface visibility
// Prevent browsers from flickering when using CSS 3D transforms.
@@ -413,29 +442,59 @@
@mixin table-row-variant($state, $background) {
// Exact selectors below required to override `.table-striped` and prevent
// inheritance to nested tables.
- .table {
- > thead,
- > tbody,
- > tfoot {
- > tr > .#{$state},
- > .#{$state} > td,
- > .#{$state} > th {
- background-color: $background;
- }
+ .table > thead > tr,
+ .table > tbody > tr,
+ .table > tfoot > tr {
+ > td.#{$state},
+ > th.#{$state},
+ &.#{$state} > td,
+ &.#{$state} > th {
+ background-color: $background;
}
}
// Hover states for `.table-hover`
// Note: this is not available for cells or rows within `thead` or `tfoot`.
- .table-hover > tbody {
- > tr > .#{$state}:hover,
- > .#{$state}:hover > td,
- > .#{$state}:hover > th {
+ .table-hover > tbody > tr {
+ > td.#{$state}:hover,
+ > th.#{$state}:hover,
+ &.#{$state}:hover > td,
+ &.#{$state}:hover > th {
background-color: darken($background, 5%);
}
}
}
+// List Groups
+// -------------------------
+@mixin list-group-item-variant($state, $background, $color) {
+ .list-group-item-#{$state} {
+ color: $color;
+ background-color: $background;
+
+ // [converter] extracted a& to a.list-group-item-#{$state}
+ }
+
+ a.list-group-item-#{$state} {
+ color: $color;
+
+ .list-group-item-heading { color: inherit; }
+
+ &:hover,
+ &:focus {
+ color: $color;
+ background-color: darken($background, 5%);
+ }
+ &.active,
+ &.active:hover,
+ &.active:focus {
+ color: #fff;
+ background-color: $color;
+ border-color: $color;
+ }
+ }
+}
+
// Button variants
// -------------------------
// Easily pump out default styles, as well as :hover, :focus, :active,
@@ -480,7 +539,7 @@
.badge {
color: $background;
- background-color: #fff;
+ background-color: $color;
}
}
@@ -529,6 +588,24 @@
}
}
+// Contextual backgrounds
+// -------------------------
+@mixin bg-variant($color) {
+ background-color: $color;
+ a:hover {
+ background-color: darken($color, 10%);
+ }
+}
+
+// Typography
+// -------------------------
+@mixin text-emphasis-variant($color) {
+ color: $color;
+ a:hover {
+ color: darken($color, 10%);
+ }
+}
+
// Navbar vertical align
// -------------------------
// Vertically center elements in the navbar.
@@ -592,30 +669,39 @@
position: relative;
float: left;
width: percentage(($columns / $grid-columns));
- // Prevent columns from collapsing when empty
min-height: 1px;
- // Inner gutter via padding
padding-left: ($gutter / 2);
padding-right: ($gutter / 2);
}
+@mixin make-xs-column-offset($columns) {
+ @media (min-width: $screen-xs-min) {
+ margin-left: percentage(($columns / $grid-columns));
+ }
+}
+@mixin make-xs-column-push($columns) {
+ @media (min-width: $screen-xs-min) {
+ left: percentage(($columns / $grid-columns));
+ }
+}
+@mixin make-xs-column-pull($columns) {
+ @media (min-width: $screen-xs-min) {
+ right: percentage(($columns / $grid-columns));
+ }
+}
+
// Generate the small columns
@mixin make-sm-column($columns, $gutter: $grid-gutter-width) {
position: relative;
- // Prevent columns from collapsing when empty
min-height: 1px;
- // Inner gutter via padding
padding-left: ($gutter / 2);
padding-right: ($gutter / 2);
- // Calculate width based on number of columns available
@media (min-width: $screen-sm-min) {
float: left;
width: percentage(($columns / $grid-columns));
}
}
-
-// Generate the small column offsets
@mixin make-sm-column-offset($columns) {
@media (min-width: $screen-sm-min) {
margin-left: percentage(($columns / $grid-columns));
@@ -632,30 +718,26 @@
}
}
+
// Generate the medium columns
@mixin make-md-column($columns, $gutter: $grid-gutter-width) {
position: relative;
- // Prevent columns from collapsing when empty
min-height: 1px;
- // Inner gutter via padding
padding-left: ($gutter / 2);
padding-right: ($gutter / 2);
- // Calculate width based on number of columns available
@media (min-width: $screen-md-min) {
float: left;
width: percentage(($columns / $grid-columns));
}
}
-
-// Generate the medium column offsets
@mixin make-md-column-offset($columns) {
@media (min-width: $screen-md-min) {
margin-left: percentage(($columns / $grid-columns));
}
}
@mixin make-md-column-push($columns) {
- @media (min-width: $screen-md) {
+ @media (min-width: $screen-md-min) {
left: percentage(($columns / $grid-columns));
}
}
@@ -665,23 +747,19 @@
}
}
+
// Generate the large columns
@mixin make-lg-column($columns, $gutter: $grid-gutter-width) {
position: relative;
- // Prevent columns from collapsing when empty
min-height: 1px;
- // Inner gutter via padding
padding-left: ($gutter / 2);
padding-right: ($gutter / 2);
- // Calculate width based on number of columns available
@media (min-width: $screen-lg-min) {
float: left;
width: percentage(($columns / $grid-columns));
}
}
-
-// Generate the large column offsets
@mixin make-lg-column-offset($columns) {
@media (min-width: $screen-lg-min) {
margin-left: percentage(($columns / $grid-columns));
@@ -800,6 +878,10 @@
border-color: $border-color;
background-color: $background-color;
}
+ // Optional feedback icon
+ .form-control-feedback {
+ color: $text-color;
+ }
}
// Form control focus state
@@ -842,7 +924,8 @@
line-height: $input-height;
}
- textarea#{$parent} {
+ textarea#{$parent},
+ select[multiple]#{$parent} {
height: auto;
}
}
diff --git a/_assets/stylesheets/bootstrap/_modals.scss b/_assets/stylesheets/bootstrap/_modals.scss
index c79be92..d9edff4 100644
--- a/_assets/stylesheets/bootstrap/_modals.scss
+++ b/_assets/stylesheets/bootstrap/_modals.scss
@@ -22,7 +22,12 @@
right: 0;
bottom: 0;
left: 0;
- z-index: $zindex-modal-background;
+ z-index: $zindex-modal;
+ -webkit-overflow-scrolling: touch;
+
+ // Prevent Chrome on Windows from adding a focus outline. For details, see
+ // https://github.com/twbs/bootstrap/pull/10951.
+ outline: 0;
// When fading in the modal, animate it to slide down
&.fade .modal-dialog {
@@ -37,7 +42,6 @@
position: relative;
width: auto;
margin: 10px;
- z-index: ($zindex-modal-background + 10);
}
// Actual modal
@@ -60,11 +64,11 @@
right: 0;
bottom: 0;
left: 0;
- z-index: ($zindex-modal-background - 10);
+ z-index: $zindex-modal-background;
background-color: $modal-backdrop-bg;
// Fade for backdrop
&.fade { @include opacity(0); }
- &.in { @include opacity(.5); }
+ &.in { @include opacity($modal-backdrop-opacity); }
}
// Modal header
@@ -116,14 +120,19 @@
}
// Scale up the modal
-@media screen and (min-width: $screen-sm-min) {
+@media (min-width: $screen-sm-min) {
+ // Automatically set modal's width for larger viewports
.modal-dialog {
- width: 600px;
+ width: $modal-md;
margin: 30px auto;
}
.modal-content {
@include box-shadow(0 5px 15px rgba(0,0,0,.5));
}
+ // Modal sizes
+ .modal-sm { width: $modal-sm; }
+ .modal-lg { width: $modal-lg; }
+
}
diff --git a/_assets/stylesheets/bootstrap/_navbar.scss b/_assets/stylesheets/bootstrap/_navbar.scss
index c3c57ba..17e20bf 100644
--- a/_assets/stylesheets/bootstrap/_navbar.scss
+++ b/_assets/stylesheets/bootstrap/_navbar.scss
@@ -48,7 +48,7 @@
// content for the user's viewport.
.navbar-collapse {
- max-height: 340px;
+ max-height: $navbar-collapse-max-height;
overflow-x: visible;
padding-right: $navbar-padding-horizontal;
padding-left: $navbar-padding-horizontal;
@@ -93,14 +93,17 @@
//
// When a container is present, change the behavior of the header and collapse.
-.container > .navbar-header,
-.container > .navbar-collapse {
- margin-right: -$navbar-padding-horizontal;
- margin-left: -$navbar-padding-horizontal;
+.container,
+.container-fluid {
+ > .navbar-header,
+ > .navbar-collapse {
+ margin-right: -$navbar-padding-horizontal;
+ margin-left: -$navbar-padding-horizontal;
- @media (min-width: $grid-float-breakpoint) {
- margin-right: 0;
- margin-left: 0;
+ @media (min-width: $grid-float-breakpoint) {
+ margin-right: 0;
+ margin-left: 0;
+ }
}
}
@@ -152,6 +155,7 @@
padding: $navbar-padding-vertical $navbar-padding-horizontal;
font-size: $font-size-large;
line-height: $line-height-computed;
+ height: $line-height-computed;
&:hover,
&:focus {
@@ -159,7 +163,8 @@
}
@media (min-width: $grid-float-breakpoint) {
- .navbar > .container & {
+ .navbar > .container &,
+ .navbar > .container-fluid & {
margin-left: -$navbar-padding-horizontal;
}
}
@@ -182,6 +187,12 @@
border: 1px solid transparent;
border-radius: $border-radius-base;
+ // We remove the `outline` here, but later compensate by attaching `:hover`
+ // styles to `:focus`.
+ &:focus {
+ outline: none;
+ }
+
// Bars
.icon-bar {
display: block;
@@ -201,7 +212,7 @@
// Navbar nav links
//
-// Builds on top of the `.nav` components with it's own modifier class to make
+// Builds on top of the `.nav` components with its own modifier class to make
// the nav the full height of the horizontal nav (above 768px).
.navbar-nav {
@@ -329,13 +340,6 @@
@include border-bottom-radius(0);
}
-// Right aligned menus need alt position
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
- left: auto;
- right: 0;
-}
-
// Buttons in navbars
//
diff --git a/_assets/stylesheets/bootstrap/_navs.scss b/_assets/stylesheets/bootstrap/_navs.scss
index 6fa0095..c690072 100644
--- a/_assets/stylesheets/bootstrap/_navs.scss
+++ b/_assets/stylesheets/bootstrap/_navs.scss
@@ -91,7 +91,7 @@
}
}
- // Active state, and it's :hover to override normal :hover
+ // Active state, and its :hover to override normal :hover
&.active > a {
&,
&:hover,
diff --git a/_assets/stylesheets/bootstrap/_normalize.scss b/_assets/stylesheets/bootstrap/_normalize.scss
index 42a393f..024e257 100644
--- a/_assets/stylesheets/bootstrap/_normalize.scss
+++ b/_assets/stylesheets/bootstrap/_normalize.scss
@@ -1,6 +1,25 @@
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
+
+//
+// 1. Set default font family to sans-serif.
+// 2. Prevent iOS text size adjust after orientation change, without disabling
+// user zoom.
+//
+
+html {
+ font-family: sans-serif; // 1
+ -ms-text-size-adjust: 100%; // 2
+ -webkit-text-size-adjust: 100%; // 2
+}
+
+//
+// Remove default margin.
+//
+
+body {
+ margin: 0;
+}
-// ==========================================================================
// HTML5 display definitions
// ==========================================================================
@@ -24,13 +43,16 @@ summary {
}
//
-// Correct `inline-block` display not defined in IE 8/9.
+// 1. Correct `inline-block` display not defined in IE 8/9.
+// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
//
audio,
canvas,
+progress,
video {
- display: inline-block;
+ display: inline-block; // 1
+ vertical-align: baseline; // 2
}
//
@@ -53,31 +75,6 @@ template {
display: none;
}
-// ==========================================================================
-// Base
-// ==========================================================================
-
-//
-// 1. Set default font family to sans-serif.
-// 2. Prevent iOS text size adjust after orientation change, without disabling
-// user zoom.
-//
-
-html {
- font-family: sans-serif; // 1
- -ms-text-size-adjust: 100%; // 2
- -webkit-text-size-adjust: 100%; // 2
-}
-
-//
-// Remove default margin.
-//
-
-body {
- margin: 0;
-}
-
-// ==========================================================================
// Links
// ==========================================================================
@@ -89,14 +86,6 @@ a {
background: transparent;
}
-//
-// Address `outline` inconsistency between Chrome and other browsers.
-//
-
-a:focus {
- outline: thin dotted;
-}
-
//
// Improve readability when focused and also mouse hovered in all browsers.
//
@@ -106,19 +95,8 @@ a:hover {
outline: 0;
}
+// Text-level semantics
// ==========================================================================
-// Typography
-// ==========================================================================
-
-//
-// Address variable `h1` font-size and margin within `section` and `article`
-// contexts in Firefox 4+, Safari 5, and Chrome.
-//
-
-h1 {
- font-size: 2em;
- margin: 0.67em 0;
-}
//
// Address styling not present in IE 8/9, Safari 5, and Chrome.
@@ -146,13 +124,13 @@ dfn {
}
//
-// Address differences between Firefox and other browsers.
+// Address variable `h1` font-size and margin within `section` and `article`
+// contexts in Firefox 4+, Safari 5, and Chrome.
//
-hr {
- -moz-box-sizing: content-box;
- box-sizing: content-box;
- height: 0;
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0;
}
//
@@ -164,34 +142,6 @@ mark {
color: #000;
}
-//
-// Correct font family set oddly in Safari 5 and Chrome.
-//
-
-code,
-kbd,
-pre,
-samp {
- font-family: monospace, serif;
- font-size: 1em;
-}
-
-//
-// Improve readability of pre-formatted text in all browsers.
-//
-
-pre {
- white-space: pre-wrap;
-}
-
-//
-// Set consistent quote types.
-//
-
-q {
- quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
//
// Address inconsistent and variable font size in all browsers.
//
@@ -220,7 +170,6 @@ sub {
bottom: -0.25em;
}
-// ==========================================================================
// Embedded content
// ==========================================================================
@@ -240,8 +189,7 @@ svg:not(:root) {
overflow: hidden;
}
-// ==========================================================================
-// Figures
+// Grouping content
// ==========================================================================
//
@@ -249,63 +197,77 @@ svg:not(:root) {
//
figure {
- margin: 0;
+ margin: 1em 40px;
}
-// ==========================================================================
-// Forms
-// ==========================================================================
+//
+// Address differences between Firefox and other browsers.
+//
+
+hr {
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+ height: 0;
+}
//
-// Define consistent border, margin, and padding.
+// Contain overflow in all browsers.
//
-fieldset {
- border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
+pre {
+ overflow: auto;
}
//
-// 1. Correct `color` not being inherited in IE 8/9.
-// 2. Remove padding so people aren't caught out if they zero out fieldsets.
+// Address odd `em`-unit font size rendering in all browsers.
//
-legend {
- border: 0; // 1
- padding: 0; // 2
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, monospace;
+ font-size: 1em;
}
+// Forms
+// ==========================================================================
+
+//
+// Known limitation: by default, Chrome and Safari on OS X allow very limited
+// styling of `select`, unless a `border` property is set.
+//
+
//
-// 1. Correct font family not being inherited in all browsers.
-// 2. Correct font size not being inherited in all browsers.
+// 1. Correct color not being inherited.
+// Known issue: affects color of disabled elements.
+// 2. Correct font properties not being inherited.
// 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
//
button,
input,
+optgroup,
select,
textarea {
- font-family: inherit; // 1
- font-size: 100%; // 2
+ color: inherit; // 1
+ font: inherit; // 2
margin: 0; // 3
}
//
-// Address Firefox 4+ setting `line-height` on `input` using `!important` in
-// the UA stylesheet.
+// Address `overflow` set to `hidden` in IE 8/9/10.
//
-button,
-input {
- line-height: normal;
+button {
+ overflow: visible;
}
//
// Address inconsistent `text-transform` inheritance for `button` and `select`.
// All other form control elements do not inherit `text-transform` values.
-// Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
-// Correct `select` style inheritance in Firefox 4+ and Opera.
+// Correct `button` style inheritance in Firefox, IE 8+, and Opera
+// Correct `select` style inheritance in Firefox.
//
button,
@@ -338,6 +300,28 @@ html input[disabled] {
cursor: default;
}
+//
+// Remove inner padding and border in Firefox 4+.
+//
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+ border: 0;
+ padding: 0;
+}
+
+//
+// Address Firefox 4+ setting `line-height` on `input` using `!important` in
+// the UA stylesheet.
+//
+
+input {
+ line-height: normal;
+}
+
+//
+// It's recommended that you don't attempt to style these elements.
+// Firefox's implementation doesn't respect box-sizing, padding, or width.
//
// 1. Address box sizing set to `content-box` in IE 8/9/10.
// 2. Remove excess padding in IE 8/9/10.
@@ -349,6 +333,17 @@ input[type="radio"] {
padding: 0; // 2
}
+//
+// Fix the cursor style for Chrome's increment/decrement buttons. For certain
+// `font-size` values of the `input`, it causes the cursor style of the
+// decrement button to change from `default` to `text`.
+//
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+ height: auto;
+}
+
//
// 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
// 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
@@ -363,8 +358,9 @@ input[type="search"] {
}
//
-// Remove inner padding and search cancel button in Safari 5 and Chrome
-// on OS X.
+// Remove inner padding and search cancel button in Safari and Chrome on OS X.
+// Safari (but not Chrome) clips the cancel button when the search input has
+// padding (and `textfield` appearance).
//
input[type="search"]::-webkit-search-cancel-button,
@@ -373,26 +369,42 @@ input[type="search"]::-webkit-search-decoration {
}
//
-// Remove inner padding and border in Firefox 4+.
+// Define consistent border, margin, and padding.
//
-button::-moz-focus-inner,
-input::-moz-focus-inner {
- border: 0;
- padding: 0;
+fieldset {
+ border: 1px solid #c0c0c0;
+ margin: 0 2px;
+ padding: 0.35em 0.625em 0.75em;
}
//
-// 1. Remove default vertical scrollbar in IE 8/9.
-// 2. Improve readability and alignment in all browsers.
+// 1. Correct `color` not being inherited in IE 8/9.
+// 2. Remove padding so people aren't caught out if they zero out fieldsets.
+//
+
+legend {
+ border: 0; // 1
+ padding: 0; // 2
+}
+
+//
+// Remove default vertical scrollbar in IE 8/9.
//
textarea {
- overflow: auto; // 1
- vertical-align: top; // 2
+ overflow: auto;
+}
+
+//
+// Don't inherit the `font-weight` (applied by a rule above).
+// NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+//
+
+optgroup {
+ font-weight: bold;
}
-// ==========================================================================
// Tables
// ==========================================================================
@@ -404,3 +416,8 @@ table {
border-collapse: collapse;
border-spacing: 0;
}
+
+td,
+th {
+ padding: 0;
+}
\ No newline at end of file
diff --git a/_assets/stylesheets/bootstrap/_pager.scss b/_assets/stylesheets/bootstrap/_pager.scss
index e067a3d..6531fe6 100644
--- a/_assets/stylesheets/bootstrap/_pager.scss
+++ b/_assets/stylesheets/bootstrap/_pager.scss
@@ -15,15 +15,15 @@
> span {
display: inline-block;
padding: 5px 14px;
- background-color: $pagination-bg;
- border: 1px solid $pagination-border;
+ background-color: $pager-bg;
+ border: 1px solid $pager-border;
border-radius: $pager-border-radius;
}
> a:hover,
> a:focus {
text-decoration: none;
- background-color: $pagination-hover-bg;
+ background-color: $pager-hover-bg;
}
}
@@ -47,7 +47,7 @@
> a:focus,
> span {
color: $pager-disabled-color;
- background-color: $pagination-bg;
+ background-color: $pager-bg;
cursor: not-allowed;
}
}
diff --git a/_assets/stylesheets/bootstrap/_pagination.scss b/_assets/stylesheets/bootstrap/_pagination.scss
index 44d4c23..44c1222 100644
--- a/_assets/stylesheets/bootstrap/_pagination.scss
+++ b/_assets/stylesheets/bootstrap/_pagination.scss
@@ -16,6 +16,7 @@
padding: $padding-base-vertical $padding-base-horizontal;
line-height: $line-height-base;
text-decoration: none;
+ color: $pagination-color;
background-color: $pagination-bg;
border: 1px solid $pagination-border;
margin-left: -1px;
@@ -39,7 +40,9 @@
> li > span {
&:hover,
&:focus {
+ color: $pagination-hover-color;
background-color: $pagination-hover-bg;
+ border-color: $pagination-hover-border;
}
}
@@ -51,7 +54,7 @@
z-index: 2;
color: $pagination-active-color;
background-color: $pagination-active-bg;
- border-color: $pagination-active-bg;
+ border-color: $pagination-active-border;
cursor: default;
}
}
@@ -64,8 +67,8 @@
> a:hover,
> a:focus {
color: $pagination-disabled-color;
- background-color: $pagination-bg;
- border-color: $pagination-border;
+ background-color: $pagination-disabled-bg;
+ border-color: $pagination-disabled-border;
cursor: not-allowed;
}
}
diff --git a/_assets/stylesheets/bootstrap/_panels.scss b/_assets/stylesheets/bootstrap/_panels.scss
index 6b0ec1f..b108936 100644
--- a/_assets/stylesheets/bootstrap/_panels.scss
+++ b/_assets/stylesheets/bootstrap/_panels.scss
@@ -14,7 +14,7 @@
// Panel contents
.panel-body {
- padding: 15px;
+ padding: $panel-body-padding;
@include clearfix();
}
@@ -27,19 +27,28 @@
.panel {
> .list-group {
margin-bottom: 0;
-
.list-group-item {
border-width: 1px 0;
-
- // Remove border radius for top one
+ border-radius: 0;
&:first-child {
- @include border-top-radius(0);
+ border-top: 0;
}
- // But keep it for the last one
&:last-child {
border-bottom: 0;
}
}
+ // Add border top radius for first one
+ &:first-child {
+ .list-group-item:first-child {
+ @include border-top-radius(($panel-border-radius - 1));
+ }
+ }
+ // Add border bottom radius for last one
+ &:last-child {
+ .list-group-item:last-child {
+ @include border-bottom-radius(($panel-border-radius - 1));
+ }
+ }
}
}
// Collapse space between when there's no additional content.
@@ -60,12 +69,46 @@
> .table-responsive > .table {
margin-bottom: 0;
}
+ // Add border top radius for first one
+ > .table:first-child,
+ > .table-responsive:first-child > .table:first-child {
+ > thead:first-child,
+ > tbody:first-child {
+ > tr:first-child {
+ td:first-child,
+ th:first-child {
+ border-top-left-radius: ($panel-border-radius - 1);
+ }
+ td:last-child,
+ th:last-child {
+ border-top-right-radius: ($panel-border-radius - 1);
+ }
+ }
+ }
+ }
+ // Add border bottom radius for last one
+ > .table:last-child,
+ > .table-responsive:last-child > .table:last-child {
+ > tbody:last-child,
+ > tfoot:last-child {
+ > tr:last-child {
+ td:first-child,
+ th:first-child {
+ border-bottom-left-radius: ($panel-border-radius - 1);
+ }
+ td:last-child,
+ th:last-child {
+ border-bottom-right-radius: ($panel-border-radius - 1);
+ }
+ }
+ }
+ }
> .panel-body + .table,
> .panel-body + .table-responsive {
border-top: 1px solid $table-border-color;
}
- > .table > tbody:first-child th,
- > .table > tbody:first-child td {
+ > .table > tbody:first-child > tr:first-child th,
+ > .table > tbody:first-child > tr:first-child td {
border-top: 0;
}
> .table-bordered,
@@ -83,7 +126,10 @@
> td:last-child {
border-right: 0;
}
-
+ &:first-child > th,
+ &:first-child > td {
+ border-top: 0;
+ }
&:last-child > th,
&:last-child > td {
border-bottom: 0;
@@ -102,14 +148,14 @@
.panel-heading {
padding: 10px 15px;
border-bottom: 1px solid transparent;
- @include border-top-radius($panel-border-radius - 1);
+ @include border-top-radius(($panel-border-radius - 1));
> .dropdown .dropdown-toggle {
color: inherit;
}
}
-// Within heading, strip any `h*` tag of it's default margins for spacing.
+// Within heading, strip any `h*` tag of its default margins for spacing.
.panel-title {
margin-top: 0;
margin-bottom: 0;
@@ -126,7 +172,7 @@
padding: 10px 15px;
background-color: $panel-footer-bg;
border-top: 1px solid $panel-inner-border;
- @include border-bottom-radius($panel-border-radius - 1);
+ @include border-bottom-radius(($panel-border-radius - 1));
}
@@ -136,6 +182,8 @@
// the help of our collapse JavaScript plugin.
.panel-group {
+ margin-bottom: $line-height-computed;
+
// Tighten up margin so it's only between panels
.panel {
margin-bottom: 0;
@@ -171,12 +219,12 @@
.panel-success {
@include panel-variant($panel-success-border, $panel-success-text, $panel-success-heading-bg, $panel-success-border);
}
+.panel-info {
+ @include panel-variant($panel-info-border, $panel-info-text, $panel-info-heading-bg, $panel-info-border);
+}
.panel-warning {
@include panel-variant($panel-warning-border, $panel-warning-text, $panel-warning-heading-bg, $panel-warning-border);
}
.panel-danger {
@include panel-variant($panel-danger-border, $panel-danger-text, $panel-danger-heading-bg, $panel-danger-border);
}
-.panel-info {
- @include panel-variant($panel-info-border, $panel-info-text, $panel-info-heading-bg, $panel-info-border);
-}
diff --git a/_assets/stylesheets/bootstrap/_print.scss b/_assets/stylesheets/bootstrap/_print.scss
index 07277a3..3655d03 100644
--- a/_assets/stylesheets/bootstrap/_print.scss
+++ b/_assets/stylesheets/bootstrap/_print.scss
@@ -50,10 +50,6 @@
max-width: 100% !important;
}
- @page {
- margin: 2cm .5cm;
- }
-
p,
h2,
h3 {
diff --git a/_assets/stylesheets/bootstrap/_responsive-utilities.scss b/_assets/stylesheets/bootstrap/_responsive-utilities.scss
index 8e65147..e6256d3 100644
--- a/_assets/stylesheets/bootstrap/_responsive-utilities.scss
+++ b/_assets/stylesheets/bootstrap/_responsive-utilities.scss
@@ -25,174 +25,56 @@
// Visibility utilities
@include responsive-invisibility('.visible-xs');
+
@media (max-width: $screen-xs-max) {
@include responsive-visibility('.visible-xs');
}
-@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- @include responsive-visibility('.visible-xs.visible-sm');
-}
-
-
-@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
- @include responsive-visibility('.visible-xs.visible-md');
-}
-
-
-@media (min-width: $screen-lg-min) {
- @include responsive-visibility('.visible-xs.visible-lg');
-}
-
-
@include responsive-invisibility('.visible-sm');
-@media (max-width: $screen-xs-max) {
- @include responsive-visibility('.visible-sm.visible-xs');
-}
-
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@include responsive-visibility('.visible-sm');
}
-@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
- @include responsive-visibility('.visible-sm.visible-md');
-}
-
-
-@media (min-width: $screen-lg-min) {
- @include responsive-visibility('.visible-sm.visible-lg');
-}
-
-
@include responsive-invisibility('.visible-md');
-@media (max-width: $screen-xs-max) {
- @include responsive-visibility('.visible-md.visible-xs');
-}
-
-
-@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- @include responsive-visibility('.visible-md.visible-sm');
-}
-
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@include responsive-visibility('.visible-md');
}
-@media (min-width: $screen-lg-min) {
- @include responsive-visibility('.visible-md.visible-lg');
-}
-
-
@include responsive-invisibility('.visible-lg');
-@media (max-width: $screen-xs-max) {
- @include responsive-visibility('.visible-lg.visible-xs');
-}
-
-
-@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- @include responsive-visibility('.visible-lg.visible-sm');
-}
-
-
-@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
- @include responsive-visibility('.visible-lg.visible-md');
-}
-
@media (min-width: $screen-lg-min) {
@include responsive-visibility('.visible-lg');
}
-@include responsive-visibility('.hidden-xs');
@media (max-width: $screen-xs-max) {
@include responsive-invisibility('.hidden-xs');
}
-@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- @include responsive-invisibility('.hidden-xs.hidden-sm');
-}
-
-
-@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
- @include responsive-invisibility('.hidden-xs.hidden-md');
-}
-
-
-@media (min-width: $screen-lg-min) {
- @include responsive-invisibility('.hidden-xs.hidden-lg');
-}
-
-
-@include responsive-visibility('.hidden-sm');
-
-@media (max-width: $screen-xs-max) {
- @include responsive-invisibility('.hidden-sm.hidden-xs');
-}
-
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
@include responsive-invisibility('.hidden-sm');
}
-@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
- @include responsive-invisibility('.hidden-sm.hidden-md');
-}
-
-
-@media (min-width: $screen-lg-min) {
- @include responsive-invisibility('.hidden-sm.hidden-lg');
-}
-
-
-@include responsive-visibility('.hidden-md');
-
-@media (max-width: $screen-xs-max) {
- @include responsive-invisibility('.hidden-md.hidden-xs');
-}
-
-
-@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- @include responsive-invisibility('.hidden-md.hidden-sm');
-}
-
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@include responsive-invisibility('.hidden-md');
}
-@media (min-width: $screen-lg-min) {
- @include responsive-invisibility('.hidden-md.hidden-lg');
-}
-
-
-@include responsive-visibility('.hidden-lg');
-
-@media (max-width: $screen-xs-max) {
- @include responsive-invisibility('.hidden-lg.hidden-xs');
-}
-
-
-@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- @include responsive-invisibility('.hidden-lg.hidden-sm');
-}
-
-
-@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
- @include responsive-invisibility('.hidden-lg.hidden-md');
-}
-
@media (min-width: $screen-lg-min) {
@include responsive-invisibility('.hidden-lg');
}
+
// Print utilities
+//
+// Media queries are placed on the inside to be mixin-friendly.
@include responsive-invisibility('.visible-print');
@media print {
-
@include responsive-visibility('.visible-print');
+}
-
+@media print {
@include responsive-invisibility('.hidden-print');
-
}
diff --git a/_assets/stylesheets/bootstrap/_scaffolding.scss b/_assets/stylesheets/bootstrap/_scaffolding.scss
index fdf13c7..cf02029 100644
--- a/_assets/stylesheets/bootstrap/_scaffolding.scss
+++ b/_assets/stylesheets/bootstrap/_scaffolding.scss
@@ -4,8 +4,13 @@
// Reset the box-sizing
-
-*,
+//
+// Heads up! This reset may cause conflicts with some third-party widgets.
+// For recommendations on resolving such conflicts, see
+// http://getbootstrap.com/getting-started/#third-box-sizing
+* {
+ @include box-sizing(border-box);
+}
*:before,
*:after {
@include box-sizing(border-box);
@@ -56,6 +61,16 @@ a {
}
+// Figures
+//
+// We reset this here because previously Normalize had no `figure` margins. This
+// ensures we don't break anyone's use of the element.
+
+figure {
+ margin: 0;
+}
+
+
// Images
img {
diff --git a/_assets/stylesheets/bootstrap/_tables.scss b/_assets/stylesheets/bootstrap/_tables.scss
index 8cd1506..1ddfb7a 100644
--- a/_assets/stylesheets/bootstrap/_tables.scss
+++ b/_assets/stylesheets/bootstrap/_tables.scss
@@ -141,6 +141,7 @@ table {
td,
th {
&[class*="col-"] {
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
float: none;
display: table-cell;
}
@@ -156,8 +157,9 @@ table {
// Generate the contextual variants
@include table-row-variant('active', $table-bg-active);
@include table-row-variant('success', $state-success-bg);
-@include table-row-variant('danger', $state-danger-bg);
+@include table-row-variant('info', $state-info-bg);
@include table-row-variant('warning', $state-warning-bg);
+@include table-row-variant('danger', $state-danger-bg);
// Responsive tables
diff --git a/_assets/stylesheets/bootstrap/_theme.scss b/_assets/stylesheets/bootstrap/_theme.scss
index 988c37c..d8f7bc2 100644
--- a/_assets/stylesheets/bootstrap/_theme.scss
+++ b/_assets/stylesheets/bootstrap/_theme.scss
@@ -3,8 +3,8 @@
// Load core variables and mixins
// --------------------------------------------------
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
+@import "variables";
+@import "mixins";
@@ -63,9 +63,9 @@
.btn-default { @include btn-styles($btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
.btn-primary { @include btn-styles($btn-primary-bg); }
.btn-success { @include btn-styles($btn-success-bg); }
+.btn-info { @include btn-styles($btn-info-bg); }
.btn-warning { @include btn-styles($btn-warning-bg); }
.btn-danger { @include btn-styles($btn-danger-bg); }
-.btn-info { @include btn-styles($btn-info-bg); }
diff --git a/_assets/stylesheets/bootstrap/_thumbnails.scss b/_assets/stylesheets/bootstrap/_thumbnails.scss
index 3d5ed86..b2f6e91 100644
--- a/_assets/stylesheets/bootstrap/_thumbnails.scss
+++ b/_assets/stylesheets/bootstrap/_thumbnails.scss
@@ -21,7 +21,10 @@
margin-right: auto;
}
- // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
+ // Add a hover state for linked versions only
+ a:hover,
+ a:focus,
+ // [converter] extracted a&.active to a.thumbnail.active
// Image captions
.caption {
@@ -30,9 +33,6 @@
}
}
-// Add a hover state for linked versions only
-a.thumbnail:hover,
-a.thumbnail:focus,
a.thumbnail.active {
border-color: $link-color;
}
diff --git a/_assets/stylesheets/bootstrap/_tooltip.scss b/_assets/stylesheets/bootstrap/_tooltip.scss
index a681adc..dec674c 100644
--- a/_assets/stylesheets/bootstrap/_tooltip.scss
+++ b/_assets/stylesheets/bootstrap/_tooltip.scss
@@ -13,7 +13,7 @@
line-height: 1.4;
@include opacity(0);
- &.in { @include opacity(.9); }
+ &.in { @include opacity($tooltip-opacity); }
&.top { margin-top: -3px; padding: $tooltip-arrow-width 0; }
&.right { margin-left: 3px; padding: 0 $tooltip-arrow-width; }
&.bottom { margin-top: 3px; padding: $tooltip-arrow-width 0; }
diff --git a/_assets/stylesheets/bootstrap/_type.scss b/_assets/stylesheets/bootstrap/_type.scss
index 979f5d0..903cbb2 100644
--- a/_assets/stylesheets/bootstrap/_type.scss
+++ b/_assets/stylesheets/bootstrap/_type.scss
@@ -21,9 +21,9 @@ h1, h2, h3, h4, h5, h6,
}
}
-h1,
-h2,
-h3 {
+h1, .h1,
+h2, .h2,
+h3, .h3 {
margin-top: $line-height-computed;
margin-bottom: ($line-height-computed / 2);
@@ -32,9 +32,9 @@ h3 {
font-size: 65%;
}
}
-h4,
-h5,
-h6 {
+h4, .h4,
+h5, .h5,
+h6, .h6 {
margin-top: ($line-height-computed / 2);
margin-bottom: ($line-height-computed / 2);
@@ -61,7 +61,7 @@ p {
.lead {
margin-bottom: $line-height-computed;
- font-size: floor($font-size-base * 1.15);
+ font-size: floor(($font-size-base * 1.15));
font-weight: 200;
line-height: 1.4;
@@ -81,45 +81,53 @@ small,
// Undo browser default styling
cite { font-style: normal; }
-// Contextual emphasis
+// Alignment
+.text-left { text-align: left; }
+.text-right { text-align: right; }
+.text-center { text-align: center; }
+.text-justify { text-align: justify; }
+
+// Contextual colors
.text-muted {
color: $text-muted;
}
.text-primary {
- color: $brand-primary;
- &:hover {
- color: darken($brand-primary, 10%);
- }
+ @include text-emphasis-variant($brand-primary);
+}
+.text-success {
+ @include text-emphasis-variant($state-success-text);
+}
+.text-info {
+ @include text-emphasis-variant($state-info-text);
}
.text-warning {
- color: $state-warning-text;
- &:hover {
- color: darken($state-warning-text, 10%);
- }
+ @include text-emphasis-variant($state-warning-text);
}
.text-danger {
- color: $state-danger-text;
- &:hover {
- color: darken($state-danger-text, 10%);
- }
+ @include text-emphasis-variant($state-danger-text);
}
-.text-success {
- color: $state-success-text;
- &:hover {
- color: darken($state-success-text, 10%);
- }
+
+// Contextual backgrounds
+// For now we'll leave these alongside the text classes until v4 when we can
+// safely shift things around (per SemVer rules).
+.bg-primary {
+ // Given the contrast here, this is the only class to have its color inverted
+ // automatically.
+ color: #fff;
+ @include bg-variant($brand-primary);
}
-.text-info {
- color: $state-info-text;
- &:hover {
- color: darken($state-info-text, 10%);
- }
+.bg-success {
+ @include bg-variant($state-success-bg);
+}
+.bg-info {
+ @include bg-variant($state-info-bg);
+}
+.bg-warning {
+ @include bg-variant($state-warning-bg);
+}
+.bg-danger {
+ @include bg-variant($state-danger-bg);
}
-
-// Alignment
-.text-left { text-align: left; }
-.text-right { text-align: right; }
-.text-center { text-align: center; }
// Page header
@@ -225,44 +233,51 @@ abbr[data-original-title] {
blockquote {
padding: ($line-height-computed / 2) $line-height-computed;
margin: 0 0 $line-height-computed;
+ font-size: ($font-size-base * 1.25);
border-left: 5px solid $blockquote-border-color;
- p {
- font-size: ($font-size-base * 1.25);
- font-weight: 300;
- line-height: 1.25;
- }
- p:last-child {
- margin-bottom: 0;
+
+ p,
+ ul,
+ ol {
+ &:last-child {
+ margin-bottom: 0;
+ }
}
+
+ // Note: Deprecated small and .small as of v3.1.0
+ // Context: https://github.com/twbs/bootstrap/issues/11660
+ footer,
small,
.small {
display: block;
+ font-size: 80%; // back to default font-size
line-height: $line-height-base;
color: $blockquote-small-color;
+
&:before {
- content: '\2014 \00A0'; // EM DASH, NBSP
+ content: '\2014 \00A0'; // em dash, nbsp
}
}
+}
- // Float right with text-align: right
- &.pull-right {
- padding-right: 15px;
- padding-left: 0;
- border-right: 5px solid $blockquote-border-color;
- border-left: 0;
- p,
- small,
- .small {
- text-align: right;
- }
- small,
- .small {
- &:before {
- content: '';
- }
- &:after {
- content: '\00A0 \2014'; // NBSP, EM DASH
- }
+// Opposite alignment of blockquote
+//
+// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.
+.blockquote-reverse,
+blockquote.pull-right {
+ padding-right: 15px;
+ padding-left: 0;
+ border-right: 5px solid $blockquote-border-color;
+ border-left: 0;
+ text-align: right;
+
+ // Account for citation
+ footer,
+ small,
+ .small {
+ &:before { content: ''; }
+ &:after {
+ content: '\00A0 \2014'; // nbsp, em dash
}
}
}
diff --git a/_assets/stylesheets/bootstrap/_variables.scss b/_assets/stylesheets/bootstrap/_variables.scss
index 5b477e9..b767e2e 100644
--- a/_assets/stylesheets/bootstrap/_variables.scss
+++ b/_assets/stylesheets/bootstrap/_variables.scss
@@ -1,15 +1,15 @@
-// bootstrap specific variable. set to false if not using ruby + asset pipeline / compass.
-$bootstrap-sass-asset-helper: true !default;
+// a flag to toggle asset pipeline / compass integration
+// defaults to true if twbs-font-path function is present (no function => twbs-font-path('') parsed as string == right side)
+// in Sass 3.3 this can be improved with: function-exists(twbs-font-path)
+$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
//
// Variables
// --------------------------------------------------
-// Global values
-// --------------------------------------------------
-
-// Grays
-// -------------------------
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
$gray-darker: lighten(#000, 13.5%) !default; // #222
$gray-dark: lighten(#000, 20%) !default; // #333
@@ -17,107 +17,127 @@ $gray: lighten(#000, 33.5%) !default; // #555
$gray-light: lighten(#000, 60%) !default; // #999
$gray-lighter: lighten(#000, 93.5%) !default; // #eee
-// Brand colors
-// -------------------------
-
$brand-primary: #428bca !default;
$brand-success: #5cb85c !default;
+$brand-info: #5bc0de !default;
$brand-warning: #f0ad4e !default;
$brand-danger: #d9534f !default;
-$brand-info: #5bc0de !default;
-// Scaffolding
-// -------------------------
+//== Scaffolding
+//
+// ## Settings for some of the most global styles.
+
+//** Background color for ``.
$body-bg: #fff !default;
+//** Global text color on ``.
$text-color: $gray-dark !default;
-// Links
-// -------------------------
-
+//** Global textual link color.
$link-color: $brand-primary !default;
+//** Link hover color set via `darken()` function.
$link-hover-color: darken($link-color, 15%) !default;
-// Typography
-// -------------------------
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
+//** Default monospace fonts for `
`, ``, and ``.
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
$font-family-base: $font-family-sans-serif !default;
$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
+$font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px
+$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px
-$font-size-h1: floor($font-size-base * 2.6) !default; // ~36px
-$font-size-h2: floor($font-size-base * 2.15) !default; // ~30px
-$font-size-h3: ceil($font-size-base * 1.7) !default; // ~24px
-$font-size-h4: ceil($font-size-base * 1.25) !default; // ~18px
+$font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px
+$font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px
+$font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px
+$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px
$font-size-h5: $font-size-base !default;
-$font-size-h6: ceil($font-size-base * 0.85) !default; // ~12px
+$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px
+//** Unit-less `line-height` for use in components like buttons.
$line-height-base: 1.428571429 !default; // 20/14
-$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px
-$headings-font-family: $font-family-base !default;
+//** By default, this inherits from the ``.
+$headings-font-family: inherit !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
$headings-color: inherit !default;
-// Iconography
-// -------------------------
+//-- Iconography
+//
+//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
$icon-font-path: "bootstrap/" !default;
$icon-font-name: "glyphicons-halflings-regular" !default;
+$icon-font-svg-id: "glyphicons_halflingsregular" !default;
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-// Components
-// -------------------------
-// Based on 14px font-size and 1.428 line-height (~20px to start)
+$padding-base-vertical: 6px !default;
+$padding-base-horizontal: 12px !default;
-$padding-base-vertical: 6px !default;
-$padding-base-horizontal: 12px !default;
+$padding-large-vertical: 10px !default;
+$padding-large-horizontal: 16px !default;
-$padding-large-vertical: 10px !default;
-$padding-large-horizontal: 16px !default;
+$padding-small-vertical: 5px !default;
+$padding-small-horizontal: 10px !default;
-$padding-small-vertical: 5px !default;
-$padding-small-horizontal: 10px !default;
+$padding-xs-vertical: 1px !default;
+$padding-xs-horizontal: 5px !default;
-$padding-xs-vertical: 1px !default;
-$padding-xs-horizontal: 5px !default;
+$line-height-large: 1.33 !default;
+$line-height-small: 1.5 !default;
-$line-height-large: 1.33 !default;
-$line-height-small: 1.5 !default;
+$border-radius-base: 4px !default;
+$border-radius-large: 6px !default;
+$border-radius-small: 3px !default;
-$border-radius-base: 4px !default;
-$border-radius-large: 6px !default;
-$border-radius-small: 3px !default;
+//** Global color for active items (e.g., navs or dropdowns).
+$component-active-color: #fff !default;
+//** Global background color for active items (e.g., navs or dropdowns).
+$component-active-bg: $brand-primary !default;
-$component-active-color: #fff !default;
-$component-active-bg: $brand-primary !default;
+//** Width of the `border` for generating carets that indicator dropdowns.
+$caret-width-base: 4px !default;
+//** Carets increase slightly in size for larger components.
+$caret-width-large: 5px !default;
-$caret-width-base: 4px !default;
-$caret-width-large: 5px !default;
-// Tables
-// -------------------------
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
-$table-cell-padding: 8px !default;
-$table-condensed-cell-padding: 5px !default;
+//** Padding for ``s and ` `s.
+$table-cell-padding: 8px !default;
+//** Padding for cells in `.table-condensed`.
+$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;
+//** Default background color used for all tables.
+$table-bg: transparent !default;
+//** Background color used for `.table-striped`.
+$table-bg-accent: #f9f9f9 !default;
+//** Background color used for `.table-hover`.
+$table-bg-hover: #f5f5f5 !default;
+$table-bg-active: $table-bg-hover !default;
-$table-border-color: #ddd !default; // table and cell border
+//** Border color for table and cell borders.
+$table-border-color: #ddd !default;
-// Buttons
-// -------------------------
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
$btn-font-weight: normal !default;
@@ -133,6 +153,10 @@ $btn-success-color: #fff !default;
$btn-success-bg: $brand-success !default;
$btn-success-border: darken($btn-success-bg, 5%) !default;
+$btn-info-color: #fff !default;
+$btn-info-bg: $brand-info !default;
+$btn-info-border: darken($btn-info-bg, 5%) !default;
+
$btn-warning-color: #fff !default;
$btn-warning-bg: $brand-warning !default;
$btn-warning-border: darken($btn-warning-bg, 5%) !default;
@@ -141,65 +165,87 @@ $btn-danger-color: #fff !default;
$btn-danger-bg: $brand-danger !default;
$btn-danger-border: darken($btn-danger-bg, 5%) !default;
-$btn-info-color: #fff !default;
-$btn-info-bg: $brand-info !default;
-$btn-info-border: darken($btn-info-bg, 5%) !default;
-
$btn-link-disabled-color: $gray-light !default;
-// Forms
-// -------------------------
+//== Forms
+//
+//##
+//** `