diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 07f737734deaba48823db72144cb3ef69e012c51..362ed3db400f971c5a3473239f49e33f6726d053 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4021,6 +4021,7 @@ fieldset[disabled] .navbar-inverse .btn-navbar { top: 10%; left: 50%; z-index: 1050; + display: none; width: 560px; margin-left: -280px; background-color: #fff; @@ -4911,11 +4912,11 @@ a.badge:hover { } .hide { - display: none; + display: none !important; } .show { - display: block; + display: block !important; } .invisible { diff --git a/docs/javascript.html b/docs/javascript.html index bc4d18ca7cc3c98f7455015444ef2c69c8e9c4d6..2d01af561f17fcd31b808d73544d5e7a250b7db1 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -186,7 +186,7 @@ $('#myModal').on('show', function (e) { <h3>Static example</h3> <p>A rendered modal with header, body, and set of actions in the footer.</p> <div class="bs-docs-example" style="background-color: #f5f5f5;"> - <div class="modal" style="position: relative; top: auto; left: auto; right: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> + <div class="modal" style="position: relative; top: auto; left: auto; right: auto; display: block; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3>Modal header</h3> @@ -201,7 +201,7 @@ $('#myModal').on('show', function (e) { </div> </div> <pre class="prettyprint linenums"> -<div class="modal hide fade"> +<div class="modal fade"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <h3>Modal header</h3> @@ -219,7 +219,7 @@ $('#myModal').on('show', function (e) { <h3>Live demo</h3> <p>Toggle a modal via JavaScript by clicking the button below. It will slide down and fade in from the top of the page.</p> <!-- sample modal content --> - <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 id="myModalLabel">Modal Heading</h3> @@ -258,7 +258,7 @@ $('#myModal').on('show', function (e) { <a href="#myModal" role="button" class="btn" data-toggle="modal">Launch demo modal</a> <!-- Modal --> -<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> +<div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 id="myModalLabel">Modal header</h3> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index b32514b28cc7bdb85cd05cde3b01073134e4a023..55a52e258912ce5fb462a1efcb4c01cc51058fa7 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -119,7 +119,7 @@ $('#myModal').on('show', function (e) { <h3>Static example</h3> <p>A rendered modal with header, body, and set of actions in the footer.</p> <div class="bs-docs-example" style="background-color: #f5f5f5;"> - <div class="modal" style="position: relative; top: auto; left: auto; right: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> + <div class="modal" style="position: relative; top: auto; left: auto; right: auto; display: block; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3>Modal header</h3> @@ -134,7 +134,7 @@ $('#myModal').on('show', function (e) { </div> </div>{{! /example }} <pre class="prettyprint linenums"> -<div class="modal hide fade"> +<div class="modal fade"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <h3>Modal header</h3> @@ -152,7 +152,7 @@ $('#myModal').on('show', function (e) { <h3>Live demo</h3> <p>Toggle a modal via JavaScript by clicking the button below. It will slide down and fade in from the top of the page.</p> <!-- sample modal content --> - <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 id="myModalLabel">Modal Heading</h3> @@ -191,7 +191,7 @@ $('#myModal').on('show', function (e) { <a href="#myModal" role="button" class="btn" data-toggle="modal">Launch demo modal</a> <!-- Modal --> -<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> +<div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 id="myModalLabel">Modal header</h3> diff --git a/less/modals.less b/less/modals.less index 8da32dea9f1a0b28dd9140d485d008ce8cb17e20..7a233091df9e8409399aba0cf782f3a093a01343 100644 --- a/less/modals.less +++ b/less/modals.less @@ -26,6 +26,7 @@ top: 10%; left: 50%; z-index: @zindex-modal; + display: none; width: 560px; margin-left: -280px; background-color: #fff; diff --git a/less/utilities.less b/less/utilities.less index b11bcb3e2750db1574788500fa91c8567fbe160c..d1e0a1beda6c4976292c424626fac72223298f83 100644 --- a/less/utilities.less +++ b/less/utilities.less @@ -21,10 +21,10 @@ // ------------------------- .hide { - display: none; + display: none !important; } .show { - display: block; + display: block !important; } .invisible { visibility: hidden;