Skip to content
This repository
Browse code

Update bootstrap assets

  • Loading branch information...
commit c4245ec475460be4ad48398e9944fb836022af98 1 parent 99d4f2a
Yury Korolev yury authored
2  app/assets/javascripts/twitter/bootstrap/dropdown.js
@@ -26,7 +26,7 @@
26 26 var backdrop = '.dropdown-backdrop'
27 27 var toggle = '[data-toggle=dropdown]'
28 28 var Dropdown = function (element) {
29   - var $el = $(element).on('click.bs.dropdown', this.toggle)
  29 + $(element).on('click.bs.dropdown', this.toggle)
30 30 }
31 31
32 32 Dropdown.prototype.toggle = function (e) {
4 app/assets/stylesheets/twitter/bootstrap/_buttons.scss
@@ -6,7 +6,6 @@
6 6 // Base styles
7 7 // --------------------------------------------------
8 8
9   -// Core styles
10 9 .btn {
11 10 display: inline-block;
12 11 margin-bottom: 0; // For input.btn
@@ -45,7 +44,6 @@
45 44 @include opacity(.65);
46 45 @include box-shadow(none);
47 46 }
48   -
49 47 }
50 48
51 49
@@ -121,7 +119,7 @@
121 119 @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
122 120 }
123 121 @mixin btn-xs {
124   - padding: 1px 5px;
  122 + @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
125 123 }
126 124
127 125 .btn-lg {@include btn-lg}
28 app/assets/stylesheets/twitter/bootstrap/_mixins.scss
@@ -31,7 +31,7 @@
31 31 @mixin tab-focus() {
32 32 // Default
33 33 outline: thin dotted;
34   - //Webkit
  34 + // WebKit
35 35 outline: 5px auto -webkit-focus-ring-color;
36 36 outline-offset: -2px;
37 37 }
@@ -272,10 +272,8 @@
272 272 // Creates two color stops, start and end, by specifying a color and position for each color stop.
273 273 // Color stops are not available in IE9 and below.
274 274 @mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
275   - background-image: -webkit-gradient(linear, $start-percent top, $end-percent top, from($start-color), to($end-color)); // Safari 4+, Chrome 2+
276   - background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1+, Chrome 10+
277   - background-image: -moz-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
278   - background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
  275 + background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1-6, Chrome 10+
  276 + background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
279 277 background-repeat: repeat-x;
280 278 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down
281 279 }
@@ -285,47 +283,36 @@
285 283 // Creates two color stops, start and end, by specifying a color and position for each color stop.
286 284 // Color stops are not available in IE9 and below.
287 285 @mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
288   - background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+
289   - background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1+, Chrome 10+
290   - background-image: -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
291   - background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
  286 + background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
  287 + background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
292 288 background-repeat: repeat-x;
293 289 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
294 290 }
295 291 @mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
296 292 background-repeat: repeat-x;
297   - background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+
298   - background-image: -moz-linear-gradient($deg, $start-color, $end-color); // FF 3.6+
299   - background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10
  293 + background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+
  294 + background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
300 295 }
301 296
302 297 @mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
303   - background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
304 298 background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
305   - background-image: -moz-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
306 299 background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
307 300 background-repeat: no-repeat;
308 301 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
309 302 }
310 303 @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
311   - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
312 304 background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
313   - background-image: -moz-linear-gradient(top, $start-color, $mid-color $color-stop, $end-color);
314 305 background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
315 306 background-repeat: no-repeat;
316 307 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
317 308 }
318 309 @mixin gradient-radial($inner-color: #555, $outer-color: #333) {
319   - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color));
320 310 background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
321   - background-image: -moz-radial-gradient(circle, $inner-color, $outer-color);
322 311 background-image: radial-gradient(circle, $inner-color, $outer-color);
323 312 background-repeat: no-repeat;
324 313 }
325 314 @mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
326   - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, $color), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, $color), color-stop(.75, $color), color-stop(.75, transparent), to(transparent));
327 315 background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
328   - background-image: -moz-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
329 316 background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
330 317 }
331 318
@@ -562,6 +549,7 @@
562 549 display: block !important;
563 550 }
564 551
  552 + table#{$selector} { display: table; }
