Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
6bd5dc7d
Commit
6bd5dc7d
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Add important flag to .show/.hide utility classes; remove .hide requirement from modals
parent
a5e04c07
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/assets/css/bootstrap.css
+3
-2
docs/assets/css/bootstrap.css
docs/javascript.html
+4
-4
docs/javascript.html
docs/templates/pages/javascript.mustache
+4
-4
docs/templates/pages/javascript.mustache
less/modals.less
+1
-0
less/modals.less
less/utilities.less
+2
-2
less/utilities.less
with
14 additions
and
12 deletions
+14
-12
docs/assets/css/bootstrap.css
+
3
-
2
View file @
6bd5dc7d
...
@@ -4021,6 +4021,7 @@ fieldset[disabled] .navbar-inverse .btn-navbar {
...
@@ -4021,6 +4021,7 @@ fieldset[disabled] .navbar-inverse .btn-navbar {
top
:
10%
;
top
:
10%
;
left
:
50%
;
left
:
50%
;
z-index
:
1050
;
z-index
:
1050
;
display
:
none
;
width
:
560px
;
width
:
560px
;
margin-left
:
-280px
;
margin-left
:
-280px
;
background-color
:
#fff
;
background-color
:
#fff
;
...
@@ -4911,11 +4912,11 @@ a.badge:hover {
...
@@ -4911,11 +4912,11 @@ a.badge:hover {
}
}
.hide
{
.hide
{
display
:
none
;
display
:
none
!important
;
}
}
.show
{
.show
{
display
:
block
;
display
:
block
!important
;
}
}
.invisible
{
.invisible
{
...
...
This diff is collapsed.
Click to expand it.
docs/javascript.html
+
4
-
4
View file @
6bd5dc7d
...
@@ -186,7 +186,7 @@ $('#myModal').on('show', function (e) {
...
@@ -186,7 +186,7 @@ $('#myModal').on('show', function (e) {
<h3>
Static example
</h3>
<h3>
Static example
</h3>
<p>
A rendered modal with header, body, and set of actions in the footer.
</p>
<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=
"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"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h3>
Modal header
</h3>
<h3>
Modal header
</h3>
...
@@ -201,7 +201,7 @@ $('#myModal').on('show', function (e) {
...
@@ -201,7 +201,7 @@ $('#myModal').on('show', function (e) {
</div>
</div>
</div>
</div>
<pre
class=
"prettyprint linenums"
>
<pre
class=
"prettyprint linenums"
>
<
div class="modal
hide
fade"
>
<
div class="modal fade"
>
<
div class="modal-header"
>
<
div class="modal-header"
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>&
times;
<
/button
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>&
times;
<
/button
>
<
h3
>
Modal header
<
/h3
>
<
h3
>
Modal header
<
/h3
>
...
@@ -219,7 +219,7 @@ $('#myModal').on('show', function (e) {
...
@@ -219,7 +219,7 @@ $('#myModal').on('show', function (e) {
<h3>
Live demo
</h3>
<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>
<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 -->
<!-- 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"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h3
id=
"myModalLabel"
>
Modal Heading
</h3>
<h3
id=
"myModalLabel"
>
Modal Heading
</h3>
...
@@ -258,7 +258,7 @@ $('#myModal').on('show', function (e) {
...
@@ -258,7 +258,7 @@ $('#myModal').on('show', function (e) {
<
a href="#myModal" role="button" class="btn" data-toggle="modal"
>
Launch demo modal
<
/a
>
<
a href="#myModal" role="button" class="btn" data-toggle="modal"
>
Launch demo modal
<
/a
>
&
lt!-- Modal --
>
&
lt!-- 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"
>
<
div class="modal-header"
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>×<
/button
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>×<
/button
>
<
h3 id="myModalLabel"
>
Modal header
<
/h3
>
<
h3 id="myModalLabel"
>
Modal header
<
/h3
>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/javascript.mustache
+
4
-
4
View file @
6bd5dc7d
...
@@ -119,7 +119,7 @@ $('#myModal').on('show', function (e) {
...
@@ -119,7 +119,7 @@ $('#myModal').on('show', function (e) {
<h3>
Static example
</h3>
<h3>
Static example
</h3>
<p>
A rendered modal with header, body, and set of actions in the footer.
</p>
<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=
"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"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h3>
Modal header
</h3>
<h3>
Modal header
</h3>
...
@@ -134,7 +134,7 @@ $('#myModal').on('show', function (e) {
...
@@ -134,7 +134,7 @@ $('#myModal').on('show', function (e) {
</div>
</div>
</div>
{{! /example }}
</div>
{{! /example }}
<pre
class=
"prettyprint linenums"
>
<pre
class=
"prettyprint linenums"
>
<
div class="modal
hide
fade"
>
<
div class="modal fade"
>
<
div class="modal-header"
>
<
div class="modal-header"
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>&
times;
<
/button
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>&
times;
<
/button
>
<
h3
>
Modal header
<
/h3
>
<
h3
>
Modal header
<
/h3
>
...
@@ -152,7 +152,7 @@ $('#myModal').on('show', function (e) {
...
@@ -152,7 +152,7 @@ $('#myModal').on('show', function (e) {
<h3>
Live demo
</h3>
<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>
<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 -->
<!-- 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"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h3
id=
"myModalLabel"
>
Modal Heading
</h3>
<h3
id=
"myModalLabel"
>
Modal Heading
</h3>
...
@@ -191,7 +191,7 @@ $('#myModal').on('show', function (e) {
...
@@ -191,7 +191,7 @@ $('#myModal').on('show', function (e) {
<
a href="#myModal" role="button" class="btn" data-toggle="modal"
>
Launch demo modal
<
/a
>
<
a href="#myModal" role="button" class="btn" data-toggle="modal"
>
Launch demo modal
<
/a
>
&
lt!-- Modal --
>
&
lt!-- 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"
>
<
div class="modal-header"
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>×<
/button
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>×<
/button
>
<
h3 id="myModalLabel"
>
Modal header
<
/h3
>
<
h3 id="myModalLabel"
>
Modal header
<
/h3
>
...
...
This diff is collapsed.
Click to expand it.
less/modals.less
+
1
-
0
View file @
6bd5dc7d
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
top: 10%;
top: 10%;
left: 50%;
left: 50%;
z-index: @zindex-modal;
z-index: @zindex-modal;
display: none;
width: 560px;
width: 560px;
margin-left: -280px;
margin-left: -280px;
background-color: #fff;
background-color: #fff;
...
...
This diff is collapsed.
Click to expand it.
less/utilities.less
+
2
-
2
View file @
6bd5dc7d
...
@@ -21,10 +21,10 @@
...
@@ -21,10 +21,10 @@
// -------------------------
// -------------------------
.hide {
.hide {
display: none;
display: none
!important
;
}
}
.show {
.show {
display: block;
display: block
!important
;
}
}
.invisible {
.invisible {
visibility: hidden;
visibility: hidden;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets