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
9c72246d
Commit
9c72246d
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from
#3946
parent
f3479a39
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
docs/assets/css/bootstrap-responsive.css
+4
-4
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
+11
-10
docs/assets/css/bootstrap.css
docs/examples/hero.html
+12
-0
docs/examples/hero.html
less/component-animations.less
+1
-0
less/component-animations.less
less/mixins.less
+2
-1
less/mixins.less
less/navbar.less
+2
-2
less/navbar.less
with
32 additions
and
17 deletions
+32
-17
docs/assets/css/bootstrap-responsive.css
+
4
-
4
View file @
9c72246d
...
...
@@ -34,7 +34,7 @@
.input-block-level
{
display
:
block
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
...
@@ -203,7 +203,7 @@
display
:
block
;
float
:
left
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
margin-left
:
2.564102564102564%
;
*
margin-left
:
2.5109110747408616%
;
-webkit-box-sizing
:
border-box
;
...
...
@@ -548,7 +548,7 @@
display
:
block
;
float
:
left
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
margin-left
:
2.7624309392265194%
;
*
margin-left
:
2.709239449864817%
;
-webkit-box-sizing
:
border-box
;
...
...
@@ -830,7 +830,7 @@
.uneditable-input
{
display
:
block
;
width
:
100%
;
min-height
:
28
px
;
min-height
:
30
px
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
11
-
10
View file @
9c72246d
...
...
@@ -150,7 +150,7 @@ textarea {
.input-block-level {
display: block;
width: 100%;
min-height
:
28
px
;
min-height:
30
px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
...
...
@@ -340,7 +340,7 @@ a:hover {
display: block;
float: left;
width: 100%;
min-height
:
28
px
;
min-height:
30
px;
margin-left: 2.127659574468085%;
*margin-left: 2.074468085106383%;
-webkit-box-sizing: border-box;
...
...
@@ -2865,6 +2865,7 @@ table .span24 {
position: relative;
height: 0;
overflow: hidden;
overflow: visible \9;
-webkit-transition: height 0.35s ease;
-moz-transition: height 0.35s ease;
-o-transition: height 0.35s ease;
...
...
@@ -4344,26 +4345,26 @@ input[type="submit"].btn.btn-mini {
border-bottom-color: #555555;
}
.navbar
.pull-right
.dropdown-menu
,
.navbar
.dropdown-menu.pull-right
{
.navbar .pull-right
> li >
.dropdown-menu,
.navbar
.nav > li >
.dropdown-menu.pull-right {
right: 0;
left: auto;
}
.navbar
.pull-right
.dropdown-menu
:before
,
.navbar
.dropdown-menu.pull-right
:before
{
.navbar .pull-right
> li >
.dropdown-menu:before,
.navbar
.nav > li >
.dropdown-menu.pull-right:before {
right: 12px;
left: auto;
}
.navbar
.pull-right
.dropdown-menu
:after
,
.navbar
.dropdown-menu.pull-right
:after
{
.navbar .pull-right
> li >
.dropdown-menu:after,
.navbar
.nav > li >
.dropdown-menu.pull-right:after {
right: 13px;
left: auto;
}
.navbar
.pull-right
.dropdown-menu
.dropdown-menu
,
.navbar
.dropdown-menu.pull-right
.dropdown-menu
{
.navbar .pull-right
> li >
.dropdown-menu .dropdown-menu,
.navbar
.nav > li >
.dropdown-menu.pull-right .dropdown-menu {
right: 100%;
left: auto;
margin-right: -1px;
...
...
This diff is collapsed.
Click to expand it.
docs/examples/hero.html
+
12
-
0
View file @
9c72246d
...
...
@@ -46,6 +46,18 @@
<li
class=
"active"
><a
href=
"#"
>
Home
</a></li>
<li><a
href=
"#about"
>
About
</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>
<form
class=
"navbar-form pull-right"
>
<input
class=
"span2"
type=
"text"
placeholder=
"Email"
>
...
...
This diff is collapsed.
Click to expand it.
less/component-animations.less
+
1
-
0
View file @
9c72246d
...
...
@@ -15,6 +15,7 @@
position: relative;
height: 0;
overflow: hidden;
overflow: visible \9;
.transition(height .35s ease);
&.in {
height: auto;
...
...
This diff is collapsed.
Click to expand it.
less/mixins.less
+
2
-
1
View file @
9c72246d
...
...
@@ -154,11 +154,12 @@
.input-block-level {
display: block;
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
}
// Mixin for form field states
.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
// Set the text color
...
...
This diff is collapsed.
Click to expand it.
less/navbar.less
+
2
-
2
View file @
9c72246d
...
...
@@ -327,8 +327,8 @@
}
// Right aligned menus need alt position
.navbar .pull-right .dropdown-menu,
.navbar .dropdown-menu.pull-right {
.navbar .pull-right
> li >
.dropdown-menu,
.navbar
.nav > li >
.dropdown-menu.pull-right {
left: auto;
right: 0;
&:before {
...
...
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