565 553 tr#{$selector} { display: table-row !important; }
566 554 th#{$selector},
567 555 td#{$selector} { display: table-cell !important; }
10 app/assets/stylesheets/twitter/bootstrap/_navbar.scss
@@ -178,7 +178,7 @@
178 178 padding: 9px 10px;
179 179 @include navbar-vertical-align(34px);
180 180 background-color: transparent;
181   - background-image: none; // Fix for at least Firefox on Android, per #11468
  181 + background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
182 182 border: 1px solid transparent;
183 183 border-radius: $border-radius-base;
184 184
@@ -213,7 +213,7 @@
213 213 line-height: $line-height-computed;
214 214 }
215 215
216   - @media (max-width: $screen-xs-max) {
  216 + @media (max-width: $grid-float-breakpoint-max) {
217 217 // Dropdowns get custom display when collapsed
218 218 .open .dropdown-menu {
219 219 position: static;
@@ -291,7 +291,7 @@
291 291 @extend .form-inline;
292 292
293 293 .form-group {
294   - @media (max-width: $screen-xs-max) {
  294 + @media (max-width: $grid-float-breakpoint-max) {
295 295 margin-bottom: 5px;
296 296 }
297 297 }
@@ -449,7 +449,7 @@
449 449 }
450 450 }
451 451
452   - @media (max-width: $screen-xs-max) {
  452 + @media (max-width: $grid-float-breakpoint-max) {
453 453 // Dropdowns get custom display when collapsed
454 454 .open .dropdown-menu {
455 455 > li > a {
@@ -569,7 +569,7 @@
569 569 }
570 570 }
571 571
572   - @media (max-width: $screen-xs-max) {
  572 + @media (max-width: $grid-float-breakpoint-max) {
573 573 // Dropdowns get custom display
574 574 .open .dropdown-menu {
575 575 > .dropdown-header {
4 app/assets/stylesheets/twitter/bootstrap/_panels.scss
@@ -91,6 +91,10 @@
91 91 }
92 92 }
93 93 }
  94 + > .table-responsive {
  95 + border: 0;
  96 + margin-bottom: 0;
  97 + }
94 98 }
95 99
96 100
10 app/assets/stylesheets/twitter/bootstrap/_variables.scss
@@ -83,6 +83,9 @@ $padding-large-horizontal: 16px !default;
83 83 $padding-small-vertical: 5px !default;
84 84 $padding-small-horizontal: 10px !default;
85 85
  86 +$padding-xs-vertical: 1px !default;
  87 +$padding-xs-horizontal: 5px !default;
  88 +
86 89 $line-height-large: 1.33 !default;
87 90 $line-height-small: 1.5 !default;
88 91
@@ -243,8 +246,13 @@ $screen-md-max: ($screen-lg-min - 1) !default;
243 246 $grid-columns: 12 !default;
244 247 // Padding, to be divided by two and applied to the left and right of all columns
245 248 $grid-gutter-width: 30px !default;
246   -// Point at which the navbar stops collapsing
  249 +
  250 +// Navbar collapse
  251 +
  252 +// Point at which the navbar becomes uncollapsed
247 253 $grid-float-breakpoint: $screen-sm-min !default;
  254 +// Point at which the navbar begins collapsing
  255 +$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
248 256
249 257
250 258 // Navbar
2  bootstrap
... ... @@ -1 +1 @@
1   -Subproject commit 565294f421508ae253eadee0488f36c80d52673e
  1 +Subproject commit 191b88314d6e2e69a9e9175dd88509eb3656649a

0 comments on commit c4245ec

Please sign in to comment.
Something went wrong with that request. Please try again.