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
d74fd9af
Commit
d74fd9af
authored
10 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#15096
: Fix navbar forms in the non-responsive example
parent
9928144d
4 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/examples/non-responsive/index.html
+6
-0
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
+77
-1
docs/examples/non-responsive/non-responsive.css
with
83 additions
and
1 deletion
+83
-1
docs/examples/non-responsive/index.html
+
6
-
0
View file @
d74fd9af
...
...
@@ -61,6 +61,12 @@
</ul>
</li>
</ul>
<form
class=
"navbar-form navbar-left"
role=
"search"
>
<div
class=
"form-group"
>
<input
type=
"text"
class=
"form-control"
placeholder=
"Search"
>
</div>
<button
type=
"submit"
class=
"btn btn-default"
>
Submit
</button>
</form>
<ul
class=
"nav navbar-nav navbar-right"
>
<li><a
href=
"#"
>
Link
</a></li>
<li><a
href=
"#"
>
Link
</a></li>
...
...
This diff is collapsed.
Click to expand it.
docs/examples/non-responsive/non-responsive.css
+
77
-
1
View file @
d74fd9af
...
...
@@ -6,11 +6,16 @@
/* Account for fixed navbar */
body
{
min-width
:
970px
;
padding-top
:
70px
;
padding-bottom
:
30px
;
}
body
,
.navbar-fixed-top
,
.navbar-fixed-bottom
{
min-width
:
970px
;
}
/* Don't let the lead text change font-size. */
.lead
{
font-size
:
16px
;
...
...
@@ -64,6 +69,7 @@ body {
height
:
auto
!important
;
padding-bottom
:
0
;
overflow
:
visible
!important
;
visibility
:
visible
!important
;
}
.navbar-toggle
{
...
...
@@ -123,3 +129,73 @@ body {
color
:
#999
!important
;
background-color
:
transparent
!important
;
}
/* Undo form expansion */
.navbar-form
{
float
:
left
;
width
:
auto
;
margin-left
:
0
;
margin-right
:
0
;
padding-top
:
0
;
padding-bottom
:
0
;
border
:
0
;
box-shadow
:
none
;
}
/* Copy-pasted from forms.less since we mixin the .form-inline styles. */
.navbar-form
.form-group
{
display
:
inline-block
;
margin-bottom
:
0
;
vertical-align
:
middle
;
}
.navbar-form
.form-control
{
display
:
inline-block
;
width
:
auto
;
vertical-align
:
middle
;
}
.navbar-form
.form-control-static
{
display
:
inline-block
;
}
.navbar-form
.input-group
{
display
:
inline-table
;
vertical-align
:
middle
;
}
.navbar-form
.input-group
.input-group-addon
,
.navbar-form
.input-group
.input-group-btn
,
.navbar-form
.input-group
.form-control
{
width
:
auto
;
}
.navbar-form
.input-group
>
.form-control
{
width
:
100%
;
}
.navbar-form
.control-label
{
margin-bottom
:
0
;
vertical-align
:
middle
;
}
.navbar-form
.radio
,
.navbar-form
.checkbox
{
display
:
inline-block
;
margin-top
:
0
;
margin-bottom
:
0
;
vertical-align
:
middle
;
label
{
padding-left
:
0
;
}
}
.navbar-form
.radio
input
[
type
=
"radio"
],
.navbar-form
.checkbox
input
[
type
=
"checkbox"
]
{
position
:
relative
;
margin-left
:
0
;
}
.navbar-form
.has-feedback
.form-control-feedback
{
top
:
0
;
}
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