]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
authorMark Otto <markdotto@gmail.com>
Tue, 23 Dec 2014 21:59:26 +0000 (13:59 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 23 Dec 2014 21:59:26 +0000 (13:59 -0800)
Conflicts:
docs/components/helpers.md
scss/_utilities.scss

1  2 
dist/css/bootstrap.css
scss/_utilities.scss

Simple merge
index ec96ba1d5093936708788f314df61973fbb72cbb,d3340012518a6d6ee4fad950e093968dda11b0e2..aeffdcd78167caff6d20ac4788efe233097de015
    z-index: $zindex-navbar-fixed;
  }
  
- // Toggling content
- .show {
-   display: block !important;
- }
 +// Always hide an element with the `hidden` HTML attribute (from PureCSS).
 +[hidden] {
 +  display: none !important;
 +}
  
 -// Toggling content
  .invisible {
    visibility: hidden;
  }