Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
	shamrock/index.html

diff --git a/.gitignore b/.gitignore
index 05aa84c..255ba43 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 components
 node_modules
 build
+/CNAME\r
+/CNAME\r

diff --git a/CNAME b/CNAME
deleted file mode 100644 (file)
index cd527f5..0000000
--- a/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-bootswatch.com
\ No newline at end of file

diff --git a/amelia/index.html b/amelia/index.html
index e1de4ef..71708c7 100755 (executable)
--- a/amelia/index.html
+++ b/amelia/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/cerulean/index.html b/cerulean/index.html
index 1b82cd3..cee8c89 100755 (executable)
--- a/cerulean/index.html
+++ b/cerulean/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/cosmo/index.html b/cosmo/index.html
index 0cb4c97..592bcf3 100755 (executable)
--- a/cosmo/index.html
+++ b/cosmo/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/cyborg/index.html b/cyborg/index.html
index fa88319..f484398 100755 (executable)
--- a/cyborg/index.html
+++ b/cyborg/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/default/index.html b/default/index.html
index b8ad0ac..746974f 100755 (executable)
--- a/default/index.html
+++ b/default/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/index.html b/index.html
index d5a1726..abc7414 100644 (file)
--- a/index.html
+++ b/index.html
@@ -60,6 +60,7 @@
                                                                <li><a href="cyborg">Cyborg</a></li>
                                                                <li><a href="journal">Journal</a></li>
                                                                <li><a href="readable">Readable</a></li>
+                                <li><a href="shamrock">Shamrock</a></li>
                                                                <li><a href="simplex">Simplex</a></li>
                                                                <li><a href="slate">Slate</a></li>
                                                                <li><a href="spacelab">Spacelab</a></li>

diff --git a/journal/index.html b/journal/index.html
index 2d96293..104e61c 100755 (executable)
--- a/journal/index.html
+++ b/journal/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/readable/index.html b/readable/index.html
index c72410e..6dc76ee 100755 (executable)
--- a/readable/index.html
+++ b/readable/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/simplex/index.html b/simplex/index.html
index aa31d2f..b2e2e42 100755 (executable)
--- a/simplex/index.html
+++ b/simplex/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/slate/index.html b/slate/index.html
index 188fcd5..66c9c17 100755 (executable)
--- a/slate/index.html
+++ b/slate/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/spacelab/index.html b/spacelab/index.html
index da214ef..5884936 100755 (executable)
--- a/spacelab/index.html
+++ b/spacelab/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/spruce/index.html b/spruce/index.html
index 775bd8e..8372fde 100755 (executable)
--- a/spruce/index.html
+++ b/spruce/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/superhero/index.html b/superhero/index.html
index baf9157..2d66311 100755 (executable)
--- a/superhero/index.html
+++ b/superhero/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>

diff --git a/united/index.html b/united/index.html
index 22f4b59..d402758 100755 (executable)
--- a/united/index.html
+++ b/united/index.html
@@ -64,6 +64,7 @@
               <li><a href="../cyborg">Cyborg</a></li>
               <li><a href="../journal">Journal</a></li>
               <li><a href="../readable">Readable</a></li>
+              <li><a href="../shamrock">Shamrock</a></li>
               <li><a href="../simplex">Simplex</a></li>
               <li><a href="../slate">Slate</a></li>
               <li><a href="../spacelab">Spacelab</a></li>