adding theme files, re-writing how kyruus bootstrap pulls files in, r…

…efactoring location of site js files

src/Makefile

@@ -1,29 +1,57 @@
+---
+---
+
 PATH := ../node_modules/.bin:$(PATH)
 
-SITE_LESS_DIRECTORY = assets/less
-SITE_SCSS_DIRECTORY = assets/scss
-SITE_CSS_DIRECTORY = assets/css
+ASSET_DIR = assets
+OUTPUT_DIR = ../theme
+
+SITE_LESS_DIR = ${ASSET_DIR}/less
+SITE_SCSS_DIR = ${ASSET_DIR}/scss
+SITE_CSS_DIR = ${ASSET_DIR}/css
 
-KB_LESS = ${SITE_LESS_DIRECTORY}/kyruus-bootstrap/kyruus.less
-KB_SCSS = ${SITE_SCSS_DIRECTORY}/kyruus-bootstrap/kyruus.scss
-KB_CSS = ${SITE_CSS_DIRECTORY}/kyruus.css
-KB_CSS_MIN = ${SITE_CSS_DIRECTORY}/kyruus.min.css
+KB_LESS = ${SITE_LESS_DIR}/kyruus-bootstrap/kyruus.less
+KB_SCSS = ${SITE_SCSS_DIR}/kyruus-bootstrap/kyruus.scss
+KB_CSS = ${SITE_CSS_DIR}/kyruus.css
+KB_CSS_MIN = ${SITE_CSS_DIR}/kyruus.min.css
 
-DOCS_LESS = ${SITE_LESS_DIRECTORY}/sites/docs.less
-DOCS_SCSS = ${SITE_SCSS_DIRECTORY}/sites/docs.scss
-DOCS_CSS = ${SITE_CSS_DIRECTORY}/sites/docs.css
-DOCS_CSS_MIN = ${SITE_CSS_DIRECTORY}/sites/docs.min.css
+DOCS_LESS = ${SITE_LESS_DIR}/sites/docs.less
+DOCS_SCSS = ${SITE_SCSS_DIR}/sites/docs.scss
+DOCS_CSS = ${SITE_CSS_DIR}/sites/docs.css
+DOCS_CSS_MIN = ${SITE_CSS_DIR}/sites/docs.min.css
 
 build:
+	@echo "Making directories"
+	@mkdir -p ${SITE_CSS_DIR}
+	@mkdir -p ${SITE_CSS_DIR}/sites
+	@mkdir -p ${OUTPUT_DIR}
+
 	@echo "Compiling Less files"
-	@mkdir -p ${SITE_CSS_DIRECTORY}
-#	sass ${KB_SCSS}:${KB_CSS}
-	lessc ${KB_LESS} > ${KB_CSS}
-	lessc --compress ${KB_LESS} > ${KB_CSS_MIN}
-	@mkdir -p ${SITE_CSS_DIRECTORY}/sites
-#	sass ${DOCS_SCSS}:${DOCS_CSS}
-	lessc ${DOCS_LESS} > ${DOCS_CSS}
-	lessc --compress ${DOCS_LESS} > ${DOCS_CSS_MIN}
+	sass ${KB_SCSS}:${KB_CSS}
+#	lessc ${KB_LESS} > ${KB_CSS}
+#	lessc --compress ${KB_LESS} > ${KB_CSS_MIN}
+	sass ${DOCS_SCSS}:${DOCS_CSS}
+#	lessc ${DOCS_LESS} > ${DOCS_CSS}
+#	lessc --compress ${DOCS_LESS} > ${DOCS_CSS_MIN}
+
+	@echo "Cleaning old theme"
+	rm -rf ${OUTPUT_DIR}/*
+
+	@echo "Copying new theme into place"
+	cp -r ${ASSET_DIR}/css ${OUTPUT_DIR}/css
+	cp -r ${ASSET_DIR}/font ${OUTPUT_DIR}/font
+	cp -r ${ASSET_DIR}/ico ${OUTPUT_DIR}/ico
+	@mkdir -p ${OUTPUT_DIR}/img/kyruus-bootstrap
+	cp -r ${ASSET_DIR}/img/kyruus-bootstrap ${OUTPUT_DIR}/img
+	cp -r ${ASSET_DIR}/js ${OUTPUT_DIR}/js
+	cp -r ${ASSET_DIR}/less ${OUTPUT_DIR}/less
+	cp -r ${ASSET_DIR}/scss ${OUTPUT_DIR}/scss
+
+	@echo "Cleaning site specific files"
+	rm -rf ${OUTPUT_DIR}/css/sites
+	rm -rf ${OUTPUT_DIR}/js/sites
+	rm -rf ${OUTPUT_DIR}/less/sites
+	rm -rf ${OUTPUT_DIR}/scss/sites
 
 
 default: build

src/_includes/footer-js.html

@@ -24,6 +24,6 @@
 <script src="assets/js/lib/bootstrap-modal.js"></script>
 
 <!-- Kyruus Bootstrap Doc Specific -->
-<script src="assets/js/google-code-prettify/prettify.js"></script>
-<script src="assets/js/lib/holder-1.9.js"></script>
-<script src="assets/js/site.js"></script>
+<script src="assets/js/sites/google-code-prettify/prettify.js"></script>
+<script src="assets/js/sites/holder-1.9.js"></script>
+<script src="assets/js/sites/docs.js"></script>

src/_includes/head.html

@@ -8,7 +8,7 @@
 <!-- Le styles -->
 <link rel="stylesheet" href="assets/css/kyruus.css">
 <link rel="stylesheet" href="assets/css/sites/docs.css">
-<link rel="stylesheet" href="assets/js/google-code-prettify/prettify.css">
+<link rel="stylesheet" href="assets/js/sites/google-code-prettify/prettify.css">
 
 <!--[if IE 7]>
 <link rel="stylesheet" href="assets/font/font-awesome-{{ site.fontawesome.version }}/css/font-awesome-ie7.min.css">

src/assets/scss/kyruus-bootstrap/kyruus.scss

@@ -1,27 +1,28 @@
 ---
 ---
 
+//
 // KYRUUS BOOTSTRAP VERSION {{ site.kyruus-bootstrap.version }}
 // ------------------------------
 
-// Bootstrap Variables & Mixins
+// Variables
 @import "../bootstrap-{{ site.bootstrap.version }}/variables";
-@import "../bootstrap-{{ site.bootstrap.version }}/mixins";
-
-// Kyruus Bootstrap Variables & Mixins
-@import "variables";
-@import "mixins";
+@import "../font-awesome-{{ site.fontawesome.version }}/variables";
+@import "variables"; // Kyruus Bootstrap Variables
 
 
-
-// Bootstrap
+// Bootstrap Import
 @import "../bootstrap-{{ site.bootstrap.version }}/bootstrap";
-@import "../bootstrap-{{ site.bootstrap.version }}/responsive-utilities"; // for visible-print and hidden-print
+@import "../bootstrap-{{ site.bootstrap.version }}/responsive-utilities"; // Not in default Bootstrap, for visible-print and hidden-print
+
 
-// Font Awesome
+// Font Awesome Import
 @import "../font-awesome-{{ site.fontawesome.version }}/font-awesome";
 
+
 // Kyruus Bootstrap
+// ------------------------------
+@import "mixins";
 @import "fonts";
 @import "progress-bars";
 @import "labels-badges";
@@ -41,7 +42,7 @@
 @import "font-awesome";
 @import "lazy";
 
-// Other Plugins
+// 3rd Party styles
 @import "../lib/bootstrap-modal";
 @import "../lib/data-tables";
 @import "../lib/datepicker";