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
9c72246d
Commit
9c72246d
authored
Aug 14, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946
parent
f3479a39
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
17 deletions
+32
-17
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap-responsive.css
+4
-4
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+11
-10
docs/examples/hero.html
docs/examples/hero.html
+12
-0
less/component-animations.less
less/component-animations.less
+1
-0
less/mixins.less
less/mixins.less
+2
-1
less/navbar.less
less/navbar.less
+2
-2
No files found.
docs/assets/css/bootstrap-responsive.css
View file @
9c72246d
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
.input-block-level
{
.input-block-level
{
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
@@ -203,7 +203,7 @@
...
@@ -203,7 +203,7 @@
display
:
block
;
display
:
block
;
float
:
left
;
float
:
left
;
width
:
100%
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
margin-left
:
2.564102564102564%
;
margin-left
:
2.564102564102564%
;
*
margin-left
:
2.5109110747408616%
;
*
margin-left
:
2.5109110747408616%
;
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
...
@@ -548,7 +548,7 @@
...
@@ -548,7 +548,7 @@
display
:
block
;
display
:
block
;
float
:
left
;
float
:
left
;
width
:
100%
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
margin-left
:
2.7624309392265194%
;
margin-left
:
2.7624309392265194%
;
*
margin-left
:
2.709239449864817%
;
*
margin-left
:
2.709239449864817%
;
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
...
@@ -830,7 +830,7 @@
...
@@ -830,7 +830,7 @@
.uneditable-input
{
.uneditable-input
{
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
...
docs/assets/css/bootstrap.css
View file @
9c72246d
...
@@ -150,7 +150,7 @@ textarea {
...
@@ -150,7 +150,7 @@ textarea {
.input-block-level
{
.input-block-level
{
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
@@ -340,7 +340,7 @@ a:hover {
...
@@ -340,7 +340,7 @@ a:hover {
display
:
block
;
display
:
block
;
float
:
left
;
float
:
left
;
width
:
100%
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
margin-left
:
2.127659574468085%
;
margin-left
:
2.127659574468085%
;
*
margin-left
:
2.074468085106383%
;
*
margin-left
:
2.074468085106383%
;
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
...
@@ -2865,6 +2865,7 @@ table .span24 {
...
@@ -2865,6 +2865,7 @@ table .span24 {
position
:
relative
;
position
:
relative
;
height
:
0
;
height
:
0
;
overflow
:
hidden
;
overflow
:
hidden
;
overflow
:
visible
\
9
;
-webkit-transition
:
height
0.35s
ease
;
-webkit-transition
:
height
0.35s
ease
;
-moz-transition
:
height
0.35s
ease
;
-moz-transition
:
height
0.35s
ease
;
-o-transition
:
height
0.35s
ease
;
-o-transition
:
height
0.35s
ease
;
...
@@ -4344,26 +4345,26 @@ input[type="submit"].btn.btn-mini {
...
@@ -4344,26 +4345,26 @@ input[type="submit"].btn.btn-mini {
border-bottom-color
:
#555555
;
border-bottom-color
:
#555555
;
}
}
.navbar
.pull-right
.dropdown-menu
,
.navbar
.pull-right
>
li
>
.dropdown-menu
,
.navbar
.dropdown-menu.pull-right
{
.navbar
.
nav
>
li
>
.
dropdown-menu.pull-right
{
right
:
0
;
right
:
0
;
left
:
auto
;
left
:
auto
;
}
}
.navbar
.pull-right
.dropdown-menu
:before
,
.navbar
.pull-right
>
li
>
.dropdown-menu
:before
,
.navbar
.dropdown-menu.pull-right
:before
{
.navbar
.
nav
>
li
>
.
dropdown-menu.pull-right
:before
{
right
:
12px
;
right
:
12px
;
left
:
auto
;
left
:
auto
;
}
}
.navbar
.pull-right
.dropdown-menu
:after
,
.navbar
.pull-right
>
li
>
.dropdown-menu
:after
,
.navbar
.dropdown-menu.pull-right
:after
{
.navbar
.
nav
>
li
>
.
dropdown-menu.pull-right
:after
{
right
:
13px
;
right
:
13px
;
left
:
auto
;
left
:
auto
;
}
}
.navbar
.pull-right
.dropdown-menu
.dropdown-menu
,
.navbar
.pull-right
>
li
>
.dropdown-menu
.dropdown-menu
,
.navbar
.dropdown-menu.pull-right
.dropdown-menu
{
.navbar
.
nav
>
li
>
.
dropdown-menu.pull-right
.dropdown-menu
{
right
:
100%
;
right
:
100%
;
left
:
auto
;
left
:
auto
;
margin-right
:
-1px
;
margin-right
:
-1px
;
...
...
docs/examples/hero.html
View file @
9c72246d
...
@@ -46,6 +46,18 @@
...
@@ -46,6 +46,18 @@
<li
class=
"active"
><a
href=
"#"
>
Home
</a></li>
<li
class=
"active"
><a
href=
"#"
>
Home
</a></li>
<li><a
href=
"#about"
>
About
</a></li>
<li><a
href=
"#about"
>
About
</a></li>
<li><a
href=
"#contact"
>
Contact
</a></li>
<li><a
href=
"#contact"
>
Contact
</a></li>
<li
class=
"dropdown"
>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
Dropdown
<b
class=
"caret"
></b></a>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
<li><a
href=
"#"
>
Something else here
</a></li>
<li
class=
"divider"
></li>
<li
class=
"nav-header"
>
Nav header
</li>
<li><a
href=
"#"
>
Separated link
</a></li>
<li><a
href=
"#"
>
One more separated link
</a></li>
</ul>
</li>
</ul>
</ul>
<form
class=
"navbar-form pull-right"
>
<form
class=
"navbar-form pull-right"
>
<input
class=
"span2"
type=
"text"
placeholder=
"Email"
>
<input
class=
"span2"
type=
"text"
placeholder=
"Email"
>
...
...
less/component-animations.less
View file @
9c72246d
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
position: relative;
position: relative;
height: 0;
height: 0;
overflow: hidden;
overflow: hidden;
overflow: visible \9;
.transition(height .35s ease);
.transition(height .35s ease);
&.in {
&.in {
height: auto;
height: auto;
...
...
less/mixins.less
View file @
9c72246d
...
@@ -154,11 +154,12 @@
...
@@ -154,11 +154,12 @@
.input-block-level {
.input-block-level {
display: block;
display: block;
width: 100%;
width: 100%;
min-height:
28
px; // Make inputs at least the height of their button counterpart
min-height:
30
px; // Make inputs at least the height of their button counterpart
.box-sizing(border-box); // Makes inputs behave like true block-level elements
.box-sizing(border-box); // Makes inputs behave like true block-level elements
}
}
// Mixin for form field states
// Mixin for form field states
.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
// Set the text color
// Set the text color
...
...
less/navbar.less
View file @
9c72246d
...
@@ -327,8 +327,8 @@
...
@@ -327,8 +327,8 @@
}
}
// Right aligned menus need alt position
// Right aligned menus need alt position
.navbar .pull-right .dropdown-menu,
.navbar .pull-right
> li >
.dropdown-menu,
.navbar .dropdown-menu.pull-right {
.navbar .
nav > li > .
dropdown-menu.pull-right {
left: auto;
left: auto;
right: 0;
right: 0;
&:before {
&:before {
...
...
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