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 1e43948db7188e670b637ca4fd2076f3a0fa058f 1 parent 271f73b
Yury Korolev yury authored
2  app/assets/javascripts/twitter/bootstrap/dropdown.js
View
@@ -41,7 +41,7 @@
if (!isActive) {
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
- // if mobile we we use a backdrop because click events don't delegate
+ // if mobile we use a backdrop because click events don't delegate
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
}
3  app/assets/stylesheets/twitter/bootstrap/_mixins.scss
View
@@ -55,7 +55,8 @@
// Placeholder text
@mixin placeholder($color: $input-color-placeholder) {
&:-moz-placeholder { color: $color; } // Firefox 4-18
- &::-moz-placeholder { color: $color; } // Firefox 19+
+ &::-moz-placeholder { color: $color; // Firefox 19+
+ opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
&:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
&::-webkit-input-placeholder { color: $color; } // Safari and Chrome
}
2  app/assets/stylesheets/twitter/bootstrap/_navbar.scss
View
@@ -344,10 +344,10 @@
// Add a class to make any element properly align itself vertically within the navbars.
.navbar-text {
- float: left;
@include navbar-vertical-align($line-height-computed);
@media (min-width: $grid-float-breakpoint) {
+ float: left;
margin-left: $navbar-padding-horizontal;
margin-right: $navbar-padding-horizontal;
}
2  bootstrap
@@ -1 +1 @@
-Subproject commit 85cb53d84dcb3c918eb4755b482654ee99ca61d1
+Subproject commit e0f92d7ce598b60dc08d788c52f97e7ee9d30b1d
Please sign in to comment.
Something went wrong with that request. Please try again.