Permalink
Browse files

Update bootstrap assets

  • Loading branch information...
1 parent 0d35744 commit 2018af746f18619fb1f79bd287cc3effe74a09c3 @yury yury committed Dec 2, 2013
Showing with 212 additions and 267 deletions.
  1. +1 −1 app/assets/javascripts/twitter/bootstrap/affix.js
  2. +1 −1 app/assets/javascripts/twitter/bootstrap/alert.js
  3. +1 −1 app/assets/javascripts/twitter/bootstrap/button.js
  4. +1 −1 app/assets/javascripts/twitter/bootstrap/carousel.js
  5. +1 −1 app/assets/javascripts/twitter/bootstrap/collapse.js
  6. +3 −3 app/assets/javascripts/twitter/bootstrap/dropdown.js
  7. +1 −1 app/assets/javascripts/twitter/bootstrap/modal.js
  8. +1 −1 app/assets/javascripts/twitter/bootstrap/popover.js
  9. +1 −1 app/assets/javascripts/twitter/bootstrap/scrollspy.js
  10. +1 −1 app/assets/javascripts/twitter/bootstrap/tab.js
  11. +1 −1 app/assets/javascripts/twitter/bootstrap/tooltip.js
  12. +1 −1 app/assets/javascripts/twitter/bootstrap/transition.js
  13. +6 −6 app/assets/stylesheets/twitter/bootstrap/_badges.scss
  14. +7 −33 app/assets/stylesheets/twitter/bootstrap/_button-groups.scss
  15. +1 −0 app/assets/stylesheets/twitter/bootstrap/_carousel.scss
  16. +2 −2 app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss
  17. +11 −0 app/assets/stylesheets/twitter/bootstrap/_forms.scss
  18. +12 −26 app/assets/stylesheets/twitter/bootstrap/_grid.scss
  19. +1 −1 app/assets/stylesheets/twitter/bootstrap/_input-groups.scss
  20. +8 −2 app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss
  21. +6 −0 app/assets/stylesheets/twitter/bootstrap/_labels.scss
  22. +24 −26 app/assets/stylesheets/twitter/bootstrap/_mixins.scss
  23. +2 −5 app/assets/stylesheets/twitter/bootstrap/_modals.scss
  24. +36 −48 app/assets/stylesheets/twitter/bootstrap/_navbar.scss
  25. +0 −20 app/assets/stylesheets/twitter/bootstrap/_navs.scss
  26. +7 −1 app/assets/stylesheets/twitter/bootstrap/_panels.scss
  27. +5 −18 app/assets/stylesheets/twitter/bootstrap/_tables.scss
  28. +9 −3 app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss
  29. +54 −52 app/assets/stylesheets/twitter/bootstrap/_type.scss
  30. +6 −9 app/assets/stylesheets/twitter/bootstrap/_variables.scss
  31. +1 −1 bootstrap
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: affix.js v3.0.2
+ * Bootstrap: affix.js v3.0.3
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: alert.js v3.0.2
+ * Bootstrap: alert.js v3.0.3
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: button.js v3.0.2
+ * Bootstrap: button.js v3.0.3
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: carousel.js v3.0.2
+ * Bootstrap: carousel.js v3.0.3
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: collapse.js v3.0.2
+ * Bootstrap: collapse.js v3.0.3
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: dropdown.js v3.0.2
+ * Bootstrap: dropdown.js v3.0.3
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -123,9 +123,9 @@
$.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
- var data = $this.data('dropdown')
+ var data = $this.data('bs.dropdown')
- if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+ if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this)
})
}
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: modal.js v3.0.2
+ * Bootstrap: modal.js v3.0.3
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: popover.js v3.0.2
+ * Bootstrap: popover.js v3.0.3
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: scrollspy.js v3.0.2
+ * Bootstrap: scrollspy.js v3.0.3
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: tab.js v3.0.2
+ * Bootstrap: tab.js v3.0.3
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: tooltip.js v3.0.2
+ * Bootstrap: tooltip.js v3.0.3
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: transition.js v3.0.2
+ * Bootstrap: transition.js v3.0.3
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2013 Twitter, Inc.
@@ -24,6 +24,12 @@
}
}
+// Quick fix for badges in buttons
+.btn .badge {
+ position: relative;
+ top: -1px;
+}
+
// Hover state, but only for links
a.badge {
&:hover,
@@ -34,12 +40,6 @@ a.badge {
}
}
-// Quick fix for labels/badges in buttons
-.btn .badge {
- position: relative;
- top: -1px;
-}
-
// Account for counters in navs
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
@@ -2,37 +2,6 @@
// Button groups
// --------------------------------------------------
-// Button carets
-//
-// Match the button text color to the arrow/caret for indicating dropdown-ness.
-
-.caret {
- .btn-default & {
- border-top-color: $btn-default-color;
- }
- .btn-primary &,
- .btn-success &,
- .btn-warning &,
- .btn-danger &,
- .btn-info & {
- border-top-color: #fff;
- }
-}
-.dropup {
- .btn-default .caret {
- border-bottom-color: $btn-default-color;
- }
- .btn-primary,
- .btn-success,
- .btn-warning,
- .btn-danger,
- .btn-info {
- .caret {
- border-bottom-color: #fff;
- }
- }
-}
-
// Make the div behave like a button
.btn-group,
.btn-group-vertical {
@@ -178,7 +147,8 @@
.btn-group-vertical {
> .btn,
- > .btn-group {
+ > .btn-group,
+ > .btn-group > .btn {
display: block;
float: none;
width: 100%;
@@ -238,11 +208,15 @@
width: 100%;
table-layout: fixed;
border-collapse: separate;
- .btn {
+ > .btn,
+ > .btn-group {
float: none;
display: table-cell;
width: 1%;
}
+ > .btn-group .btn {
+ width: 100%;
+ }
}
@@ -91,6 +91,7 @@
// Hover/focus state
&:hover,
&:focus {
+ outline: none;
color: $carousel-control-color;
text-decoration: none;
@include opacity(.9);
@@ -10,7 +10,7 @@
height: 0;
margin-left: 2px;
vertical-align: middle;
- border-top: $caret-width-base solid $dropdown-caret-color;
+ border-top: $caret-width-base solid;
border-right: $caret-width-base solid transparent;
border-left: $caret-width-base solid transparent;
}
@@ -161,7 +161,7 @@
// Reverse the caret
.caret {
border-top: 0;
- border-bottom: $caret-width-base solid $dropdown-caret-color;
+ border-bottom: $caret-width-base solid;
content: "";
}
// Different positioning for bottom up menu
@@ -304,6 +304,11 @@ input[type="checkbox"],
display: inline-block;
}
+ // Override `width: 100%;` when not within a `.form-group`
+ select.form-control {
+ width: auto;
+ }
+
// Remove default margin on radios/checkboxes that were used for stacking, and
// then undo the floating of radios and checkboxes to match (which also avoids
// a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
@@ -342,6 +347,12 @@ input[type="checkbox"],
margin-bottom: 0;
padding-top: ($padding-base-vertical + 1); // Default padding plus a border
}
+ // Account for padding we're adding to ensure the alignment and of help text
+ // and other content below items
+ .radio,
+ .checkbox {
+ min-height: $line-height-computed + ($padding-base-vertical + 1);
+ }
// Make form groups behave like rows
.form-group {
@@ -5,6 +5,16 @@
// Set the container width, and override it for fixed navbars in media queries
.container {
@include container-fixed();
+
+ @media (min-width: $screen-sm) {
+ width: $container-sm;
+ }
+ @media (min-width: $screen-md) {
+ width: $container-md;
+ }
+ @media (min-width: $screen-lg-min) {
+ width: $container-lg;
+ }
}
// mobile first defaults
@@ -18,11 +28,8 @@
// Extra small grid
//
-// Grid classes for extra small devices like smartphones. No offset, push, or
-// pull classes are present here due to the size of the target.
-//
-// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
+// Columns, offsets, pushes, and pulls for extra small devices like
+// smartphones.
@include make-grid-columns-float(xs);
@include make-grid($grid-columns, xs, width);
@@ -35,15 +42,8 @@
//
// Columns, offsets, pushes, and pulls for the small device range, from phones
// to tablets.
-//
-// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
@media (min-width: $screen-sm-min) {
- .container {
- width: $container-sm;
- }
-
@include make-grid-columns-float(sm);
@include make-grid($grid-columns, sm, width);
@include make-grid($grid-columns, sm, pull);
@@ -55,15 +55,8 @@
// Medium grid
//
// Columns, offsets, pushes, and pulls for the desktop device range.
-//
-// Note that `.col-md-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
@media (min-width: $screen-md-min) {
- .container {
- width: $container-md;
- }
-
@include make-grid-columns-float(md);
@include make-grid($grid-columns, md, width);
@include make-grid($grid-columns, md, pull);
@@ -75,15 +68,8 @@
// Large grid
//
// Columns, offsets, pushes, and pulls for the large desktop device range.
-//
-// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
@media (min-width: $screen-lg-min) {
- .container {
- width: $container-lg;
- }
-
@include make-grid-columns-float(lg);
@include make-grid($grid-columns, lg, width);
@include make-grid($grid-columns, lg, pull);
@@ -10,7 +10,7 @@
border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
// Undo padding and float of grid classes
- &.col {
+ &[class*="col-"] {
float: none;
padding-left: 0;
padding-right: 0;
@@ -12,7 +12,8 @@
color: $jumbotron-color;
background-color: $jumbotron-bg;
- h1 {
+ h1,
+ .h1 {
line-height: 1;
color: $jumbotron-heading-color;
}
@@ -24,6 +25,10 @@
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
}
+ .container {
+ max-width: 100%;
+ }
+
@media screen and (min-width: $screen-sm-min) {
padding-top: ($jumbotron-padding * 1.6);
padding-bottom: ($jumbotron-padding * 1.6);
@@ -33,7 +38,8 @@
padding-right: ($jumbotron-padding * 2);
}
- h1 {
+ h1,
+ .h1 {
font-size: ($font-size-base * 4.5);
}
}
@@ -30,6 +30,12 @@
}
}
+// Quick fix for labels in buttons
+.btn .label {
+ position: relative;
+ top: -1px;
+}
+
// Colors
// Contextual variations (linked labels get darker on :hover)
Oops, something went wrong.

0 comments on commit 2018af7

Please sign in to comment.