diff options
author | Thomas Park <thomas@thomaspark.me> | 2015-03-17 14:23:20 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2015-03-17 14:23:20 -0400 |
commit | 66e5c761eea0ce48fcf72844f043db4bcb43c6d9 (patch) | |
tree | e394156c0683a60f4cf7d8213fb0bbbf32001ae4 /bower_components/bootstrap/less | |
parent | 93738d763fd08637ccfd3ab322176b70f099d309 (diff) |
update bootstrap 3.3.4
Diffstat (limited to 'bower_components/bootstrap/less')
-rw-r--r-- | bower_components/bootstrap/less/alerts.less | 4 | ||||
-rw-r--r-- | bower_components/bootstrap/less/badges.less | 11 | ||||
-rw-r--r-- | bower_components/bootstrap/less/component-animations.less | 3 | ||||
-rw-r--r-- | bower_components/bootstrap/less/dropdowns.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/forms.less | 12 | ||||
-rw-r--r-- | bower_components/bootstrap/less/glyphicons.less | 4 | ||||
-rw-r--r-- | bower_components/bootstrap/less/jumbotron.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/modals.less | 4 | ||||
-rw-r--r-- | bower_components/bootstrap/less/navbar.less | 1 | ||||
-rw-r--r-- | bower_components/bootstrap/less/navs.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/responsive-embed.less | 16 | ||||
-rw-r--r-- | bower_components/bootstrap/less/scaffolding.less | 12 | ||||
-rw-r--r-- | bower_components/bootstrap/less/tooltip.less | 1 | ||||
-rw-r--r-- | bower_components/bootstrap/less/type.less | 2 | ||||
-rw-r--r-- | bower_components/bootstrap/less/utilities.less | 1 | ||||
-rw-r--r-- | bower_components/bootstrap/less/variables.less | 6 |
16 files changed, 54 insertions, 29 deletions
diff --git a/bower_components/bootstrap/less/alerts.less b/bower_components/bootstrap/less/alerts.less index 5618bfce..c4199db9 100644 --- a/bower_components/bootstrap/less/alerts.less +++ b/bower_components/bootstrap/less/alerts.less @@ -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/less/badges.less b/bower_components/bootstrap/less/badges.less index 4a804025..c70bb939 100644 --- a/bower_components/bootstrap/less/badges.less +++ b/bower_components/bootstrap/less/badges.less @@ -28,8 +28,9 @@ position: relative; top: -1px; } - - .btn-xs & { + + .btn-xs &, + .btn-group-xs > .btn & { top: 0; padding: 1px 5px; } @@ -50,15 +51,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/less/component-animations.less b/bower_components/bootstrap/less/component-animations.less index 967715d9..0bcee910 100644 --- a/bower_components/bootstrap/less/component-animations.less +++ b/bower_components/bootstrap/less/component-animations.less @@ -17,9 +17,8 @@ .collapse { display: none; - visibility: hidden; - &.in { display: block; visibility: visible; } + &.in { display: block; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } diff --git a/bower_components/bootstrap/less/dropdowns.less b/bower_components/bootstrap/less/dropdowns.less index 0cc46df5..af344607 100644 --- a/bower_components/bootstrap/less/dropdowns.less +++ b/bower_components/bootstrap/less/dropdowns.less @@ -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/less/forms.less b/bower_components/bootstrap/less/forms.less index 3138c2c5..e4b50629 100644 --- a/bower_components/bootstrap/less/forms.less +++ b/bower_components/bootstrap/less/forms.less @@ -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; + } + // Reset height for `textarea`s textarea& { height: auto; @@ -198,7 +202,7 @@ input[type="search"] { // horizontal forms, use the predefined grid classes. .form-group { - margin-bottom: 15px; + margin-bottom: @form-group-margin-bottom; } @@ -238,6 +242,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; @@ -294,6 +299,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); } } @@ -338,6 +345,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/less/glyphicons.less b/bower_components/bootstrap/less/glyphicons.less index 8b25f89a..335d80aa 100644 --- a/bower_components/bootstrap/less/glyphicons.less +++ b/bower_components/bootstrap/less/glyphicons.less @@ -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/less/jumbotron.less b/bower_components/bootstrap/less/jumbotron.less index d6410238..93036d3c 100644 --- a/bower_components/bootstrap/less/jumbotron.less +++ b/bower_components/bootstrap/less/jumbotron.less @@ -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/less/modals.less b/bower_components/bootstrap/less/modals.less index 032a497d..1de62205 100644 --- a/bower_components/bootstrap/less/modals.less +++ b/bower_components/bootstrap/less/modals.less @@ -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 { .opacity(0); } diff --git a/bower_components/bootstrap/less/navbar.less b/bower_components/bootstrap/less/navbar.less index 0c835030..6d751bb9 100644 --- a/bower_components/bootstrap/less/navbar.less +++ b/bower_components/bootstrap/less/navbar.less @@ -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/less/navs.less b/bower_components/bootstrap/less/navs.less index f26fec7a..a3d11b13 100644 --- a/bower_components/bootstrap/less/navs.less +++ b/bower_components/bootstrap/less/navs.less @@ -223,11 +223,9 @@ .tab-content { > .tab-pane { display: none; - visibility: hidden; } > .active { display: block; - visibility: visible; } } diff --git a/bower_components/bootstrap/less/responsive-embed.less b/bower_components/bootstrap/less/responsive-embed.less index c1fa8f84..080a5118 100644 --- a/bower_components/bootstrap/less/responsive-embed.less +++ b/bower_components/bootstrap/less/responsive-embed.less @@ -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/less/scaffolding.less b/bower_components/bootstrap/less/scaffolding.less index 2a40fbcb..47b1d5a1 100644 --- a/bower_components/bootstrap/less/scaffolding.less +++ b/bower_components/bootstrap/less/scaffolding.less @@ -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/less/tooltip.less b/bower_components/bootstrap/less/tooltip.less index 3ebfdcdf..9d568474 100644 --- a/bower_components/bootstrap/less/tooltip.less +++ b/bower_components/bootstrap/less/tooltip.less @@ -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/less/type.less b/bower_components/bootstrap/less/type.less index 3ec976ee..68ba6017 100644 --- a/bower_components/bootstrap/less/type.less +++ b/bower_components/bootstrap/less/type.less @@ -238,7 +238,7 @@ abbr[data-original-title] { } .initialism { font-size: 90%; - text-transform: uppercase; + .text-uppercase(); } // Blockquotes diff --git a/bower_components/bootstrap/less/utilities.less b/bower_components/bootstrap/less/utilities.less index a2603121..7a8ca27a 100644 --- a/bower_components/bootstrap/less/utilities.less +++ b/bower_components/bootstrap/less/utilities.less @@ -44,7 +44,6 @@ .hidden { display: none !important; - visibility: hidden !important; } diff --git a/bower_components/bootstrap/less/variables.less b/bower_components/bootstrap/less/variables.less index 002be6af..b5fb9d02 100644 --- a/bower_components/bootstrap/less/variables.less +++ b/bower_components/bootstrap/less/variables.less @@ -207,6 +207,9 @@ //** Small `.form-control` height @input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); +//** `.form-group` margin +@form-group-margin-bottom: 15px; + @legend-color: @gray-dark; @legend-border-color: #e5e5e5; @@ -266,7 +269,8 @@ @zindex-popover: 1060; @zindex-tooltip: 1070; @zindex-navbar-fixed: 1030; -@zindex-modal: 1040; +@zindex-modal-background: 1040; +@zindex-modal: 1050; //== Media queries breakpoints |