From 88d545eff1d6215c1f3dd1ef1386edb6352a996b Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 1 Jan 2017 22:14:33 +0100 Subject: [PATCH 1/5] Moved vendor/bootstrap to themses/assets/bootstrap --- .gitmodules | 2 +- {vendor => themes/assets}/bootstrap | 0 themes/base.less | 2 +- themes/theme1.less | 2 +- themes/theme2.less | 2 +- themes/theme3.less | 2 +- themes/theme4.less | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename {vendor => themes/assets}/bootstrap (100%) diff --git a/.gitmodules b/.gitmodules index 8684a4ee..0aa8483a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,5 +2,5 @@ path = vendor/parsedown url = https://github.com/erusev/parsedown.git [submodule "vendor/bootstrap"] - path = vendor/bootstrap + path = themes/assets/bootstrap url = https://github.com/twbs/bootstrap.git diff --git a/vendor/bootstrap b/themes/assets/bootstrap similarity index 100% rename from vendor/bootstrap rename to themes/assets/bootstrap diff --git a/themes/base.less b/themes/base.less index 713119ff..a4fa7e77 100644 --- a/themes/base.less +++ b/themes/base.less @@ -1,4 +1,4 @@ -@import "../vendor/bootstrap/less/bootstrap"; +@import "assets/bootstrap/less/bootstrap"; @icon-font-path: "../fonts/"; diff --git a/themes/theme1.less b/themes/theme1.less index 2b13601e..134e79b7 100644 --- a/themes/theme1.less +++ b/themes/theme1.less @@ -1,4 +1,4 @@ -@import "../vendor/bootstrap/less/variables"; +@import "assets/bootstrap/less/variables"; /* The MIT License (MIT) diff --git a/themes/theme2.less b/themes/theme2.less index d5cac763..344e23c6 100644 --- a/themes/theme2.less +++ b/themes/theme2.less @@ -1,4 +1,4 @@ -@import "../vendor/bootstrap/less/variables"; +@import "assets/bootstrap/less/variables"; @brand-primary: #758499; @brand-success: #7b9c41; diff --git a/themes/theme3.less b/themes/theme3.less index 7029db68..7e7e0f69 100644 --- a/themes/theme3.less +++ b/themes/theme3.less @@ -1,4 +1,4 @@ -@import "../vendor/bootstrap/less/variables"; +@import "assets/bootstrap/less/variables"; @brand-primary: #f19224; @brand-success: #39AB50; diff --git a/themes/theme4.less b/themes/theme4.less index 4d4060ca..2ad8593d 100644 --- a/themes/theme4.less +++ b/themes/theme4.less @@ -1,4 +1,4 @@ -@import "../vendor/bootstrap/less/variables"; +@import "assets/bootstrap/less/variables"; /* The MIT License (MIT) From ed48cdc206c535c7b234ccd6e3ca968d5d243991 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 1 Jan 2017 22:35:59 +0100 Subject: [PATCH 2/5] Refactored build-themes.sh --- themes/build-themes.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/themes/build-themes.sh b/themes/build-themes.sh index 404b6890..08b23419 100755 --- a/themes/build-themes.sh +++ b/themes/build-themes.sh @@ -1,7 +1,15 @@ -#!/bin/sh +#!/bin/bash -lessc theme0.less > ../public/css/theme0.css -lessc theme1.less > ../public/css/theme1.css -lessc theme2.less > ../public/css/theme2.css -lessc theme3.less > ../public/css/theme3.css -lessc theme4.less > ../public/css/theme4.css +FILE_PATH="`dirname \"$0\"`" + +for file in `ls "${FILE_PATH}/"*.less`; do + filename="${file##*/}" + themeName="${filename%.less}" + + if [[ "$filename" == "base.less" ]]; then + continue; + fi + + echo "Building ${themeName}" + lessc "${file}" > "${FILE_PATH}/../public/css/${themeName}.css" +done From f8f44e9c04716f37a6983e276715bb25e638dc4d Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 1 Jan 2017 22:44:33 +0100 Subject: [PATCH 3/5] Replaced `...` with $(...) --- themes/build-themes.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/build-themes.sh b/themes/build-themes.sh index 08b23419..40764c53 100755 --- a/themes/build-themes.sh +++ b/themes/build-themes.sh @@ -1,8 +1,8 @@ #!/bin/bash -FILE_PATH="`dirname \"$0\"`" +FILE_PATH="$(dirname \"$0\")" -for file in `ls "${FILE_PATH}/"*.less`; do +for file in $(ls "${FILE_PATH}/"*.less); do filename="${file##*/}" themeName="${filename%.less}" From d307ba7749330f683ebe4d0ecd12b62ecaccb0f4 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 1 Jan 2017 22:52:43 +0100 Subject: [PATCH 4/5] Removed escapes --- themes/build-themes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/build-themes.sh b/themes/build-themes.sh index 40764c53..8657b691 100755 --- a/themes/build-themes.sh +++ b/themes/build-themes.sh @@ -1,6 +1,6 @@ #!/bin/bash -FILE_PATH="$(dirname \"$0\")" +FILE_PATH="$(dirname "$0")" for file in $(ls "${FILE_PATH}/"*.less); do filename="${file##*/}" From bc91daedca5646bbc2786bd5c24152b4f723436e Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 1 Jan 2017 23:04:28 +0100 Subject: [PATCH 5/5] Symlink fix --- public/vendor/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap index 66500d68..250b0a66 120000 --- a/public/vendor/bootstrap +++ b/public/vendor/bootstrap @@ -1 +1 @@ -../../vendor/bootstrap/dist \ No newline at end of file +../../themes/assets/bootstrap/dist \ No newline at end of file