瀏覽代碼

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

JC Brand 10 年之前
父節點
當前提交
2c21575719
共有 4 個文件被更改,包括 9 次插入6 次删除
  1. 0 1
      Gemfile
  2. 2 2
      Makefile
  3. 6 2
      bower.json
  4. 1 1
      sass/converse.scss

+ 0 - 1
Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
 gem 'sass', '~> 3.3'
-gem 'bourbon'

+ 2 - 2
Makefile

@@ -105,10 +105,10 @@ dev: stamp-bower stamp-bundler
 ## Builds
 
 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
-	$(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:
 	./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

+ 6 - 2
bower.json

@@ -31,11 +31,15 @@
     "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",
     "skeleton-sass": "~2.0.3",
     "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": {
     "backbone": "1.1.2"
   },
   "exportsOverride": {},
-  "ignore": ["docs", "mockup"]
+  "ignore": [
+    "docs",
+    "mockup"
+  ]
 }

+ 1 - 1
sass/converse.scss

@@ -6,6 +6,6 @@
  * 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 "core";