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
4b81c0df
Commit
4b81c0df
authored
Apr 05, 2012
by
Bryan Petty
Committed by
Bryan Petty
Apr 05, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed .nav-collapse to clear both instead of left, and added compiled files.
parent
030265ea
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
110 additions
and
89 deletions
+110
-89
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
+0
-0
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap-responsive.css
+30
-19
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+79
-69
less/responsive-navbar.less
less/responsive-navbar.less
+1
-1
No files found.
docs/assets/bootstrap.zip
View file @
4b81c0df
No preview for this file type
docs/assets/css/bootstrap-responsive.css
View file @
4b81c0df
...
@@ -619,27 +619,27 @@
...
@@ -619,27 +619,27 @@
margin
:
0
0
0
-5px
;
margin
:
0
0
0
-5px
;
}
}
.navbar
.nav-collapse
{
.navbar
.nav-collapse
{
clear
:
left
;
clear
:
both
;
}
}
.navbar
.nav
{
.navbar
.nav
-collapse
.nav
{
float
:
none
;
float
:
none
;
margin
:
0
0
9px
;
margin
:
0
0
9px
;
}
}
.navbar
.nav
>
li
{
.navbar
.nav
-collapse
.nav
>
li
{
float
:
none
;
float
:
none
;
}
}
.navbar
.nav
>
li
>
a
{
.navbar
.nav
-collapse
.nav
>
li
>
a
{
margin-bottom
:
2px
;
margin-bottom
:
2px
;
}
}
.navbar
.nav
>
.divider-vertical
{
.navbar
.nav
-collapse
.nav
>
.divider-vertical
{
display
:
none
;
display
:
none
;
}
}
.navbar
.nav
.nav-header
{
.navbar
.nav
-collapse
.nav
.nav-header
{
color
:
#999999
;
color
:
#999999
;
text-shadow
:
none
;
text-shadow
:
none
;
}
}
.navbar
.nav
>
li
>
a
,
.navbar
.nav
-collapse
.nav
>
li
>
a
,
.navbar
.dropdown-menu
a
{
.navbar
.
nav-collapse
.
dropdown-menu
a
{
padding
:
6px
15px
;
padding
:
6px
15px
;
font-weight
:
bold
;
font-weight
:
bold
;
color
:
#999999
;
color
:
#999999
;
...
@@ -647,14 +647,25 @@
...
@@ -647,14 +647,25 @@
-moz-border-radius
:
3px
;
-moz-border-radius
:
3px
;
border-radius
:
3px
;
border-radius
:
3px
;
}
}
.navbar
.dropdown-menu
li
+
li
a
{
.navbar
.nav-collapse
.btn
{
padding
:
4px
10px
4px
;
font-weight
:
normal
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
}
.navbar
.nav-collapse
.dropdown-menu
li
+
li
a
{
margin-bottom
:
2px
;
margin-bottom
:
2px
;
}
}
.navbar
.nav
>
li
>
a
:hover
,
.navbar
.nav
-collapse
.nav
>
li
>
a
:hover
,
.navbar
.dropdown-menu
a
:hover
{
.navbar
.
nav-collapse
.
dropdown-menu
a
:hover
{
background-color
:
#222222
;
background-color
:
#222222
;
}
}
.navbar
.dropdown-menu
{
.navbar
.nav-collapse.in
.btn-group
{
margin-top
:
5px
;
padding
:
0
;
}
.navbar
.nav-collapse
.dropdown-menu
{
position
:
static
;
position
:
static
;
top
:
auto
;
top
:
auto
;
left
:
auto
;
left
:
auto
;
...
@@ -672,15 +683,15 @@
...
@@ -672,15 +683,15 @@
-moz-box-shadow
:
none
;
-moz-box-shadow
:
none
;
box-shadow
:
none
;
box-shadow
:
none
;
}
}
.navbar
.dropdown-menu
:before
,
.navbar
.
nav-collapse
.
dropdown-menu
:before
,
.navbar
.dropdown-menu
:after
{
.navbar
.
nav-collapse
.
dropdown-menu
:after
{
display
:
none
;
display
:
none
;
}
}
.navbar
.dropdown-menu
.divider
{
.navbar
.
nav-collapse
.
dropdown-menu
.divider
{
display
:
none
;
display
:
none
;
}
}
.navbar-form
,
.nav
-collapse
.nav
bar-form
,
.navbar-search
{
.nav
-collapse
.nav
bar-search
{
float
:
none
;
float
:
none
;
padding
:
9px
15px
;
padding
:
9px
15px
;
margin
:
9px
0
;
margin
:
9px
0
;
...
@@ -690,7 +701,7 @@
...
@@ -690,7 +701,7 @@
-moz-box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.1
);
-moz-box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.1
);
box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.1
);
box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.1
);
}
}
.navbar
.nav.pull-right
{
.navbar
.nav
-collapse
.nav
.pull-right
{
float
:
none
;
float
:
none
;
margin-left
:
0
;
margin-left
:
0
;
}
}
...
@@ -698,7 +709,7 @@
...
@@ -698,7 +709,7 @@
padding-left
:
10px
;
padding-left
:
10px
;
padding-right
:
10px
;
padding-right
:
10px
;
}
}
.btn-navbar
{
.
navbar
.
btn-navbar
{
display
:
block
;
display
:
block
;
}
}
.nav-collapse
,
.nav-collapse
,
...
...
docs/assets/css/bootstrap.css
View file @
4b81c0df
...
@@ -2752,14 +2752,14 @@ input[type="submit"].btn.btn-mini {
...
@@ -2752,14 +2752,14 @@ input[type="submit"].btn.btn-mini {
}
}
.nav-tabs
.open
.dropdown-toggle
,
.nav-tabs
.open
.dropdown-toggle
,
.nav-pills
.open
.dropdown-toggle
,
.nav-pills
.open
.dropdown-toggle
,
.nav
>
.open.active
>
a
:hover
{
.nav
>
li
.dropdown
.open.active
>
a
:hover
{
color
:
#ffffff
;
color
:
#ffffff
;
background-color
:
#999999
;
background-color
:
#999999
;
border-color
:
#999999
;
border-color
:
#999999
;
}
}
.nav
.open
.caret
,
.nav
li
.dropdown
.open
.caret
,
.nav
.open.active
.caret
,
.nav
li
.dropdown
.open.active
.caret
,
.nav
.open
a
:hover
.caret
{
.nav
li
.dropdown
.open
a
:hover
.caret
{
border-top-color
:
#ffffff
;
border-top-color
:
#ffffff
;
border-bottom-color
:
#ffffff
;
border-bottom-color
:
#ffffff
;
opacity
:
1
;
opacity
:
1
;
...
@@ -2892,58 +2892,6 @@ input[type="submit"].btn.btn-mini {
...
@@ -2892,58 +2892,6 @@ input[type="submit"].btn.btn-mini {
.navbar
.container
{
.navbar
.container
{
width
:
auto
;
width
:
auto
;
}
}
.btn-navbar
{
display
:
none
;
float
:
right
;
padding
:
7px
10px
;
margin-left
:
5px
;
margin-right
:
5px
;
background-color
:
#2c2c2c
;
background-image
:
-moz-linear-gradient
(
top
,
#333333
,
#222222
);
background-image
:
-ms-linear-gradient
(
top
,
#333333
,
#222222
);
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#333333
),
to
(
#222222
));
background-image
:
-webkit-linear-gradient
(
top
,
#333333
,
#222222
);
background-image
:
-o-linear-gradient
(
top
,
#333333
,
#222222
);
background-image
:
linear-gradient
(
top
,
#333333
,
#222222
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#333333'
,
endColorstr
=
'#222222'
,
GradientType
=
0
);
border-color
:
#222222
#222222
#000000
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.25
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
enabled
=
false
);
*
background-color
:
#222222
;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */
-webkit-box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.075
);
-moz-box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.075
);
box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.075
);
}
.btn-navbar
:hover
,
.btn-navbar
:active
,
.btn-navbar.active
,
.btn-navbar.disabled
,
.btn-navbar
[
disabled
]
{
background-color
:
#222222
;
*
background-color
:
#151515
;
}
.btn-navbar
:active
,
.btn-navbar.active
{
background-color
:
#080808
\
9
;
}
.btn-navbar
.icon-bar
{
display
:
block
;
width
:
18px
;
height
:
2px
;
background-color
:
#f5f5f5
;
-webkit-border-radius
:
1px
;
-moz-border-radius
:
1px
;
border-radius
:
1px
;
-webkit-box-shadow
:
0
1px
0
rgba
(
0
,
0
,
0
,
0.25
);
-moz-box-shadow
:
0
1px
0
rgba
(
0
,
0
,
0
,
0.25
);
box-shadow
:
0
1px
0
rgba
(
0
,
0
,
0
,
0.25
);
}
.btn-navbar
.icon-bar
+
.icon-bar
{
margin-top
:
3px
;
}
.nav-collapse.collapse
{
.nav-collapse.collapse
{
height
:
auto
;
height
:
auto
;
}
}
...
@@ -3107,6 +3055,16 @@ input[type="submit"].btn.btn-mini {
...
@@ -3107,6 +3055,16 @@ input[type="submit"].btn.btn-mini {
text-decoration
:
none
;
text-decoration
:
none
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
}
}
.navbar
.btn
{
display
:
inline-block
;
padding
:
4px
10px
4px
;
margin
:
5px
5px
6px
;
line-height
:
18px
;
}
.navbar
.btn-group
{
margin
:
0
;
padding
:
5px
5px
6px
;
}
.navbar
.nav
>
li
>
a
:hover
{
.navbar
.nav
>
li
>
a
:hover
{
background-color
:
transparent
;
background-color
:
transparent
;
color
:
#ffffff
;
color
:
#ffffff
;
...
@@ -3130,6 +3088,58 @@ input[type="submit"].btn.btn-mini {
...
@@ -3130,6 +3088,58 @@ input[type="submit"].btn.btn-mini {
margin-left
:
10px
;
margin-left
:
10px
;
margin-right
:
0
;
margin-right
:
0
;
}
}
.navbar
.btn-navbar
{
display
:
none
;
float
:
right
;
padding
:
7px
10px
;
margin-left
:
5px
;
margin-right
:
5px
;
background-color
:
#2c2c2c
;
background-image
:
-moz-linear-gradient
(
top
,
#333333
,
#222222
);
background-image
:
-ms-linear-gradient
(
top
,
#333333
,
#222222
);
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#333333
),
to
(
#222222
));
background-image
:
-webkit-linear-gradient
(
top
,
#333333
,
#222222
);
background-image
:
-o-linear-gradient
(
top
,
#333333
,
#222222
);
background-image
:
linear-gradient
(
top
,
#333333
,
#222222
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#333333'
,
endColorstr
=
'#222222'
,
GradientType
=
0
);
border-color
:
#222222
#222222
#000000
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.25
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
enabled
=
false
);
*
background-color
:
#222222
;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */
-webkit-box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.075
);
-moz-box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.075
);
box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.1
),
0
1px
0
rgba
(
255
,
255
,
255
,
.075
);
}
.navbar
.btn-navbar
:hover
,
.navbar
.btn-navbar
:active
,
.navbar
.btn-navbar.active
,
.navbar
.btn-navbar.disabled
,
.navbar
.btn-navbar
[
disabled
]
{
background-color
:
#222222
;
*
background-color
:
#151515
;
}
.navbar
.btn-navbar
:active
,
.navbar
.btn-navbar.active
{
background-color
:
#080808
\
9
;
}
.navbar
.btn-navbar
.icon-bar
{
display
:
block
;
width
:
18px
;
height
:
2px
;
background-color
:
#f5f5f5
;
-webkit-border-radius
:
1px
;
-moz-border-radius
:
1px
;
border-radius
:
1px
;
-webkit-box-shadow
:
0
1px
0
rgba
(
0
,
0
,
0
,
0.25
);
-moz-box-shadow
:
0
1px
0
rgba
(
0
,
0
,
0
,
0.25
);
box-shadow
:
0
1px
0
rgba
(
0
,
0
,
0
,
0.25
);
}
.btn-navbar
.icon-bar
+
.icon-bar
{
margin-top
:
3px
;
}
.navbar
.dropdown-menu
:before
{
.navbar
.dropdown-menu
:before
{
content
:
''
;
content
:
''
;
display
:
inline-block
;
display
:
inline-block
;
...
@@ -3164,35 +3174,35 @@ input[type="submit"].btn.btn-mini {
...
@@ -3164,35 +3174,35 @@ input[type="submit"].btn.btn-mini {
bottom
:
-6px
;
bottom
:
-6px
;
top
:
auto
;
top
:
auto
;
}
}
.navbar
.nav
.dropdown-toggle
.caret
,
.navbar
.nav
li
.dropdown
.dropdown-toggle
.caret
,
.navbar
.nav
.open
.caret
{
.navbar
.nav
li
.dropdown
.open
.caret
{
border-top-color
:
#ffffff
;
border-top-color
:
#ffffff
;
border-bottom-color
:
#ffffff
;
border-bottom-color
:
#ffffff
;
}
}
.navbar
.nav
.active
.caret
{
.navbar
.nav
li
.dropdown
.active
.caret
{
opacity
:
1
;
opacity
:
1
;
filter
:
alpha
(
opacity
=
100
);
filter
:
alpha
(
opacity
=
100
);
}
}
.navbar
.nav
.open
>
.dropdown-toggle
,
.navbar
.nav
li
.dropdown
.open
>
.dropdown-toggle
,
.navbar
.nav
.active
>
.dropdown-toggle
,
.navbar
.nav
li
.dropdown
.active
>
.dropdown-toggle
,
.navbar
.nav
.open.active
>
.dropdown-toggle
{
.navbar
.nav
li
.dropdown
.open.active
>
.dropdown-toggle
{
background-color
:
transparent
;
background-color
:
transparent
;
}
}
.navbar
.nav
.active
>
.dropdown-toggle
:hover
{
.navbar
.nav
li
.dropdown
.active
>
.dropdown-toggle
:hover
{
color
:
#ffffff
;
color
:
#ffffff
;
}
}
.navbar
.
nav.
pull-right
.dropdown-menu
,
.navbar
.pull-right
.dropdown-menu
,
.navbar
.
nav
.
dropdown-menu.pull-right
{
.navbar
.dropdown-menu.pull-right
{
left
:
auto
;
left
:
auto
;
right
:
0
;
right
:
0
;
}
}
.navbar
.
nav.
pull-right
.dropdown-menu
:before
,
.navbar
.pull-right
.dropdown-menu
:before
,
.navbar
.
nav
.
dropdown-menu.pull-right
:before
{
.navbar
.dropdown-menu.pull-right
:before
{
left
:
auto
;
left
:
auto
;
right
:
12px
;
right
:
12px
;
}
}
.navbar
.
nav.
pull-right
.dropdown-menu
:after
,
.navbar
.pull-right
.dropdown-menu
:after
,
.navbar
.
nav
.
dropdown-menu.pull-right
:after
{
.navbar
.dropdown-menu.pull-right
:after
{
left
:
auto
;
left
:
auto
;
right
:
13px
;
right
:
13px
;
}
}
...
...
less/responsive-navbar.less
View file @
4b81c0df
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
}
}
// Nav collapse clears brand
// Nav collapse clears brand
.navbar .nav-collapse {
.navbar .nav-collapse {
clear:
left
;
clear:
both
;
}
}
// Block-level the nav
// Block-level the nav
.navbar .nav-collapse .nav {
.navbar .nav-collapse .nav {
...
...
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