summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2015-03-17 14:23:20 -0400
committerThomas Park <thomas@thomaspark.me>2015-03-17 14:23:20 -0400
commit66e5c761eea0ce48fcf72844f043db4bcb43c6d9 (patch)
treee394156c0683a60f4cf7d8213fb0bbbf32001ae4 /bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap
parent93738d763fd08637ccfd3ab322176b70f099d309 (diff)
update bootstrap 3.3.4
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap')
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss11
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_component-animations.scss3
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss12
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_modals.scss4
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss1
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navs.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-embed.scss16
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_scaffolding.scss12
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss1
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_type.scss2
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_utilities.scss1
-rw-r--r--bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss6
16 files changed, 54 insertions, 29 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss
index 372eec97..7d1e1fdd 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_alerts.scss
@@ -18,7 +18,7 @@
// Specified for the h4 to prevent conflicts of changing $headings-color
color: inherit;
}
-
+
// Provide class for links that match alerts
.alert-link {
font-weight: $alert-link-font-weight;
@@ -29,7 +29,7 @@
> ul {
margin-bottom: 0;
}
-
+
> p + p {
margin-top: 5px;
}
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 a647592d..832a5d85 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_badges.scss
@@ -28,8 +28,9 @@
position: relative;
top: -1px;
}
-
- .btn-xs & {
+
+ .btn-xs &,
+ .btn-group-xs > .btn & {
top: 0;
padding: 1px 5px;
}
@@ -42,15 +43,15 @@
color: $badge-active-color;
background-color: $badge-active-bg;
}
-
+
.list-group-item > & {
float: right;
}
-
+
.list-group-item > & + & {
margin-right: 5px;
}
-
+
.nav-pills > li > a > & {
margin-left: 3px;
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_component-animations.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_component-animations.scss
index 1f76b8c0..ca3b43ca 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_component-animations.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_component-animations.scss
@@ -17,9 +17,8 @@
.collapse {
display: none;
- visibility: hidden;
- &.in { display: block; visibility: visible; }
+ &.in { display: block; }
// [converter] extracted tr&.in to tr.collapse.in
// [converter] extracted tbody&.in to tbody.collapse.in
}
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 b8120b8e..ce83199b 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_dropdowns.scss
@@ -10,7 +10,7 @@
height: 0;
margin-left: 2px;
vertical-align: middle;
- border-top: $caret-width-base solid;
+ border-top: $caret-width-base dashed;
border-right: $caret-width-base solid transparent;
border-left: $caret-width-base solid transparent;
}
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 72d130b7..cfd420c4 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss
@@ -141,11 +141,15 @@ output {
&[disabled],
&[readonly],
fieldset[disabled] & {
- cursor: $cursor-disabled;
background-color: $input-bg-disabled;
opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
}
+ &[disabled],
+ fieldset[disabled] & {
+ cursor: $cursor-disabled;
+ }
+
// [converter] extracted textarea& to textarea.form-control
}
@@ -200,7 +204,7 @@ input[type="search"] {
// horizontal forms, use the predefined grid classes.
.form-group {
- margin-bottom: 15px;
+ margin-bottom: $form-group-margin-bottom;
}
@@ -240,6 +244,7 @@ input[type="search"] {
// Radios and checkboxes on same line
.radio-inline,
.checkbox-inline {
+ position: relative;
display: inline-block;
padding-left: 20px;
margin-bottom: 0;
@@ -296,6 +301,7 @@ input[type="checkbox"] {
padding-bottom: ($padding-base-vertical + 1);
// Remove default margin from `p`
margin-bottom: 0;
+ min-height: ($line-height-computed + $font-size-base);
&.input-lg,
&.input-sm {
@@ -323,6 +329,7 @@ input[type="checkbox"] {
padding: $padding-small-vertical $padding-small-horizontal;
font-size: $font-size-small;
line-height: $line-height-small;
+ min-height: ($line-height-computed + $font-size-small);
}
}
@@ -336,6 +343,7 @@ input[type="checkbox"] {
padding: $padding-large-vertical $padding-large-horizontal;
font-size: $font-size-large;
line-height: $line-height-large;
+ min-height: ($line-height-computed + $font-size-large);
}
}
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 dc95ed7d..a2f2846d 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_glyphicons.scss
@@ -266,8 +266,12 @@
.glyphicon-piggy-bank { &:before { content: "\e225"; } }
.glyphicon-scissors { &:before { content: "\e226"; } }
.glyphicon-bitcoin { &:before { content: "\e227"; } }
+.glyphicon-btc { &:before { content: "\e227"; } }
+.glyphicon-xbt { &:before { content: "\e227"; } }
.glyphicon-yen { &:before { content: "\00a5"; } }
+.glyphicon-jpy { &:before { content: "\00a5"; } }
.glyphicon-ruble { &:before { content: "\20bd"; } }
+.glyphicon-rub { &:before { content: "\20bd"; } }
.glyphicon-scale { &:before { content: "\e230"; } }
.glyphicon-ice-lolly { &:before { content: "\e231"; } }
.glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } }
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 e326b327..b4d4aac7 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_jumbotron.scss
@@ -13,7 +13,7 @@
.h1 {
color: $jumbotron-heading-color;
}
-
+
p {
margin-bottom: ($jumbotron-padding / 2);
font-size: $jumbotron-font-size;
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_modals.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_modals.scss
index 2fd097ca..837558e9 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_modals.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_modals.scss
@@ -62,10 +62,12 @@
// Modal background
.modal-backdrop {
- position: absolute;
+ position: fixed;
top: 0;
right: 0;
+ bottom: 0;
left: 0;
+ z-index: $zindex-modal-background;
background-color: $modal-backdrop-bg;
// Fade for backdrop
&.fade { @include opacity(0); }
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss
index ed36a993..11e5c01c 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navbar.scss
@@ -67,7 +67,6 @@
&.collapse {
display: block !important;
- visibility: visible !important;
height: auto !important;
padding-bottom: 0; // Override default setting
overflow: visible !important;
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navs.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navs.scss
index ce0b9178..9d369f30 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navs.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_navs.scss
@@ -223,11 +223,9 @@
.tab-content {
> .tab-pane {
display: none;
- visibility: hidden;
}
> .active {
display: block;
- visibility: visible;
}
}
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-embed.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-embed.scss
index c1fa8f84..080a5118 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-embed.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_responsive-embed.scss
@@ -22,14 +22,14 @@
width: 100%;
border: 0;
}
+}
- // Modifier class for 16:9 aspect ratio
- &.embed-responsive-16by9 {
- padding-bottom: 56.25%;
- }
+// Modifier class for 16:9 aspect ratio
+.embed-responsive-16by9 {
+ padding-bottom: 56.25%;
+}
- // Modifier class for 4:3 aspect ratio
- &.embed-responsive-4by3 {
- padding-bottom: 75%;
- }
+// Modifier class for 4:3 aspect ratio
+.embed-responsive-4by3 {
+ padding-bottom: 75%;
}
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 626e5eba..2632c33c 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_scaffolding.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_scaffolding.scss
@@ -148,3 +148,15 @@ hr {
clip: auto;
}
}
+
+
+// iOS "clickable elements" fix for role="button"
+//
+// 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/_tooltip.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss
index 6004f598..93792787 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_tooltip.scss
@@ -8,7 +8,6 @@
position: absolute;
z-index: $zindex-tooltip;
display: block;
- visibility: visible;
// Reset font and text properties given new insertion method
font-family: $font-family-base;
font-size: $font-size-small;
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_type.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_type.scss
index 62d685cf..a39a6158 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_type.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_type.scss
@@ -234,7 +234,7 @@ abbr[data-original-title] {
}
.initialism {
font-size: 90%;
- text-transform: uppercase;
+ @extend .text-uppercase;
}
// Blockquotes
diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_utilities.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_utilities.scss
index 386c5240..8c99c716 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_utilities.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_utilities.scss
@@ -44,7 +44,6 @@
.hidden {
display: none !important;
- visibility: hidden !important;
}
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 578b7b69..f68ac03e 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss
@@ -212,6 +212,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
//** Small `.form-control` height
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
+//** `.form-group` margin
+$form-group-margin-bottom: 15px !default;
+
$legend-color: $gray-dark !default;
$legend-border-color: #e5e5e5 !default;
@@ -271,7 +274,8 @@ $zindex-dropdown: 1000 !default;
$zindex-popover: 1060 !default;
$zindex-tooltip: 1070 !default;
$zindex-navbar-fixed: 1030 !default;
-$zindex-modal: 1040 !default;
+$zindex-modal-background: 1040 !default;
+$zindex-modal: 1050 !default;
//== Media queries breakpoints