Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update bootstrap assets

  • Loading branch information...
commit 4f5c0167fc7722940f67701a5279a9427692d92f 1 parent 8826a3b
@yury yury authored
Showing with 53 additions and 22 deletions.
  1. +1 −1  app/assets/javascripts/twitter/bootstrap/affix.js
  2. +1 −1  app/assets/javascripts/twitter/bootstrap/carousel.js
  3. +1 −1  app/assets/javascripts/twitter/bootstrap/collapse.js
  4. +1 −1  app/assets/javascripts/twitter/bootstrap/dropdown.js
  5. +1 −1  app/assets/javascripts/twitter/bootstrap/modal.js
  6. +1 −1  app/assets/javascripts/twitter/bootstrap/popover.js
  7. +1 −1  app/assets/javascripts/twitter/bootstrap/scrollspy.js
  8. +1 −1  app/assets/javascripts/twitter/bootstrap/tab.js
  9. +1 −1  app/assets/javascripts/twitter/bootstrap/tooltip.js
  10. +5 −0 app/assets/stylesheets/twitter/bootstrap/_button-groups.scss
  11. +11 −0 app/assets/stylesheets/twitter/bootstrap/_carousel.scss
  12. +1 −1  app/assets/stylesheets/twitter/bootstrap/_code.scss
  13. +1 −1  app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss
  14. +12 −4 app/assets/stylesheets/twitter/bootstrap/_mixins.scss
  15. +1 −0  app/assets/stylesheets/twitter/bootstrap/_modals.scss
  16. +7 −4 app/assets/stylesheets/twitter/bootstrap/_navbar.scss
  17. +4 −0 app/assets/stylesheets/twitter/bootstrap/_panels.scss
  18. +0 −1  app/assets/stylesheets/twitter/bootstrap/_print.scss
  19. +1 −1  app/assets/stylesheets/twitter/bootstrap/_theme.scss
  20. +1 −1  bootstrap
