From: Mark Otto <otto@github.com>
Date: Sun, 15 Dec 2013 22:10:48 +0000 (-0800)
Subject: Merge branch 'master' into pr/11676
X-Git-Tag: v3.1.0~148^2~6^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=122245fe87bbd293a82ffa6b9c37d8b174b3dc0f;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into pr/11676

Conflicts:
	less/modals.less
---

122245fe87bbd293a82ffa6b9c37d8b174b3dc0f
diff --cc less/modals.less
index bfb80c2821,ec1bf55dc9..f6ab34769b
--- a/less/modals.less
+++ b/less/modals.less
@@@ -22,9 -22,12 +22,13 @@@
    right: 0;
    bottom: 0;
    left: 0;
-   z-index: @zindex-modal-background;
+   z-index: @zindex-modal;
 +  -webkit-overflow-scrolling: touch;
-   
+ 
+   // Prevent Chrome on Windows from adding a focus outline. For details, see
+   // https://github.com/twbs/bootstrap/pull/10951.
+   outline: 0;
+ 
    // When fading in the modal, animate it to slide down
    &.fade .modal-dialog {
      .translate(0, -25%);