projects
/
kraken-ui.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
5217bad
)
Moves bootstrap into its own folder.
author
dsc
<dsc@less.ly>
Wed, 22 Feb 2012 23:20:49 +0000 (15:20 -0800)
committer
dsc
<dsc@less.ly>
Wed, 22 Feb 2012 23:22:50 +0000 (15:22 -0800)
static/vendor/bootstrap
[new symlink]
patch
|
blob
static/vendor/bootstrap-2.0.1/bootstrap.js
[moved from
static/vendor/bootstrap-2.0.1.js
with 100% similarity]
patch
|
blob
|
history
static/vendor/bootstrap-2.0.1/bootstrap.min.js
[moved from
static/vendor/bootstrap-2.0.1.min.js
with 100% similarity]
patch
|
blob
|
history
static/vendor/bootstrap-2.0.1/css/bootstrap-responsive.css
[moved from
static/css/bootstrap-responsive.css
with 100% similarity]
patch
|
blob
|
history
static/vendor/bootstrap-2.0.1/css/bootstrap-responsive.min.css
[moved from
static/css/bootstrap-responsive.min.css
with 100% similarity]
patch
|
blob
|
history
static/vendor/bootstrap-2.0.1/css/bootstrap.css
[moved from
static/css/bootstrap.css
with 100% similarity]
patch
|
blob
|
history
static/vendor/bootstrap-2.0.1/css/bootstrap.min.css
[moved from
static/css/bootstrap.min.css
with 100% similarity]
patch
|
blob
|
history
static/vendor/bootstrap-2.0.1/img/glyphicons-halflings-white.png
[moved from
static/img/glyphicons-halflings-white.png
with 100% similarity]
patch
|
blob
|
history
static/vendor/bootstrap-2.0.1/img/glyphicons-halflings.png
[moved from
static/img/glyphicons-halflings.png
with 100% similarity]
patch
|
blob
|
history
static/vendor/bootstrap.js
[deleted symlink]
patch
|
blob
|
history
static/vendor/bootstrap.min.js
[deleted symlink]
patch
|
blob
|
history
diff --git a/static/vendor/bootstrap
b/static/vendor/bootstrap
new file mode 120000
(symlink)
index 0000000..
7eafac9
--- /dev/null
+++ b/
static/vendor/bootstrap
@@ -0,0
+1
@@
+bootstrap-2.0.1
\ No newline at end of file
diff --git
a/static/vendor/bootstrap-2.0.1.js
b/static/vendor/bootstrap-2.0.1/bootstrap.js
similarity index 100%
rename from
static/vendor/bootstrap-2.0.1.js
rename to
static/vendor/bootstrap-2.0.1/bootstrap.js
diff --git
a/static/vendor/bootstrap-2.0.1.min.js
b/static/vendor/bootstrap-2.0.1/bootstrap.min.js
similarity index 100%
rename from
static/vendor/bootstrap-2.0.1.min.js
rename to
static/vendor/bootstrap-2.0.1/bootstrap.min.js
diff --git
a/static/css/bootstrap-responsive.css
b/static/vendor/bootstrap-2.0.1/css/bootstrap-responsive.css
similarity index 100%
rename from
static/css/bootstrap-responsive.css
rename to
static/vendor/bootstrap-2.0.1/css/bootstrap-responsive.css
diff --git
a/static/css/bootstrap-responsive.min.css
b/static/vendor/bootstrap-2.0.1/css/bootstrap-responsive.min.css
similarity index 100%
rename from
static/css/bootstrap-responsive.min.css
rename to
static/vendor/bootstrap-2.0.1/css/bootstrap-responsive.min.css
diff --git
a/static/css/bootstrap.css
b/static/vendor/bootstrap-2.0.1/css/bootstrap.css
similarity index 100%
rename from
static/css/bootstrap.css
rename to
static/vendor/bootstrap-2.0.1/css/bootstrap.css
diff --git
a/static/css/bootstrap.min.css
b/static/vendor/bootstrap-2.0.1/css/bootstrap.min.css
similarity index 100%
rename from
static/css/bootstrap.min.css
rename to
static/vendor/bootstrap-2.0.1/css/bootstrap.min.css
diff --git
a/static/img/glyphicons-halflings-white.png
b/static/vendor/bootstrap-2.0.1/img/glyphicons-halflings-white.png
deleted file mode 120000
(symlink)
index 60d0fa8fd452b448780ca93671d1453423656673..0000000000000000000000000000000000000000
--- a/
static/img/glyphicons-halflings-white.png
+++ /dev/null
@@
-1
+0,0
@@
-bootstrap-2.0.1.js
\ No newline at end of file
diff --git
a/static/img/glyphicons-halflings.png
b/static/vendor/bootstrap-2.0.1/img/glyphicons-halflings.png
deleted file mode 120000
(symlink)
index 092c934a1cbada820380da38c2930de105847497..0000000000000000000000000000000000000000
--- a/
static/img/glyphicons-halflings.png
+++ /dev/null
@@
-1
+0,0
@@
-bootstrap-2.0.1.min.js
\ No newline at end of file
diff --cc static/vendor/bootstrap.js
Simple merge
diff --cc static/vendor/bootstrap.min.js
Simple merge