View
2  app/assets/javascripts/twitter/bootstrap/affix.js
@@ -2,7 +2,7 @@
* Bootstrap: affix.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#affix
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  app/assets/javascripts/twitter/bootstrap/carousel.js
@@ -2,7 +2,7 @@
* Bootstrap: carousel.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#carousel
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  app/assets/javascripts/twitter/bootstrap/collapse.js
@@ -2,7 +2,7 @@
* Bootstrap: collapse.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#collapse
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  app/assets/javascripts/twitter/bootstrap/dropdown.js
@@ -2,7 +2,7 @@
* Bootstrap: dropdown.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  app/assets/javascripts/twitter/bootstrap/modal.js
@@ -2,7 +2,7 @@
* Bootstrap: modal.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#modals
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  app/assets/javascripts/twitter/bootstrap/popover.js
@@ -2,7 +2,7 @@
* Bootstrap: popover.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#popovers
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  app/assets/javascripts/twitter/bootstrap/scrollspy.js
@@ -2,7 +2,7 @@
* Bootstrap: scrollspy.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  app/assets/javascripts/twitter/bootstrap/tab.js
@@ -2,7 +2,7 @@
* Bootstrap: tab.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#tabs
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
2  app/assets/javascripts/twitter/bootstrap/tooltip.js
@@ -3,7 +3,7 @@
* http://twbs.github.com/bootstrap/javascript.html#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
View
5 app/assets/stylesheets/twitter/bootstrap/_button-groups.scss
@@ -150,6 +150,11 @@
// Remove the gradient and set the same inset shadow as the :active state
.btn-group.open .dropdown-toggle {
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+
+ // Show no shadow for `.btn-link` since it has no other button styles.
+ &.btn-link {
+ @include box-shadow(none);
+ }
}
View
11 app/assets/stylesheets/twitter/bootstrap/_carousel.scss
@@ -160,6 +160,17 @@
border: 1px solid $carousel-indicator-border-color;
border-radius: 10px;
cursor: pointer;
+
+ // IE8-9 hack for event handling
+ //
+ // Internet Explorer 8-9 does not support clicks on elements without a set
+ // `background-color`. We cannot use `filter` since that's not viewed as a
+ // background color by the browser. Thus, a hack is needed.
+ //
+ // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
+ // set alpha transparency for the best results possible.
+ background-color: #000 \9; // IE8
+ background-color: rgba(0,0,0,0); // IE9
}
.active {
margin: 0;
View
2  app/assets/stylesheets/twitter/bootstrap/_code.scss
@@ -1,5 +1,5 @@
//
-// Code (inline and blocK)
+// Code (inline and block)
// --------------------------------------------------
View
2  app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss
@@ -28,7 +28,7 @@
line-height: 1;
-webkit-font-smoothing: antialiased;
- &:empty{
+ &:empty {
width: 1em;
}
}
View
16 app/assets/stylesheets/twitter/bootstrap/_mixins.scss
@@ -284,13 +284,12 @@
// Color stops are not available in IE9 and below.
@mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+
- background-image: -webkit-linear-gradient(top, $start-color, $start-percent, $end-color, $end-percent); // Safari 5.1+, Chrome 10+
+ background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1+, Chrome 10+
background-image: -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
}
-
@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
background-repeat: repeat-x;
background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+
@@ -306,7 +305,6 @@
background-repeat: no-repeat;
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
}
-
@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
@@ -387,13 +385,18 @@
// -------------------------
@mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
border-color: $border;
+
& > .panel-heading {
color: $heading-text-color;
background-color: $heading-bg-color;
border-color: $heading-border;
+
+ .panel-collapse .panel-body {
border-top-color: $border;
}
+ & > .dropdown .caret {
+ border-color: $heading-text-color transparent;
+ }
}
& > .panel-footer {
+ .panel-collapse .panel-body {
@@ -408,6 +411,7 @@
background-color: $background;
border-color: $border;
color: $text-color;
+
hr {
border-top-color: darken($border, 5%);
}
@@ -769,7 +773,11 @@
@mixin form-control-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) {
// Color the label and help text
.help-block,
- .control-label {
+ .control-label,
+ .radio,
+ .checkbox,
+ .radio-inline,
+ .checkbox-inline {
color: $text-color;
}
// Set the border and box shadow on specific inputs to match
View
1  app/assets/stylesheets/twitter/bootstrap/_modals.scss
@@ -34,6 +34,7 @@
// Shell div to position the modal with bottom padding
.modal-dialog {
+ position: relative;
margin-left: auto;
margin-right: auto;
width: auto;
View
11 app/assets/stylesheets/twitter/bootstrap/_navbar.scss
@@ -10,7 +10,6 @@
.navbar {
position: relative;
- z-index: $zindex-navbar;
min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: $navbar-margin-bottom;
border: 1px solid transparent;
@@ -75,7 +74,7 @@
}
&.in {
- overflow-y: visible;
+ overflow-y: auto;
}
// Account for first and last children spacing
@@ -116,7 +115,9 @@
// Static top (unfixed, but 100% wide) navbar
.navbar-static-top {
+ z-index: $zindex-navbar;
border-width: 0 0 1px;
+
@media (min-width: $grid-float-breakpoint) {
border-radius: 0;
}
@@ -128,7 +129,7 @@
position: fixed;
right: 0;
left: 0;
- border-width: 0 0 1px;
+ z-index: $zindex-navbar-fixed;
// Undo the rounded corners
@media (min-width: $grid-float-breakpoint) {
@@ -136,12 +137,13 @@
}
}
.navbar-fixed-top {
- z-index: $zindex-navbar-fixed;
top: 0;
+ border-width: 0 0 1px;
}
.navbar-fixed-bottom {
bottom: 0;
margin-bottom: 0; // override .navbar defaults
+ border-width: 1px 0 0;
}
@@ -152,6 +154,7 @@
padding: $navbar-padding-vertical $navbar-padding-horizontal;
font-size: $font-size-large;
line-height: $line-height-computed;
+
&:hover,
&:focus {
text-decoration: none;
View
4 app/assets/stylesheets/twitter/bootstrap/_panels.scss
@@ -95,6 +95,10 @@
padding: 10px 15px;
border-bottom: 1px solid transparent;
@include border-top-radius($panel-border-radius - 1);
+
+ & > .dropdown .dropdown-toggle {
+ color: inherit;
+ }
}
// Within heading, strip any `h*` tag of it's default margins for spacing.
View
1  app/assets/stylesheets/twitter/bootstrap/_print.scss
@@ -26,7 +26,6 @@
}
// Don't show links for images, or javascript/internal links
- .ir a:after,
a[href^="javascript:"]:after,
a[href^="#"]:after {
content: "";
View
2  app/assets/stylesheets/twitter/bootstrap/_theme.scss
@@ -33,7 +33,7 @@
// Mixin for generating new styles
@mixin btn-styles($btn-color: #555) {
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
-
+ @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
background-repeat: repeat-x;
border-color: darken($btn-color, 14%);
2  bootstrap
@@ -1 +1 @@
-Subproject commit 78c656069ba5a1174ea15b43f1ceac1f7659624a
+Subproject commit b47449fc80128b1869c10aad097f374e50aa7360
Please sign in to comment.
Something went wrong with that request. Please try again.