aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
-rw-r--r--_scss/base/_bootstrap.scss2
m---------_scss/bootswatch0
3 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 7732959..10ec23d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,7 @@
path = _scss/bootstrap
url = https://github.com/twbs/bootstrap-sass.git
branch = 3.3-stable
+[submodule "bootswatch"]
+ path = _scss/bootswatch
+ url = https://github.com/thomaspark/bootswatch.git
+ branch = master
diff --git a/_scss/base/_bootstrap.scss b/_scss/base/_bootstrap.scss
index 45cf721..e608e9f 100644
--- a/_scss/base/_bootstrap.scss
+++ b/_scss/base/_bootstrap.scss
@@ -1 +1,3 @@
+@import 'bootswatch/cosmo/_variables.scss';
@import 'bootstrap/assets/stylesheets/bootstrap';
+@import 'bootswatch/cosmo/_bootswatch.scss';
diff --git a/_scss/bootswatch b/_scss/bootswatch
new file mode 160000
+Subproject 4b0d3762f309326a6d66fa4ea18945a7fc11f8e