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
fffb37ec
Commit
fffb37ec
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
parents
30c138c4
3279181f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/bootstrap.css
+2
-6
docs/assets/css/bootstrap.css
docs/components.html
+1
-1
docs/components.html
less/breadcrumbs.less
+2
-5
less/breadcrumbs.less
with
5 additions
and
12 deletions
+5
-12
docs/assets/css/bootstrap.css
+
2
-
6
View file @
fffb37ec
...
@@ -3290,15 +3290,11 @@ button.close {
...
@@ -3290,15 +3290,11 @@ button.close {
text-shadow
:
0
1px
0
#fff
;
text-shadow
:
0
1px
0
#fff
;
}
}
.breadcrumb
>
li
:after
{
.breadcrumb
>
li
+
li
:before
{
display
:
inline-block
;
display
:
inline-block
;
padding
:
0
5px
;
padding
:
0
5px
;
color
:
#ccc
;
color
:
#ccc
;
content
:
"\00a0 /"
;
content
:
"/\00a0"
;
}
.breadcrumb
>
li
:last-child:after
{
display
:
none
;
}
}
.breadcrumb
>
.active
{
.breadcrumb
>
.active
{
...
...
This diff is collapsed.
Click to expand it.
docs/components.html
+
1
-
1
View file @
fffb37ec
...
@@ -1016,7 +1016,7 @@ body { padding-bottom: 70px; }
...
@@ -1016,7 +1016,7 @@ body { padding-bottom: 70px; }
<h1>
Breadcrumbs
<small></small></h1>
<h1>
Breadcrumbs
<small></small></h1>
</div>
</div>
<p
class=
"lead"
>
Indicate the current page's location within a navigational hierarchy.
</p>
<p
class=
"lead"
>
Indicate the current page's location within a navigational hierarchy.
</p>
<p>
Separators are automatically added in CSS through
<code>
:
after
</code>
and
<code>
content
</code>
.
</p>
<p>
Separators are automatically added in CSS through
<code>
:
before
</code>
and
<code>
content
</code>
.
</p>
<div
class=
"bs-example"
>
<div
class=
"bs-example"
>
<ul
class=
"breadcrumb"
>
<ul
class=
"breadcrumb"
>
<li
class=
"active"
>
Home
</li>
<li
class=
"active"
>
Home
</li>
...
...
This diff is collapsed.
Click to expand it.
less/breadcrumbs.less
+
2
-
5
View file @
fffb37ec
...
@@ -12,15 +12,12 @@
...
@@ -12,15 +12,12 @@
> li {
> li {
display: inline-block;
display: inline-block;
text-shadow: 0 1px 0 #fff;
text-shadow: 0 1px 0 #fff;
&
:after
{
&
+li:before
{
display: inline-block;
display: inline-block;
content: "\00a0
/
"; // Unicode space added since inline-block means non-collapsing white-space
content: "
/
\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px;
padding: 0 5px;
color: #ccc;
color: #ccc;
}
}
&:last-child:after {
display: none; // No divider after last element
}
}
}
> .active {
> .active {
color: @gray-light;
color: @gray-light;
...
...
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