From 88d545eff1d6215c1f3dd1ef1386edb6352a996b Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 1 Jan 2017 22:14:33 +0100 Subject: Moved vendor/bootstrap to themses/assets/bootstrap --- .gitmodules | 2 +- themes/assets/bootstrap | 1 + themes/base.less | 2 +- themes/theme1.less | 2 +- themes/theme2.less | 2 +- themes/theme3.less | 2 +- themes/theme4.less | 2 +- vendor/bootstrap | 1 - 8 files changed, 7 insertions(+), 7 deletions(-) create mode 160000 themes/assets/bootstrap delete mode 160000 vendor/bootstrap 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/themes/assets/bootstrap b/themes/assets/bootstrap new file mode 160000 index 00000000..ad716b9e --- /dev/null +++ b/themes/assets/bootstrap @@ -0,0 +1 @@ +Subproject commit ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c 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) diff --git a/vendor/bootstrap b/vendor/bootstrap deleted file mode 160000 index ad716b9e..00000000 --- a/vendor/bootstrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c -- cgit v1.2.3-54-g00ecf