Skip to content
GitLab
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
1683669e
Commit
1683669e
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Remove .nav-list given new .list-group
parent
2a9604fd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/_includes/docs-nav.html
+0
-1
docs/_includes/docs-nav.html
docs/assets/css/bootstrap.css
+1
-25
docs/assets/css/bootstrap.css
docs/docs.html
+6
-23
docs/docs.html
less/badges.less
+1
-1
less/badges.less
less/navs.less
+0
-24
less/navs.less
with
8 additions
and
74 deletions
+8
-74
docs/_includes/docs-nav.html
+
0
-
1
View file @
1683669e
...
...
@@ -107,7 +107,6 @@
<ul
class=
"nav"
>
<li><a
href=
"#nav-tabs"
>
Tabs nav
</a></li>
<li><a
href=
"#nav-pills"
>
Pills nav
</a></li>
<li><a
href=
"#nav-list"
>
List nav
</a></li>
<li><a
href=
"#nav-justified"
>
Justified nav
</a></li>
<li><a
href=
"#nav-disabled-links"
>
Disabled links
</a></li>
<li><a
href=
"#nav-alignment"
>
Alignment options
</a></li>
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
1
-
25
View file @
1683669e
...
...
@@ -3267,30 +3267,6 @@ button.close {
text-align
:
center
;
}
.nav-list
>
li
>
a
{
margin-bottom
:
-1px
;
border
:
1px
solid
#e5e5e5
;
}
.nav-list
>
li
:first-child
>
a
{
border-top-right-radius
:
4px
;
border-top-left-radius
:
4px
;
}
.nav-list
>
li
:last-child
>
a
{
border-bottom-right-radius
:
4px
;
border-bottom-left-radius
:
4px
;
}
.nav-list
>
.active
>
a
,
.nav-list
>
.active
>
a
:hover
,
.nav-list
>
.active
>
a
:focus
{
z-index
:
2
;
color
:
#fff
;
background-color
:
#428bca
;
border-color
:
#428bca
;
}
.nav
>
.disabled
>
a
{
color
:
#999999
;
}
...
...
@@ -4803,7 +4779,7 @@ a.badge:focus {
top
:
0
;
}
.nav-list
>
.active
>
a
>
.badge
,
a
.list-group-item
.active
>
.badge
,
.nav-pills
>
.active
>
a
>
.badge
{
color
:
#428bca
;
background-color
:
#fff
;
...
...
This diff is collapsed.
Click to expand it.
docs/docs.html
+
6
-
23
View file @
1683669e
...
...
@@ -2509,7 +2509,7 @@ For example, <code><section></code> should be wrapped as inline.
<h4>
Navigation
</h4>
<div
class=
"bs-docs-example"
>
<ul
class=
"nav nav-
list
"
>
<ul
class=
"nav nav-
pills nav-stacked
"
>
<li
class=
"active"
><a
href=
"#"
><span
class=
"glyphicon glyphicon-home"
></span>
Home
</a></li>
<li><a
href=
"#"
><span
class=
"glyphicon glyphicon-book"
></span>
Library
</a></li>
<li><a
href=
"#"
><span
class=
"glyphicon glyphicon-pencil"
></span>
Applications
</a></li>
...
...
@@ -2517,7 +2517,7 @@ For example, <code><section></code> should be wrapped as inline.
</ul>
</div>
<!-- /bs-docs-example -->
{% highlight html linenos %}
<ul
class=
"nav nav-
list
"
>
<ul
class=
"nav nav-
pills nav-stacked
"
>
<li
class=
"active"
><a
href=
"#"
><span
class=
"glyphicon glyphicon-home"
></span>
Home
</a></li>
<li><a
href=
"#"
><span
class=
"glyphicon glyphicon-book"
></span>
Library
</a></li>
<li><a
href=
"#"
><span
class=
"glyphicon glyphicon-pencil"
></span>
Applications
</a></li>
...
...
@@ -3094,23 +3094,6 @@ For example, <code><section></code> should be wrapped as inline.
<li><a
href=
"#"
>
Profile
</a></li>
<li><a
href=
"#"
>
Messages
</a></li>
</ul>
{% endhighlight %}
<h2
id=
"nav-list"
>
List
</h2>
<p>
Swap the tabs class for
<code>
.nav-list
</code>
.
</p>
<div
class=
"bs-docs-example"
>
<ul
class=
"nav nav-list"
style=
"max-width: 300px;"
>
<li
class=
"active"
><a
href=
"#"
>
Home
</a></li>
<li><a
href=
"#"
>
Profile
</a></li>
<li><a
href=
"#"
>
Messages
</a></li>
</ul>
</div>
{% highlight html linenos %}
<ul
class=
"nav nav-list"
>
<li
class=
"active"
><a
href=
"#"
>
Home
</a></li>
<li><a
href=
"#"
>
Profile
</a></li>
<li><a
href=
"#"
>
Messages
</a></li>
</ul>
{% endhighlight %}
<h2
id=
"nav-pills"
>
Pills
</h2>
...
...
@@ -3889,7 +3872,7 @@ For example, <code><section></code> should be wrapped as inline.
<li><a
href=
"#"
>
Messages
<span
class=
"badge"
>
3
</span></a></li>
</ul>
<br>
<ul
class=
"nav nav-
list
"
style=
"max-width: 260px;"
>
<ul
class=
"nav nav-
pills nav-stacked
"
style=
"max-width: 260px;"
>
<li
class=
"active"
>
<a
href=
"#"
>
<span
class=
"badge pull-right"
>
42
</span>
...
...
@@ -4510,15 +4493,15 @@ For example, <code><section></code> should be wrapped as inline.
<div
class=
"list-group"
>
<a
href=
"#"
class=
"list-group-item active"
>
<h4
class=
"list-group-item-heading"
>
List group item heading
</h4>
<p
class=
"list-group-item-text"
>
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit
sit amet non magna
.
</p>
<p
class=
"list-group-item-text"
>
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
</p>
</a>
<a
href=
"#"
class=
"list-group-item"
>
<h4
class=
"list-group-item-heading"
>
List group item heading
</h4>
<p
class=
"list-group-item-text"
>
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit
sit amet non magna
.
</p>
<p
class=
"list-group-item-text"
>
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
</p>
</a>
<a
href=
"#"
class=
"list-group-item"
>
<h4
class=
"list-group-item-heading"
>
List group item heading
</h4>
<p
class=
"list-group-item-text"
>
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit
sit amet non magna
.
</p>
<p
class=
"list-group-item-text"
>
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
</p>
</a>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
less/badges.less
+
1
-
1
View file @
1683669e
...
...
@@ -48,7 +48,7 @@ a.badge {
}
// Account for counters in navs
.nav-list >
.active >
a >
.badge,
a.list-group-item
.active > .badge,
.nav-pills > .active > a > .badge {
color: @link-color;
background-color: #fff;
...
...
This diff is collapsed.
Click to expand it.
less/navs.less
+
0
-
24
View file @
1683669e
...
...
@@ -117,30 +117,6 @@
text-align: center;
}
// Lists
// -------------------------
.nav-list > li > a {
margin-bottom: -1px; // pull up the following link for a 1px border between
border: 1px solid #e5e5e5;
}
.nav-list > li:first-child > a {
border-top-left-radius: @border-radius-base;
border-top-right-radius: @border-radius-base;
}
.nav-list > li:last-child > a {
border-bottom-left-radius: @border-radius-base;
border-bottom-right-radius: @border-radius-base;
}
.nav-list > .active > a,
.nav-list > .active > a:hover,
.nav-list > .active > a:focus {
z-index: 2; // Bring active item forward so border sits on top of next element
color: #fff;
background-color: @link-color;
border-color: @link-color;
}
// Nav states and addons
...
...
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