summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap-sass-official/assets/stylesheets
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.co>2015-06-16 21:40:15 -0400
committerThomas Park <thomas@thomaspark.co>2015-06-16 21:40:15 -0400
commitea56c37ca9674f0155448699918650bbfcfbb888 (patch)
tree12b2d28dc05b533adb55e0ff344c41df36d51301 /bower_components/bootstrap-sass-official/assets/stylesheets
parent06885df3cfbb7d498f59dc5ac61a4cc1cc4f6dc2 (diff)
update bootstrap to 3.3.5
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/stylesheets')
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/_bootstrap.scss6
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_button-groups.scss5
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss18
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss59
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss20
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_input-groups.scss1
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss8
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_list-group.scss12
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss5
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_mixins.scss1
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_normalize.scss19
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_pagination.scss5
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss6
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss12
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_print.scss6
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss6
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_scaffolding.scss3
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss28
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss9
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss8
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss3
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss20
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss5
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss3
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_reset-text.scss18
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss3
33 files changed, 217 insertions, 94 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/_bootstrap.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/_bootstrap.scss
index 65204aad..598b007f 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/_bootstrap.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/_bootstrap.scss
@@ -1,3 +1,9 @@
+/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
// Core variables and mixins
@import "bootstrap/variables";
@import "bootstrap/mixins";
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss
index 832a5d85..70002e08 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss
@@ -12,7 +12,7 @@
font-weight: $badge-font-weight;
color: $badge-color;
line-height: $badge-line-height;
- vertical-align: baseline;
+ vertical-align: middle;
white-space: nowrap;
text-align: center;
background-color: $badge-bg;
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_button-groups.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_button-groups.scss
index a73bc54d..43d235c4 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_button-groups.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_button-groups.scss
@@ -36,6 +36,7 @@
margin-left: -5px; // Offset the first child's margin
@include clearfix;
+ .btn,
.btn-group,
.input-group {
float: left;
@@ -172,11 +173,11 @@
border-radius: 0;
}
&:first-child:not(:last-child) {
- border-top-right-radius: $border-radius-base;
+ border-top-right-radius: $btn-border-radius-base;
@include border-bottom-radius(0);
}
&:last-child:not(:first-child) {
- border-bottom-left-radius: $border-radius-base;
+ border-bottom-left-radius: $btn-border-radius-base;
@include border-top-radius(0);
}
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss
index 7f0db458..6452b709 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_buttons.scss
@@ -17,7 +17,7 @@
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid transparent;
white-space: nowrap;
- @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
+ @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
@include user-select(none);
&,
@@ -47,10 +47,18 @@
&[disabled],
fieldset[disabled] & {
cursor: $cursor-disabled;
- pointer-events: none; // Future-proof disabling of clicks
@include opacity(.65);
@include box-shadow(none);
}
+
+ // [converter] extracted a& to a.btn
+}
+
+a.btn {
+ &.disabled,
+ fieldset[disabled] & {
+ pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
+ }
}
@@ -126,14 +134,14 @@
.btn-lg {
// line-height: ensure even-numbered height of button next to large input
- @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
+ @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $btn-border-radius-large);
}
.btn-sm {
// line-height: ensure proper height of button next to small input
- @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
+ @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small);
}
.btn-xs {
- @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
+ @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small);
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss
index f91d7ee3..f7006780 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_carousel.scss
@@ -29,7 +29,7 @@
@media all and (transform-3d), (-webkit-transform-3d) {
@include transition-transform(0.6s ease-in-out);
@include backface-visibility(hidden);
- @include perspective(1000);
+ @include perspective(1000px);
&.next,
&.active.right {
@@ -130,6 +130,7 @@
.glyphicon-chevron-right {
position: absolute;
top: 50%;
+ margin-top: -10px;
z-index: 5;
display: inline-block;
}
@@ -147,7 +148,6 @@
.icon-next {
width: 20px;
height: 20px;
- margin-top: -10px;
line-height: 1;
font-family: serif;
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss
index ce83199b..aac84597 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss
@@ -11,6 +11,7 @@
margin-left: 2px;
vertical-align: middle;
border-top: $caret-width-base dashed;
+ border-top: $caret-width-base solid \9; // IE8
border-right: $caret-width-base solid transparent;
border-left: $caret-width-base solid transparent;
}
@@ -184,7 +185,8 @@
// Reverse the caret
.caret {
border-top: 0;
- border-bottom: $caret-width-base solid;
+ border-bottom: $caret-width-base dashed;
+ border-bottom: $caret-width-base solid \9; // IE8
content: "";
}
// Different positioning for bottom up menu
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss
index cfd420c4..de4befdb 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss
@@ -56,7 +56,6 @@ input[type="checkbox"] {
line-height: normal;
}
-// Set the height of file controls to match text inputs
input[type="file"] {
display: block;
}
@@ -177,13 +176,17 @@ input[type="search"] {
// text within the input to become vertically misaligned. As a workaround, we
// set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
+//
+// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
@media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
- line-height: $input-height-base;
+ &.form-control {
+ line-height: $input-height-base;
+ }
&.input-sm,
.input-group-sm & {
@@ -321,29 +324,53 @@ input[type="checkbox"] {
@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
.form-group-sm {
-
- @include input-size('.form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
-
- .form-control-static {
+ .form-control {
height: $input-height-small;
padding: $padding-small-vertical $padding-small-horizontal;
font-size: $font-size-small;
line-height: $line-height-small;
+ border-radius: $input-border-radius-small;
+ }
+ select.form-control {
+ height: $input-height-small;
+ line-height: $input-height-small;
+ }
+ textarea.form-control,
+ select[multiple].form-control {
+ height: auto;
+ }
+ .form-control-static {
+ height: $input-height-small;
min-height: ($line-height-computed + $font-size-small);
+ padding: ($padding-small-vertical + 1) $padding-small-horizontal;
+ font-size: $font-size-small;
+ line-height: $line-height-small;
}
}
@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
.form-group-lg {
-
- @include input-size('.form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
-
- .form-control-static {
+ .form-control {
height: $input-height-large;
padding: $padding-large-vertical $padding-large-horizontal;
font-size: $font-size-large;
line-height: $line-height-large;
+ border-radius: $input-border-radius-large;
+ }
+ select.form-control {
+ height: $input-height-large;
+ line-height: $input-height-large;
+ }
+ textarea.form-control,
+ select[multiple].form-control {
+ height: auto;
+ }
+ .form-control-static {
+ height: $input-height-large;
min-height: ($line-height-computed + $font-size-large);
+ padding: ($padding-large-vertical + 1) $padding-large-horizontal;
+ font-size: $font-size-large;
+ line-height: $line-height-large;
}
}
@@ -374,12 +401,16 @@ input[type="checkbox"] {
text-align: center;
pointer-events: none;
}
-.input-lg + .form-control-feedback {
+.input-lg + .form-control-feedback,
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback {
width: $input-height-large;
height: $input-height-large;
line-height: $input-height-large;
}
-.input-sm + .form-control-feedback {
+.input-sm + .form-control-feedback,
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback {
width: $input-height-small;
height: $input-height-small;
line-height: $input-height-small;
@@ -554,7 +585,7 @@ input[type="checkbox"] {
// Reposition the icon because it's now within a grid column and columns have
// `position: relative;` on them. Also accounts for the grid gutter padding.
.has-feedback .form-control-feedback {
- right: ($grid-gutter-width / 2);
+ right: floor(($grid-gutter-width / 2));
}
// Form group sizes
@@ -565,6 +596,7 @@ input[type="checkbox"] {
@media (min-width: $screen-sm-min) {
.control-label {
padding-top: (($padding-large-vertical * $line-height-large) + 1);
+ font-size: $font-size-large;
}
}
}
@@ -572,6 +604,7 @@ input[type="checkbox"] {
@media (min-width: $screen-sm-min) {
.control-label {
padding-top: ($padding-small-vertical + 1);
+ font-size: $font-size-small;
}
}
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss
index a2f2846d..385340b5 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss
@@ -7,15 +7,17 @@
//
// <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
-// Import the fonts
-@font-face {
- font-family: 'Glyphicons Halflings';
- src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
- src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
- url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'),
- url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
- url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
- url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
+@at-root {
+ // Import the fonts
+ @font-face {
+ font-family: 'Glyphicons Halflings';
+ src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
+ src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'),
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
+ }
}
// Catchall baseclass
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_input-groups.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_input-groups.scss
index ae0e921b..12f0c428 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_input-groups.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_input-groups.scss
@@ -160,6 +160,7 @@
&:last-child {
> .btn,
> .btn-group {
+ z-index: 2;
margin-left: -1px;
}
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss
index b4d4aac7..439d23de 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss
@@ -4,7 +4,8 @@
.jumbotron {
- padding: $jumbotron-padding ($jumbotron-padding / 2);
+ padding-top: $jumbotron-padding;
+ padding-bottom: $jumbotron-padding;
margin-bottom: $jumbotron-padding;
color: $jumbotron-color;
background-color: $jumbotron-bg;
@@ -34,7 +35,8 @@
}
@media screen and (min-width: $screen-sm-min) {
- padding: ($jumbotron-padding * 1.6) 0;
+ padding-top: ($jumbotron-padding * 1.6);
+ padding-bottom: ($jumbotron-padding * 1.6);
.container &,
.container-fluid & {
@@ -44,7 +46,7 @@
h1,
.h1 {
- font-size: ($font-size-base * 4.5);
+ font-size: $jumbotron-heading-font-size;
}
}
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_list-group.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_list-group.scss
index 26b23ff8..7cb83aab 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_list-group.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_list-group.scss
@@ -38,12 +38,13 @@
}
-// Linked list items
+// Interactive list items
//
-// Use anchor elements instead of `li`s or `div`s to create linked list items.
+// Use anchor or button elements instead of `li`s or `div`s to create interactive items.
// Includes an extra `.active` modifier class for showing selected items.
-a.list-group-item {
+a.list-group-item,
+button.list-group-item {
color: $list-group-link-color;
.list-group-item-heading {
@@ -59,6 +60,11 @@ a.list-group-item {
}
}
+button.list-group-item {
+ width: 100%;
+ text-align: left;
+}
+
.list-group-item {
// Disabled state
&.disabled,
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss
index a6bf7819..8c835e86 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_media.scss
@@ -19,6 +19,11 @@
.media-object {
display: block;
+
+ // Fix collapse in webkit from max-width: 100% and display: table-cell.
+ &.img-thumbnail {
+ max-width: none;
+ }
}
.media-right,
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_mixins.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_mixins.scss
index b565f013..78cd5aa0 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_mixins.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_mixins.scss
@@ -11,6 +11,7 @@
@import "mixins/responsive-visibility";
@import "mixins/size";
@import "mixins/tab-focus";
+@import "mixins/reset-text";
@import "mixins/text-emphasis";
@import "mixins/text-overflow";
@import "mixins/vendor-prefixes";
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_normalize.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_normalize.scss
index 62a085a4..9dddf73a 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_normalize.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_normalize.scss
@@ -1,9 +1,9 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
//
// 1. Set default font family to sans-serif.
-// 2. Prevent iOS text size adjust after orientation change, without disabling
-// user zoom.
+// 2. Prevent iOS and IE text size adjust after device orientation change,
+// without disabling user zoom.
//
html {
@@ -71,7 +71,7 @@ audio:not([controls]) {
//
// Address `[hidden]` styling not present in IE 8/9/10.
-// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+// Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
//
[hidden],
@@ -91,7 +91,8 @@ a {
}
//
-// Improve readability when focused and also mouse hovered in all browsers.
+// Improve readability of focused elements when they are also in an
+// active/hover state.
//
a:active,
@@ -209,7 +210,6 @@ figure {
//
hr {
- -moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
@@ -350,15 +350,12 @@ input[type="number"]::-webkit-outer-spin-button {
//
// 1. Address `appearance` set to `searchfield` in Safari and Chrome.
-// 2. Address `box-sizing` set to `border-box` in Safari and Chrome
-// (include `-moz` to future-proof).
+// 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
//
input[type="search"] {
-webkit-appearance: textfield; // 1
- -moz-box-sizing: content-box;
- -webkit-box-sizing: content-box; // 2
- box-sizing: content-box;
+ box-sizing: content-box; //2
}
//
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_pagination.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_pagination.scss
index 323ec727..fb23f913 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_pagination.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_pagination.scss
@@ -40,6 +40,7 @@
> li > span {
&:hover,
&:focus {
+ z-index: 3;
color: $pagination-hover-color;
background-color: $pagination-hover-bg;
border-color: $pagination-hover-border;
@@ -79,10 +80,10 @@
// Large
.pagination-lg {
- @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $border-radius-large);
+ @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
}
// Small
.pagination-sm {
- @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $border-radius-small);
+ @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss
index 84847b47..be9410f5 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_panels.scss
@@ -76,6 +76,7 @@
@include border-top-radius(($panel-border-radius - 1));
}
}
+
// Add border bottom radius for last one
&:last-child {
.list-group-item:last-child {
@@ -84,6 +85,11 @@
}
}
}
+ > .panel-heading + .panel-collapse > .list-group {
+ .list-group-item:first-child {
+ @include border-top-radius(0);
+ }
+ }
}
// Collapse space between when there's no additional content.
.panel-heading + .list-group {
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss
index 699c7b8d..9b90a2e9 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_popovers.scss
@@ -11,12 +11,11 @@
display: none;
max-width: $popover-max-width;
padding: 1px;
- // Reset font and text properties given new insertion method
- font-family: $font-family-base;
+ // Our parent element can be arbitrary since popovers are by default inserted as a sibling of their target element.
+ // So reset our font and text properties to avoid inheriting weird values.
+ @include reset-text;
font-size: $font-size-base;
- font-weight: normal;
- line-height: $line-height-base;
- text-align: left;
+
background-color: $popover-bg;
background-clip: padding-box;
border: 1px solid $popover-fallback-border-color;
@@ -24,9 +23,6 @@
border-radius: $border-radius-large;
@include box-shadow(0 5px 10px rgba(0,0,0,.2));
- // Overrides for proper insertion
- white-space: normal;
-
// Offset the popover to account for the popover arrow
&.top { margin-top: -$popover-arrow-width; }
&.right { margin-left: $popover-arrow-width; }
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_print.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_print.scss
index 94ca58f1..66e54ab4 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_print.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_print.scss
@@ -67,12 +67,6 @@
}
// Bootstrap specific changes start
- //
- // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
- // Once fixed, we can just straight up remove this.
- select {
- background: #fff !important;
- }
// Bootstrap components
.navbar {
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss
index 8d02aaa3..f3f0c839 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-utilities.scss
@@ -18,8 +18,10 @@
// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
-@-ms-viewport {
- width: device-width;
+@at-root {
+ @-ms-viewport {
+ width: device-width;
+ }
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_scaffolding.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_scaffolding.scss
index 2632c33c..83adb5dd 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_scaffolding.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_scaffolding.scss
@@ -155,8 +155,7 @@ hr {
// Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
// for traditionally non-focusable elements with role="button"
// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
-// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged
[role="button"] {
cursor: pointer;
-} \ No newline at end of file
+}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss
index ed106a4f..df571ea7 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_theme.scss
@@ -1,3 +1,8 @@
+/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
//
// Load core variables and mixins
@@ -28,6 +33,12 @@
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
}
+ &.disabled,
+ &[disabled],
+ fieldset[disabled] & {
+ @include box-shadow(none);
+ }
+
.badge {
text-shadow: none;
}
@@ -53,10 +64,17 @@
}
&.disabled,
- &:disabled,
- &[disabled] {
- background-color: darken($btn-color, 12%);
- background-image: none;
+ &[disabled],
+ fieldset[disabled] & {
+ &,
+ &:hover,
+ &:focus,
+ &.focus,
+ &:active,
+ &.active {
+ background-color: darken($btn-color, 12%);
+ background-image: none;
+ }
}
}
@@ -132,7 +150,7 @@
.navbar-inverse {
@include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
-
+ border-radius: $navbar-border-radius;
.navbar-nav > .open > a,
.navbar-nav > .active > a {
@include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss
index 93792787..f0c16582 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss
@@ -8,11 +8,11 @@
position: absolute;
z-index: $zindex-tooltip;
display: block;
- // Reset font and text properties given new insertion method
- font-family: $font-family-base;
+ // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
+ // So reset our font and text properties to avoid inheriting weird values.
+ @include reset-text;
font-size: $font-size-small;
- font-weight: normal;
- line-height: 1.4;
+
@include opacity(0);
&.in { @include opacity($tooltip-opacity); }
@@ -28,7 +28,6 @@
padding: 3px 8px;
color: $tooltip-color;
text-align: center;
- text-decoration: none;
background-color: $tooltip-bg;
border-radius: $border-radius-base;
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss
index f68ac03e..bf9373b9 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss
@@ -175,6 +175,11 @@ $btn-danger-border: darken($btn-danger-bg, 5%) !default;
$btn-link-disabled-color: $gray-light !default;
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius-base: $border-radius-base !default;
+$btn-border-radius-large: $border-radius-large !default;
+$btn-border-radius-small: $border-radius-small !default;
+
//== Forms
//
@@ -388,7 +393,7 @@ $navbar-default-toggle-icon-bar-bg: #888 !default;
$navbar-default-toggle-border-color: #ddd !default;
-// Inverted navbar
+//=== Inverted navbar
// Reset inverted navbar basics
$navbar-inverse-color: lighten($gray-light, 15%) !default;
$navbar-inverse-bg: #222 !default;
@@ -489,6 +494,7 @@ $jumbotron-color: inherit !default;
$jumbotron-bg: $gray-lighter !default;
$jumbotron-heading-color: inherit !default;
$jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
+$jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default;
//== Form states and alerts
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss
index 4993bd2b..4c7769e1 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_background-variant.scss
@@ -5,7 +5,8 @@
#{$parent} {
background-color: $color;
}
- a#{$parent}:hover {
+ a#{$parent}:hover,
+ a#{$parent}:focus {
background-color: darken($color, 10%);
}
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss
index 74a4ffc5..ad311873 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_buttons.scss
@@ -8,15 +8,31 @@
background-color: $background;
border-color: $border;
- &:hover,
&:focus,
- &.focus,
+ &.focus {
+ color: $color;
+ background-color: darken($background, 10%);
+ border-color: darken($border, 25%);
+ }
+ &:hover {
+ color: $color;
+ background-color: darken($background, 10%);
+ border-color: darken($border, 12%);
+ }
&:active,
&.active,
.open > &.dropdown-toggle {
color: $color;
background-color: darken($background, 10%);
border-color: darken($border, 12%);
+
+ &:hover,
+ &:focus,
+ &.focus {
+ color: $color;
+ background-color: darken($background, 17%);
+ border-color: darken($border, 25%);
+ }
}
&:active,
&.active,
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
index fb28cb47..16d038c0 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
@@ -13,8 +13,8 @@
// Prevent columns from collapsing when empty
min-height: 1px;
// Inner gutter via padding
- padding-left: ($grid-gutter-width / 2);
- padding-right: ($grid-gutter-width / 2);
+ padding-left: ceil(($grid-gutter-width / 2));
+ padding-right: floor(($grid-gutter-width / 2));
}
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss
index ae164338..0820258c 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_grid.scss
@@ -13,8 +13,8 @@
// Creates a wrapper for a series of columns
@mixin make-row($gutter: $grid-gutter-width) {
- margin-left: ($gutter / -2);
- margin-right: ($gutter / -2);
+ margin-left: ceil(($gutter / -2));
+ margin-right: floor(($gutter / -2));
@include clearfix;
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss
index c59d7361..cd17cba6 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_hide-text.scss
@@ -1,6 +1,6 @@
// CSS image replacement
//
-// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
+// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
// mixins being reused as classes with the same name, this doesn't hold up. As
// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
//
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss
index 5f05e7ba..c478eeb3 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_list-group.scss
@@ -5,10 +5,11 @@
color: $color;
background-color: $background;
- // [converter] extracted a& to a.list-group-item-#{$state}
+ // [converter] extracted a&, button& to a.list-group-item-#{$state}, button.list-group-item-#{$state}
}
- a.list-group-item-#{$state} {
+ a.list-group-item-#{$state},
+ button.list-group-item-#{$state} {
color: $color;
.list-group-item-heading {
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss
index 43fff686..d4a5404f 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_pagination.scss
@@ -1,11 +1,12 @@
// Pagination
-@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
+@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
> li {
> a,
> span {
padding: $padding-vertical $padding-horizontal;
font-size: $font-size;
+ line-height: $line-height;
}
&:first-child {
> a,
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_reset-text.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_reset-text.scss
new file mode 100644
index 00000000..c9c28417
--- /dev/null
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_reset-text.scss
@@ -0,0 +1,18 @@
+@mixin reset-text() {
+ font-family: $font-family-base;
+ // We deliberately do NOT reset font-size.
+ font-style: normal;
+ font-weight: normal;
+ letter-spacing: normal;
+ line-break: auto;
+ line-height: $line-height-base;
+ text-align: left; // Fallback for where `start` is not supported
+ text-align: start;
+ text-decoration: none;
+ text-shadow: none;
+ text-transform: none;
+ white-space: normal;
+ word-break: normal;
+ word-spacing: normal;
+ word-wrap: normal;
+}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
index 9867db01..cbdf7772 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
@@ -7,7 +7,7 @@
#{$parent} {
display: block !important;
}
- table#{$parent} { display: table; }
+ table#{$parent} { display: table !important; }
tr#{$parent} { display: table-row !important; }
th#{$parent},
td#{$parent} { display: table-cell !important; }
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
index 1101e036..3b446c41 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
@@ -5,7 +5,8 @@
#{$parent} {
color: $color;
}
- a#{$parent}:hover {
+ a#{$parent}:hover,
+ a#{$parent}:focus {
color: darken($color, 10%);
}
}