Commit 2c215757 authored by JC Brand's avatar JC Brand

Use bower to install bourbon and fix path issue. Fixes #417

parent f73f61e6
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'sass', '~> 3.3' gem 'sass', '~> 3.3'
gem 'bourbon'
...@@ -105,10 +105,10 @@ dev: stamp-bower stamp-bundler ...@@ -105,10 +105,10 @@ dev: stamp-bower stamp-bundler
## Builds ## Builds
css:: stamp-bundler css:: stamp-bundler
$(SASS) -I .bundle/bin sass/converse.scss css/converse.css $(SASS) -I ./components/bourbon/app/assets/stylesheets/ sass/converse.scss css/converse.css
watch:: stamp-bundler watch:: stamp-bundler
$(SASS) --watch -I .bundle/bin sass/converse.scss:css/converse.css $(SASS) --watch -I ./components/bourbon/app/assets/stylesheets/ sass/converse.scss:css/converse.css
jsmin: jsmin:
./node_modules/requirejs/bin/r.js -o src/build.js && ./node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-website.js ./node_modules/requirejs/bin/r.js -o src/build.js && ./node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-website.js
......
...@@ -31,11 +31,15 @@ ...@@ -31,11 +31,15 @@
"typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js", "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",
"skeleton-sass": "~2.0.3", "skeleton-sass": "~2.0.3",
"strophejs": "https://github.com/strophe/strophejs.git#9e285eaa59f4ceb2b25e4d95c5bbe90690251bbc", "strophejs": "https://github.com/strophe/strophejs.git#9e285eaa59f4ceb2b25e4d95c5bbe90690251bbc",
"strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd" "strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd",
"bourbon": "~4.2.3"
}, },
"resolutions": { "resolutions": {
"backbone": "1.1.2" "backbone": "1.1.2"
}, },
"exportsOverride": {}, "exportsOverride": {},
"ignore": ["docs", "mockup"] "ignore": [
"docs",
"mockup"
]
} }
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
* Licensed under the Mozilla Public License * Licensed under the Mozilla Public License
*/ */
@import "../ruby/1.9.1/gems/bourbon-4.2.3/app/assets/stylesheets/_bourbon"; @import "bourbon";
@import "variables"; @import "variables";
@import "core"; @import "core";
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment