From: Mark Otto <markdotto@gmail.com>
Date: Tue, 23 Dec 2014 21:59:26 +0000 (-0800)
Subject: Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
X-Git-Tag: v4.0.0-alpha~452
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b394ab067f7af82c2e2e640642d47f6ff609ccf;p=thirdparty%2Fbootstrap.git

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Conflicts:
	docs/components/helpers.md
	scss/_utilities.scss
---

6b394ab067f7af82c2e2e640642d47f6ff609ccf
diff --cc scss/_utilities.scss
index ec96ba1d50,d334001251..aeffdcd781
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@@ -46,17 -46,8 +46,11 @@@
    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;
  }