Merge branch 'release/2.3.0'

weDevsOfficial · Jul 31, 2017 · eb8ed87 · eb8ed87
2 parents 3b3c855 + b13bf17
commit eb8ed87
Show file tree

Hide file tree

Showing 26 changed files with 1,299 additions and 457 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -18,7 +18,7 @@ module.exports = function(grunt) {
             // one to one
             core: {
                 options: {
-                    sourceMap: true,
+                    sourceMap: false,
                     sourceMapFilename: 'style.css.map',
                     sourceMapURL: 'style.css.map',
                     sourceMapRootpath: '../../'
@@ -31,7 +31,8 @@ module.exports = function(grunt) {
                     '<%= dirs.css %>/skins/pink.css': '<%= dirs.less %>/skin/pink.less',
                     '<%= dirs.css %>/skins/purple.css': '<%= dirs.less %>/skin/purple.less',
                     '<%= dirs.css %>/skins/red.css': '<%= dirs.less %>/skin/red.less',
-                    '<%= dirs.css %>/skins/sky.css': '<%= dirs.less %>/skin/sky.less'
+                    '<%= dirs.css %>/skins/sky.css': '<%= dirs.less %>/skin/sky.less',
+                    '<%= dirs.css %>/skins/rose-quartz.css': '<%= dirs.less %>/skin/rose-quartz.less'
                 }
             },
         },

diff --git a/assets/css/skins/blue.css b/assets/css/skins/blue.css
diff --git a/assets/css/skins/green.css b/assets/css/skins/green.css
diff --git a/assets/css/skins/orange.css b/assets/css/skins/orange.css
diff --git a/assets/css/skins/pink.css b/assets/css/skins/pink.css
diff --git a/assets/css/skins/purple.css b/assets/css/skins/purple.css
diff --git a/assets/css/skins/red.css b/assets/css/skins/red.css