Merge pull request #168 from khoa-nd/master

Merged
chrisshayan · Feb 12, 2015 · 545ef7d · 545ef7d
2 parents 0b442d4 + 36e9bfe
commit 545ef7d
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4,019 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -167,7 +167,12 @@ module.exports = function (grunt) {
       cssConcat: {
         src: ["<%=pkg.public%>generate-resources/*.css"],
         dest: "<%=pkg.public%>generate-resources/",
-        replacements: [{from: "};", to: "}"}, {from: "../fonts", to: "fonts"}]
+        replacements: [
+          {from: "};", to: "}"},
+          {from: "../fonts", to: "fonts"},
+          {from: ".tmp/concat/", to: ""},
+          {from: "images/", to: "../images/"}
+        ]
       }
     },
 

diff --git a/src/main/webapp/assets/css/bubble.css b/src/main/webapp/assets/css/bubble.css