Skip to content
GitLab
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
29b4ba0f
Commit
29b4ba0f
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fix modal examples on js page, update modal close button positioning
parent
b01de5fc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
bootstrap.css
+2
-2
bootstrap.css
bootstrap.min.css
+1
-1
bootstrap.min.css
docs/javascript.html
+2
-2
docs/javascript.html
docs/templates/pages/javascript.mustache
+3
-3
docs/templates/pages/javascript.mustache
lib/modals.less
+1
-1
lib/modals.less
with
9 additions
and
9 deletions
+9
-9
bootstrap.css
+
2
-
2
View file @
29b4ba0f
...
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Wed Jan 25 09:5
0:58
PST 2012
* Date: Wed Jan 25 09:5
3:40
PST 2012
*/
article
,
aside
,
...
...
@@ -2170,7 +2170,7 @@ table .headerSortUp:after {
border-bottom
:
1px
solid
#eee
;
}
.modal-header
.close
{
margin-top
:
7
px
;
margin-top
:
2
px
;
}
.modal-body
{
padding
:
15px
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
1
-
1
View file @
29b4ba0f
...
...
@@ -424,7 +424,7 @@ table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;b
.modal-backdrop
,
.modal-backdrop.fade.in
{
filter
:
alpha
(
opacity
=
80
);
-moz-opacity
:
0.8
;
opacity
:
0.8
;}
.modal
{
position
:
fixed
;
top
:
50%
;
left
:
50%
;
z-index
:
1050
;
max-height
:
500px
;
overflow
:
auto
;
width
:
560px
;
margin
:
-250px
0
0
-280px
;
background-color
:
#ffffff
;
border
:
1px
solid
#999
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.3
);
*
border
:
1px
solid
#999
;
-webkit-border-radius
:
6px
;
-moz-border-radius
:
6px
;
border-radius
:
6px
;
-webkit-box-shadow
:
0
3px
7px
rgba
(
0
,
0
,
0
,
0.3
);
-moz-box-shadow
:
0
3px
7px
rgba
(
0
,
0
,
0
,
0.3
);
box-shadow
:
0
3px
7px
rgba
(
0
,
0
,
0
,
0.3
);
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding-box
;
background-clip
:
padding-box
;}
.modal.fade
{
-webkit-transition
:
opacity
.3s
linear
,
top
.3s
ease-out
;
-moz-transition
:
opacity
.3s
linear
,
top
.3s
ease-out
;
-ms-transition
:
opacity
.3s
linear
,
top
.3s
ease-out
;
-o-transition
:
opacity
.3s
linear
,
top
.3s
ease-out
;
transition
:
opacity
.3s
linear
,
top
.3s
ease-out
;
top
:
-25%
;}
.modal.fade.in
{
top
:
50%
;}
.modal-header
{
padding
:
5px
15px
;
border-bottom
:
1px
solid
#eee
;}
.modal-header
.close
{
margin-top
:
7
px
;}
.modal-header
{
padding
:
5px
15px
;
border-bottom
:
1px
solid
#eee
;}
.modal-header
.close
{
margin-top
:
2
px
;}
.modal-body
{
padding
:
15px
;}
.modal-footer
{
padding
:
14px
15px
15px
;
margin-bottom
:
0
;
background-color
:
#f5f5f5
;
border-top
:
1px
solid
#ddd
;
-webkit-border-radius
:
0
0
6px
6px
;
-moz-border-radius
:
0
0
6px
6px
;
border-radius
:
0
0
6px
6px
;
-webkit-box-shadow
:
inset
0
1px
0
#ffffff
;
-moz-box-shadow
:
inset
0
1px
0
#ffffff
;
box-shadow
:
inset
0
1px
0
#ffffff
;
*
zoom
:
1
;}
.modal-footer
:before
,
.modal-footer
:after
{
display
:
table
;
content
:
""
;}
.modal-footer
:after
{
clear
:
both
;}
...
...
This diff is collapsed.
Click to expand it.
docs/javascript.html
+
2
-
2
View file @
29b4ba0f
...
...
@@ -211,7 +211,7 @@
<!-- sample modal content -->
<div
id=
"myModal"
class=
"modal hide fade"
>
<div
class=
"modal-header"
>
<a
href=
"#"
class=
"close"
data-dismiss=
"modal"
>
×
</a>
<a
class=
"close"
data-dismiss=
"modal"
>
×
</a>
<h3>
Modal Heading
</h3>
</div>
<div
class=
"modal-body"
>
...
...
@@ -271,7 +271,7 @@
<pre
class=
"prettyprint linenums"
>
<
div class="modal"
>
<
div class="modal-header"
>
<
a
href="#"
class="close
js
-dismiss"
>×<
/a
>
<
a class="close
" data
-dismiss
="modal
"
>×<
/a
>
<
h3
>
Modal header
<
/h3
>
<
/div
>
<
div class="modal-body"
>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/javascript.mustache
+
3
-
3
View file @
29b4ba0f
...
...
@@ -148,7 +148,7 @@
<!-- sample modal content -->
<div
id=
"myModal"
class=
"modal hide fade"
>
<div
class=
"modal-header"
>
<a
href=
"#"
class=
"close"
data-dismiss=
"modal"
>
×
</a>
<a
class=
"close"
data-dismiss=
"modal"
>
×
</a>
<h3>
{{
_i
}}
Modal Heading
{{/
i
}}
</h3>
</div>
<div
class=
"modal-body"
>
...
...
@@ -162,7 +162,7 @@
<p>
{{
_i
}}
<a
href=
"#"
class=
"tooltip-test"
title=
"Tooltip"
>
This link
</a>
and
<a
href=
"#"
class=
"tooltip-test"
title=
"Tooltip"
>
that link
</a>
should have tooltips on hover.
{{/
i
}}
</p>
</div>
<div
class=
"modal-footer"
>
<a
href=
"#"
class=
"btn primary"
>
{{
_i
}}
Save changes
<
{{/
i
}}
/
a
>
<a
href=
"#"
class=
"btn primary"
>
{{
_i
}}
Save changes
{{/
i
}}
<
/a>
<a
href=
"#"
class=
"btn"
data-dismiss=
"modal"
>
{{
_i
}}
Close
{{/
i
}}
</a>
</div>
</div>
...
...
@@ -208,7 +208,7 @@
<pre
class=
"prettyprint linenums"
>
<
div class="modal"
>
<
div class="modal-header"
>
<
a
href="#"
class="close
js
-dismiss"
>×<
/a
>
<
a class="close
" data
-dismiss
="modal
"
>×<
/a
>
<
h3
>
Modal header
<
/h3
>
<
/div
>
<
div class="modal-body"
>
...
...
This diff is collapsed.
Click to expand it.
lib/modals.less
+
1
-
1
View file @
29b4ba0f
...
...
@@ -44,7 +44,7 @@
padding: 5px 15px;
border-bottom: 1px solid #eee;
// Close icon
.close { margin-top:
7
px; }
.close { margin-top:
2
px; }
}
.modal-body {
padding: 15px;
...
...
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