From b839e401062b294292fdcbd7e30b79bc149fab6f Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 2 Jan 2017 03:15:57 +0100 Subject: Require twbs/bootstrap via composer --- themes/assets/bootstrap | 1 - themes/base.less | 4 ++-- themes/theme1.less | 2 +- themes/theme2.less | 2 +- themes/theme3.less | 2 +- themes/theme4.less | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) delete mode 160000 themes/assets/bootstrap (limited to 'themes') diff --git a/themes/assets/bootstrap b/themes/assets/bootstrap deleted file mode 160000 index ad716b9e..00000000 --- a/themes/assets/bootstrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c diff --git a/themes/base.less b/themes/base.less index a4fa7e77..c866e50e 100644 --- a/themes/base.less +++ b/themes/base.less @@ -1,6 +1,6 @@ -@import "assets/bootstrap/less/bootstrap"; +@import "../vendor/twbs/bootstrap/less/bootstrap"; -@icon-font-path: "../fonts/"; +@icon-font-path: "../vendor/bootstrap/fonts/"; body { padding-top: 50px; diff --git a/themes/theme1.less b/themes/theme1.less index 134e79b7..7a893951 100644 --- a/themes/theme1.less +++ b/themes/theme1.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; /* The MIT License (MIT) diff --git a/themes/theme2.less b/themes/theme2.less index 344e23c6..c4486444 100644 --- a/themes/theme2.less +++ b/themes/theme2.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; @brand-primary: #758499; @brand-success: #7b9c41; diff --git a/themes/theme3.less b/themes/theme3.less index 7e7e0f69..e6be3637 100644 --- a/themes/theme3.less +++ b/themes/theme3.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; @brand-primary: #f19224; @brand-success: #39AB50; diff --git a/themes/theme4.less b/themes/theme4.less index 2ad8593d..4234de9c 100644 --- a/themes/theme4.less +++ b/themes/theme4.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; /* The MIT License (MIT) -- cgit v1.2.3-54-g00ecf