diff --git a/Gruntfile.js b/Gruntfile.js index b007c8083..026c4d499 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -94,7 +94,7 @@ module.exports = function(grunt) { }, files: [{ expand: true, - src: ['src/sass/*.scss'], + src: ['src/sass/main.scss'], dest: './', ext: '.css' }] @@ -193,12 +193,6 @@ module.exports = function(grunt) { src: 'bower_components/ionic/release/js/ionic.bundle.min.js', dest: 'public/lib/' }, - ionic_css: { - expand: true, - flatten: true, - src: 'bower_components/ionic/release/css/ionic.min.css', - dest: 'public/css/' - }, linux: { files: [{ expand: true, diff --git a/src/sass/views/common.scss b/src/sass/common.scss similarity index 100% rename from src/sass/views/common.scss rename to src/sass/common.scss diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss new file mode 100644 index 000000000..3d7a67ec2 --- /dev/null +++ b/src/sass/ionic.scss @@ -0,0 +1,8 @@ +/* Set ionic variables */ +$font-family-sans-serif: "Roboto", sans-serif; +$font-family-light-sans-serif: "Roboto-Light", sans-serif-light; +$royal: #1e3186; + + + +@import "../../bower_components/ionic/scss/ionic"; diff --git a/src/sass/main.scss b/src/sass/main.scss index 0ece1c388..acf737299 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -997,6 +997,7 @@ input[type=number] { } } -@import "views/common"; +@import "ionic"; +@import "common"; @import "views/tab-home"; @import "views/includes/walletActivity";