From 9b434de6af15aa564ce5562fad20ddc12a58c84b Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Mon, 11 Jan 2016 22:47:19 +0100 Subject: [PATCH] Rework import of bootstrap variables Make original import optional to prevent error when importing the design in less after install with bower. Add additional optional import pointing to bootstrap when bootstrap-material-design was installed with bower. --- less/_import-bs-less.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/less/_import-bs-less.less b/less/_import-bs-less.less index 19b26852..8a47b144 100644 --- a/less/_import-bs-less.less +++ b/less/_import-bs-less.less @@ -1,2 +1,3 @@ -@import "../bower_components/bootstrap/less/variables.less"; +@import (optional) "../../bootstrap/less/variables.less"; +@import (optional) "../bower_components/bootstrap/less/variables.less"; //@import "../bower_components/bootstrap/less/mixins.less";