Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <jacobthornton@gmail.com>2012-01-27 10:39:17 +0400
committerJacob Thornton <jacobthornton@gmail.com>2012-01-27 10:39:17 +0400
commit815a2ae9f26f49137382fd4b186d174c7b1b8c5b (patch)
treed8aaabd8c4a4c469428838abdb684b5c1388c32f
parenta25f0cce95bc538f3aa19e9edf17ac3a353e334e (diff)
rebuild + copy images to docs when making
-rw-r--r--Makefile1
-rw-r--r--docs/assets/css/bootstrap.css6
-rw-r--r--docs/assets/img/glyphicons-halflings-sprite-white.pngbin0 -> 13566 bytes
-rw-r--r--docs/assets/img/glyphicons-halflings-sprite.pngbin0 -> 14152 bytes
-rw-r--r--less/sprites.less4
5 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 127d6affe0..f2213103aa 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ build:
lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
node docs/build; \
+ cp img/* docs/assets/img/; \
echo "Bootstrap successfully built! - `date`"; \
else \
echo "You must have the LESS compiler installed in order to build Bootstrap."; \
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cd7268bb77..68e161051b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Jan 26 22:05:04 PST 2012
+ * Date: Thu Jan 26 22:39:03 PST 2012
*/
article,
aside,
@@ -1066,7 +1066,7 @@ table .span12 {
margin-left: 0;
}
.icon {
- background-image: url(img/glyphicons-halflings-sprite.png);
+ background-image: url(../img/glyphicons-halflings-sprite.png);
background-position: 0 0;
background-repeat: no-repeat;
display: inline-block;
@@ -1075,7 +1075,7 @@ table .span12 {
height: 14px;
}
.icon.white {
- background-image: url(img/glyphicons-halflings-sprite-white.png);
+ background-image: url(../img/glyphicons-halflings-sprite-white.png);
}
.icon.glass {
background-position: 0 0;
diff --git a/docs/assets/img/glyphicons-halflings-sprite-white.png b/docs/assets/img/glyphicons-halflings-sprite-white.png
new file mode 100644
index 0000000000..a92b1913a2
--- /dev/null
+++ b/docs/assets/img/glyphicons-halflings-sprite-white.png
Binary files differ
diff --git a/docs/assets/img/glyphicons-halflings-sprite.png b/docs/assets/img/glyphicons-halflings-sprite.png
new file mode 100644
index 0000000000..b4e0acfbc1
--- /dev/null
+++ b/docs/assets/img/glyphicons-halflings-sprite.png
Binary files differ
diff --git a/less/sprites.less b/less/sprites.less
index c3b4206656..599434b2bc 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -12,7 +12,7 @@
// will look like <i class="inbox"></i>.
.icon {
- background-image: url(img/glyphicons-halflings-sprite.png);
+ background-image: url(../img/glyphicons-halflings-sprite.png);
background-position: 0 0;
background-repeat: no-repeat;
display: inline-block;
@@ -21,7 +21,7 @@
height: 14px;
}
.icon.white {
- background-image: url(img/glyphicons-halflings-sprite-white.png);
+ background-image: url(../img/glyphicons-halflings-sprite-white.png);
}
.icon.glass { background-position: 0 0; }