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
af96da6e
Commit
af96da6e
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
adding white sprites
parent
b260544d
4 merge requests
!1475
2.0 wip
,
!1403
warningText and warningBackground docs fix
,
!1351
2.0 wip - relative font sizes
,
!1315
[2.0-wip] Fix mustache glob when building
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
bootstrap.css
+4
-1
bootstrap.css
bootstrap.min.css
+1
-0
bootstrap.min.css
docs/assets/img/glyphicons-halflings-sprite-white.png
+0
-0
docs/assets/img/glyphicons-halflings-sprite-white.png
docs/assets/img/glyphicons-halflings-sprite.png
+0
-0
docs/assets/img/glyphicons-halflings-sprite.png
docs/base-css.html
+1
-1
docs/base-css.html
docs/templates/pages/base-css.mustache
+1
-1
docs/templates/pages/base-css.mustache
lib/sprites.less
+3
-0
lib/sprites.less
with
10 additions
and
3 deletions
+10
-3
bootstrap.css
+
4
-
1
View file @
af96da6e
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Jan 26 1
5:39:24
PST 2012
* Date: Thu Jan 26 1
6:26:33
PST 2012
*/
*/
article
,
article
,
aside
,
aside
,
...
@@ -1074,6 +1074,9 @@ table .span12 {
...
@@ -1074,6 +1074,9 @@ table .span12 {
width
:
14px
;
width
:
14px
;
height
:
14px
;
height
:
14px
;
}
}
.icon.white
{
background-image
:
url(docs/assets/img/glyphicons-halflings-sprite-white.png)
;
}
.glass
{
.glass
{
background-position
:
0
0
;
background-position
:
0
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
1
-
0
View file @
af96da6e
...
@@ -208,6 +208,7 @@ table .span10{float:none;width:764px;margin-left:0;}
...
@@ -208,6 +208,7 @@ table .span10{float:none;width:764px;margin-left:0;}
table
.span11
{
float
:
none
;
width
:
844px
;
margin-left
:
0
;}
table
.span11
{
float
:
none
;
width
:
844px
;
margin-left
:
0
;}
table
.span12
{
float
:
none
;
width
:
924px
;
margin-left
:
0
;}
table
.span12
{
float
:
none
;
width
:
924px
;
margin-left
:
0
;}
.icon
{
background-image
:
url(docs/assets/img/glyphicons-halflings-sprite.png)
;
background-position
:
0
0
;
background-repeat
:
no-repeat
;
display
:
inline-block
;
vertical-align
:
text-top
;
width
:
14px
;
height
:
14px
;}
.icon
{
background-image
:
url(docs/assets/img/glyphicons-halflings-sprite.png)
;
background-position
:
0
0
;
background-repeat
:
no-repeat
;
display
:
inline-block
;
vertical-align
:
text-top
;
width
:
14px
;
height
:
14px
;}
.icon.white
{
background-image
:
url(docs/assets/img/glyphicons-halflings-sprite-white.png)
;}
.glass
{
background-position
:
0
0
;}
.glass
{
background-position
:
0
0
;}
.music
{
background-position
:
-24px
0
;}
.music
{
background-position
:
-24px
0
;}
.search
{
background-position
:
-48px
0
;}
.search
{
background-position
:
-48px
0
;}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/img/glyphicons-halflings-sprite-white.png
0 → 100644
+
0
-
0
View file @
af96da6e
13.2 KB
This diff is collapsed.
Click to expand it.
docs/assets/img/glyphicons-halflings-sprite.png
+
0
-
0
View replaced file @
b260544d
View file @
af96da6e
5.13 KB
|
W:
0px
|
H:
0px
13.8 KB
|
W:
0px
|
H:
0px
2-up
Swipe
Onion skin
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
1
-
1
View file @
af96da6e
...
@@ -1482,7 +1482,7 @@
...
@@ -1482,7 +1482,7 @@
<p>
Or, use them in navigation.
</p>
<p>
Or, use them in navigation.
</p>
<div
class=
"well"
style=
"padding: 8px 0;"
>
<div
class=
"well"
style=
"padding: 8px 0;"
>
<ul
class=
"nav list"
>
<ul
class=
"nav list"
>
<li
class=
"active"
><a
href=
"#"
><i
class=
"icon home"
></i>
Home
</a></li>
<li
class=
"active"
><a
href=
"#"
><i
class=
"icon
white
home"
></i>
Home
</a></li>
<li><a
href=
"#"
><i
class=
"icon book"
></i>
Library
</a></li>
<li><a
href=
"#"
><i
class=
"icon book"
></i>
Library
</a></li>
<li><a
href=
"#"
><i
class=
"icon pencil"
></i>
Applications
</a></li>
<li><a
href=
"#"
><i
class=
"icon pencil"
></i>
Applications
</a></li>
</ul>
</ul>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
1
-
1
View file @
af96da6e
...
@@ -1417,7 +1417,7 @@
...
@@ -1417,7 +1417,7 @@
<p>
{{
_i
}}
Or, use them in navigation.
{{/
i
}}
</p>
<p>
{{
_i
}}
Or, use them in navigation.
{{/
i
}}
</p>
<div
class=
"well"
style=
"padding: 8px 0;"
>
<div
class=
"well"
style=
"padding: 8px 0;"
>
<ul
class=
"nav list"
>
<ul
class=
"nav list"
>
<li
class=
"active"
><a
href=
"#"
><i
class=
"icon home"
></i>
{{
_i
}}
Home
{{/
i
}}
</a></li>
<li
class=
"active"
><a
href=
"#"
><i
class=
"icon
white
home"
></i>
{{
_i
}}
Home
{{/
i
}}
</a></li>
<li><a
href=
"#"
><i
class=
"icon book"
></i>
{{
_i
}}
Library
{{/
i
}}
</a></li>
<li><a
href=
"#"
><i
class=
"icon book"
></i>
{{
_i
}}
Library
{{/
i
}}
</a></li>
<li><a
href=
"#"
><i
class=
"icon pencil"
></i>
{{
_i
}}
Applications
{{/
i
}}
</a></li>
<li><a
href=
"#"
><i
class=
"icon pencil"
></i>
{{
_i
}}
Applications
{{/
i
}}
</a></li>
</ul>
</ul>
...
...
This diff is collapsed.
Click to expand it.
lib/sprites.less
+
3
-
0
View file @
af96da6e
...
@@ -20,6 +20,9 @@
...
@@ -20,6 +20,9 @@
width: 14px;
width: 14px;
height: 14px;
height: 14px;
}
}
.icon.white {
background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
}
.glass { background-position: 0 0; }
.glass { background-position: 0 0; }
.music { background-position: -24px 0; }
.music { background-position: -24px 0; }
...
...
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