From 40e999cf871834e6b446d358817e696b297467f7 Mon Sep 17 00:00:00 2001 From: Shaoquan Chen Date: Wed, 6 Jan 2016 17:07:53 -0800 Subject: [PATCH] Integrating helion-ui-theme --- README.md | 2 +- src/index.scss | 2 ++ tools/.bowerrc | 2 +- tools/bower.json | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 491dba532b..df13439373 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ docker build -t stratos-ui . ## Create and start docker container ``` -docker run -it --rm --name stratos-ui -v $(pwd):/usr/src/app -v $(pwd)/../helion-ui-framework:/usr/src/helion-ui-framework stratos-ui /bin/bash +docker run -it --rm --name stratos-ui -v $(pwd):/usr/src/app -v $(pwd)/../helion-ui-framework:/usr/src/helion-ui-framework -v $(pwd)/../helion-ui-theme:/usr/src/helion-ui-theme stratos-ui /bin/bash ``` ## provision container diff --git a/src/index.scss b/src/index.scss index 4883a0924e..f152b10655 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1,2 +1,4 @@ +@import "lib/helion-ui-theme/mixins"; +@import "lib/helion-ui-theme/variables"; @import "lib/helion-ui-framework/framework"; @import "app/app"; diff --git a/tools/.bowerrc b/tools/.bowerrc index 13b27777fd..30e0b4c801 100644 --- a/tools/.bowerrc +++ b/tools/.bowerrc @@ -1,4 +1,4 @@ { - "directory": "../dist/lib", + "directory": "../src/lib", "interactive": false } diff --git a/tools/bower.json b/tools/bower.json index fb58faed09..5df65ed82e 100644 --- a/tools/bower.json +++ b/tools/bower.json @@ -14,6 +14,8 @@ "tests" ], "dependencies": { - "angular": "1.3.4" + "angular": "1.3.4", + "helion-ui-framework": "../../helion-ui-framework/", + "helion-ui-theme": "../../helion-ui-theme/" } }