Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
a623b8c1
Commit
a623b8c1
authored
Feb 07, 2013
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update docs modals
parent
cdb2147b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
132 additions
and
91 deletions
+132
-91
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+11
-3
docs/assets/css/docs.css
docs/assets/css/docs.css
+3
-0
docs/javascript.html
docs/javascript.html
+55
-41
docs/templates/pages/javascript.mustache
docs/templates/pages/javascript.mustache
+55
-41
less/modals.less
less/modals.less
+7
-5
less/tests/new-modal.html
less/tests/new-modal.html
+1
-1
No files found.
docs/assets/css/bootstrap.css
View file @
a623b8c1
...
...
@@ -3737,6 +3737,14 @@ button.close {
-webkit-overflow-scrolling
:
touch
;
}
.modal.fade
{
top
:
-25%
;
-webkit-transition
:
opacity
0.3s
linear
,
top
0.3s
ease-out
;
-moz-transition
:
opacity
0.3s
linear
,
top
0.3s
ease-out
;
-o-transition
:
opacity
0.3s
linear
,
top
0.3s
ease-out
;
transition
:
opacity
0.3s
linear
,
top
0.3s
ease-out
;
}
.modal-dialog
{
position
:
relative
;
top
:
0
;
...
...
@@ -3751,11 +3759,11 @@ button.close {
position
:
relative
;
background-color
:
#fff
;
border
:
1px
solid
#999
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.
3
);
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0.
2
);
border-radius
:
6px
;
outline
:
none
;
-webkit-box-shadow
:
0
3px
7px
rgba
(
0
,
0
,
0
,
0.3
);
box-shadow
:
0
3px
7px
rgba
(
0
,
0
,
0
,
0.3
);
-webkit-box-shadow
:
0
3px
10px
rgba
(
0
,
0
,
0
,
0.25
);
box-shadow
:
0
3px
10px
rgba
(
0
,
0
,
0
,
0.25
);
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding-box
;
background-clip
:
padding-box
;
...
...
docs/assets/css/docs.css
View file @
a623b8c1
...
...
@@ -283,6 +283,9 @@ section > ul li {
bottom
:
auto
;
z-index
:
1
;
display
:
block
;
}
.bs-docs-example-modal
.modal-dialog
{
left
:
auto
;
margin-left
:
auto
;
margin-right
:
auto
;
}
...
...
docs/javascript.html
View file @
a623b8c1
...
...
@@ -192,7 +192,7 @@ $('#myModal').on('show', function (e) {
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h
3
class=
"modal-title"
>
Modal header
</h3
>
<h
4
class=
"modal-title"
>
Modal title
</h4
>
</div>
<div
class=
"modal-body"
>
<p>
One fine body
…
</p>
...
...
@@ -208,9 +208,12 @@ $('#myModal').on('show', function (e) {
</div>
<pre
class=
"prettyprint linenums"
>
<
div class="modal fade"
>
<
div class="modal-dialog"
>
<
div class="modal-content"
>
<
div class="modal-header"
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>&
times;
<
/button
>
<
h3
>
Modal header
<
/h3
>
<
h4 class="modal-title"
>
Modal title
<
/h4
>
<
/div
>
<
div class="modal-body"
>
<
p
>
One fine body
…<
/p
>
...
...
@@ -219,6 +222,9 @@ $('#myModal').on('show', function (e) {
<
a href="#" class="btn"
>
Close
<
/a
>
<
a href="#" class="btn btn-primary"
>
Save changes
<
/a
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
</pre>
...
...
@@ -226,9 +232,13 @@ $('#myModal').on('show', function (e) {
<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 fade"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
aria-hidden=
"true"
>
<div
class=
"modal-dialog"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h3
id=
"myModalLabel"
>
Modal Heading
</h3
>
<h4
class=
"modal-title"
id=
"myModalLabel"
>
Modal Heading
</h4
>
</div>
<div
class=
"modal-body"
>
<h4>
Text in a modal
</h4>
...
...
@@ -255,7 +265,11 @@ $('#myModal').on('show', function (e) {
<button
class=
"btn"
data-dismiss=
"modal"
>
Close
</button>
<button
class=
"btn btn-primary"
>
Save changes
</button>
</div>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dalog -->
</div>
<!-- /.modal -->
<div
class=
"bs-docs-example"
style=
"padding-bottom: 24px;"
>
<a
data-toggle=
"modal"
href=
"#myModal"
class=
"btn btn-primary btn-large"
>
Launch demo modal
</a>
</div>
...
...
docs/templates/pages/javascript.mustache
View file @
a623b8c1
...
...
@@ -125,7 +125,7 @@ $('#myModal').on('show', function (e) {
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h
3
class=
"modal-title"
>
Modal header
</h3
>
<h
4
class=
"modal-title"
>
Modal title
</h4
>
</div>
<div
class=
"modal-body"
>
<p>
One fine body
…
</p>
...
...
@@ -141,9 +141,12 @@ $('#myModal').on('show', function (e) {
</div>
{{! /example }}
<pre
class=
"prettyprint linenums"
>
<
div class="modal fade"
>
<
div class="modal-dialog"
>
<
div class="modal-content"
>
<
div class="modal-header"
>
<
button type="button" class="close" data-dismiss="modal" aria-hidden="true"
>&
times;
<
/button
>
<
h3
>
Modal header
<
/h3
>
<
h4 class="modal-title"
>
Modal title
<
/h4
>
<
/div
>
<
div class="modal-body"
>
<
p
>
One fine body
…<
/p
>
...
...
@@ -152,6 +155,9 @@ $('#myModal').on('show', function (e) {
<
a href="#" class="btn"
>
Close
<
/a
>
<
a href="#" class="btn btn-primary"
>
Save changes
<
/a
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
</pre>
...
...
@@ -159,9 +165,13 @@ $('#myModal').on('show', function (e) {
<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 fade"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
aria-hidden=
"true"
>
<div
class=
"modal-dialog"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h3
id=
"myModalLabel"
>
Modal Heading
</h3
>
<h4
class=
"modal-title"
id=
"myModalLabel"
>
Modal Heading
</h4
>
</div>
<div
class=
"modal-body"
>
<h4>
Text in a modal
</h4>
...
...
@@ -188,7 +198,11 @@ $('#myModal').on('show', function (e) {
<button
class=
"btn"
data-dismiss=
"modal"
>
Close
</button>
<button
class=
"btn btn-primary"
>
Save changes
</button>
</div>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dalog -->
</div>
<!-- /.modal -->
<div
class=
"bs-docs-example"
style=
"padding-bottom: 24px;"
>
<a
data-toggle=
"modal"
href=
"#myModal"
class=
"btn btn-primary btn-large"
>
Launch demo modal
</a>
</div>
{{! /example }}
...
...
less/modals.less
View file @
a623b8c1
...
...
@@ -25,6 +25,10 @@
z-index: @zindex-modal-background;
-webkit-overflow-scrolling: touch;
}
.modal.fade {
top: -25%;
.transition(~"opacity 0.3s linear, top 0.3s ease-out");
}
// Shell div to position the modal with bottom padding
.modal-dialog {
...
...
@@ -42,9 +46,9 @@
position: relative;
background-color: #fff;
border: 1px solid #999;
border: 1px solid rgba(0,0,0,.
3
);
border: 1px solid rgba(0,0,0,.
2
);
border-radius: 6px;
.box-shadow(0 3px
7px rgba(0,0,0,0.3
));
.box-shadow(0 3px
10px rgba(0,0,0,0.25
));
.background-clip(padding-box);
// Remove focus outline from opened modal
outline: none;
...
...
@@ -75,7 +79,6 @@
}
// Modal header
// -------------------------
// Top section of the modal w/ title and dismiss
.modal-header {
padding: 9px 15px;
...
...
@@ -93,7 +96,6 @@
}
// Modal body
// -------------------------
// Where all modal content resides (sibling of .modal-header and .modal-footer)
.modal-body {
position: relative;
...
...
@@ -123,7 +125,7 @@
}
}
// Scale up the modal
@media screen and (min-width: 768px) {
.modal-dialog {
...
...
less/tests/new-modal.html
View file @
a623b8c1
...
...
@@ -46,7 +46,7 @@
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-hidden=
"true"
>
×
</button>
<h
3
class=
"modal-title"
>
Modal title
</h3
>
<h
4
class=
"modal-title"
>
Modal title
</h4
>
</div>
<div
class=
"modal-body"
>
<p>
Body
</p>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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