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
967030cb
Commit
967030cb
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
modal refinements in docs and general responsiveness
parent
18d95a16
3 merge requests
!1475
2.0 wip
,
!1403
warningText and warningBackground docs fix
,
!1351
2.0 wip - relative font sizes
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/assets/css/bootstrap-responsive.css
+4
-3
docs/assets/css/bootstrap-responsive.css
docs/assets/css/docs.css
+9
-0
docs/assets/css/docs.css
docs/javascript.html
+1
-1
docs/javascript.html
docs/templates/pages/javascript.mustache
+1
-1
docs/templates/pages/javascript.mustache
less/responsive.less
+4
-3
less/responsive.less
with
19 additions
and
8 deletions
+19
-8
docs/assets/css/bootstrap-responsive.css
+
4
-
3
View file @
967030cb
...
@@ -24,9 +24,9 @@
...
@@ -24,9 +24,9 @@
}
}
.modal
{
.modal
{
position
:
absolute
;
position
:
absolute
;
top
:
2
0px
;
top
:
1
0px
;
left
:
2
0px
;
left
:
1
0px
;
right
:
2
0px
;
right
:
1
0px
;
width
:
auto
;
width
:
auto
;
margin
:
0
;
margin
:
0
;
}
}
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
}
}
.modal-header
.close
{
.modal-header
.close
{
padding
:
10px
;
padding
:
10px
;
margin
:
-10px
;
}
}
}
}
@media
(
max-width
:
768px
)
{
@media
(
max-width
:
768px
)
{
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.css
+
9
-
0
View file @
967030cb
...
@@ -723,6 +723,15 @@ form.well {
...
@@ -723,6 +723,15 @@ form.well {
word-wrap
:
break-word
;
word-wrap
:
break-word
;
word-break
:
break-all
;
word-break
:
break-all
;
}
}
/* Modal example */
.modal-example
.modal
{
position
:
relative
;
top
:
auto
;
right
:
auto
;
bottom
:
auto
;
left
:
auto
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
docs/javascript.html
+
1
-
1
View file @
967030cb
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<div
class=
"span9 columns"
>
<div
class=
"span9 columns"
>
<h2>
Static example
</h2>
<h2>
Static example
</h2>
<p>
Below is a statically rendered modal.
</p>
<p>
Below is a statically rendered modal.
</p>
<div
class=
"well"
style=
"background-color: #888; border: none;"
>
<div
class=
"well
modal-example
"
style=
"background-color: #888; border: none;"
>
<div
class=
"modal"
style=
"position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1"
>
<div
class=
"modal"
style=
"position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1"
>
<div
class=
"modal-header"
>
<div
class=
"modal-header"
>
<a
href=
"#"
class=
"close"
data-dismiss=
"modal"
>
×
</a>
<a
href=
"#"
class=
"close"
data-dismiss=
"modal"
>
×
</a>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/javascript.mustache
+
1
-
1
View file @
967030cb
...
@@ -128,7 +128,7 @@
...
@@ -128,7 +128,7 @@
<div
class=
"span9 columns"
>
<div
class=
"span9 columns"
>
<h2>
{{
_i
}}
Static example
{{/
i
}}
</h2>
<h2>
{{
_i
}}
Static example
{{/
i
}}
</h2>
<p>
{{
_i
}}
Below is a statically rendered modal.
{{/
i
}}
</p>
<p>
{{
_i
}}
Below is a statically rendered modal.
{{/
i
}}
</p>
<div
class=
"well"
style=
"background-color: #888; border: none;"
>
<div
class=
"well
modal-example
"
style=
"background-color: #888; border: none;"
>
<div
class=
"modal"
style=
"position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1"
>
<div
class=
"modal"
style=
"position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1"
>
<div
class=
"modal-header"
>
<div
class=
"modal-header"
>
<a
href=
"#"
class=
"close"
data-dismiss=
"modal"
>
×
</a>
<a
href=
"#"
class=
"close"
data-dismiss=
"modal"
>
×
</a>
...
...
This diff is collapsed.
Click to expand it.
less/responsive.less
+
4
-
3
View file @
967030cb
...
@@ -56,15 +56,16 @@
...
@@ -56,15 +56,16 @@
// Modals
// Modals
.modal {
.modal {
position: absolute;
position: absolute;
top:
2
0px;
top:
1
0px;
left:
2
0px;
left:
1
0px;
right:
2
0px;
right:
1
0px;
width: auto;
width: auto;
margin: 0;
margin: 0;
&.fade.in { top: auto; }
&.fade.in { top: auto; }
}
}
.modal-header .close {
.modal-header .close {
padding: 10px;
padding: 10px;
margin: -10px;
}
}
}
}
...
...
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