From 2fa10a0f7e76de45c2f846dc435cb293a6cd2374 Mon Sep 17 00:00:00 2001 From: magsout Date: Sun, 8 Mar 2015 12:57:55 +0100 Subject: [PATCH 1/3] Updated lib - fixed bug --- Gruntfile.js | 2 +- grunt-tasks/cssnext.js | 10 ++-------- package.json | 7 +++---- webcompat/static/css/development/base/variable.css | 2 +- webcompat/static/css/development/layout/body.css | 6 ++++-- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8a0a03055..9745d9d3d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -19,5 +19,5 @@ module.exports = function (grunt) { require('load-grunt-tasks')(grunt) // Default task. - grunt.registerTask('default', ['jshint', 'concat', 'uglify','cssnext','cmq', 'cssmin', 'imagemin']); + grunt.registerTask('default', ['jshint', 'concat', 'uglify','cssnext', 'cssmin', 'imagemin']); }; diff --git a/grunt-tasks/cssnext.js b/grunt-tasks/cssnext.js index d1d8a9f40..9c26f50f0 100644 --- a/grunt-tasks/cssnext.js +++ b/grunt-tasks/cssnext.js @@ -2,14 +2,8 @@ module.exports = function(grunt) { grunt.config('cssnext', { options: { sourcemap: true, - features:{ - autoprefixer: { - browsers: ['ff >= 4', 'ie >= 8', 'safari >= 5.1', 'opera >= 12', 'chrome >=10'] - }, - import: { - path: ["node_modules"] - } - } + browsers: ['ff >= 4', 'ie >= 8', 'safari >= 5.1', 'opera >= 12', 'chrome >=10'], + import: { path: ["node_modules"] } }, dist: { files: { diff --git a/package.json b/package.json index 0c71f9a06..4991fe4ff 100644 --- a/package.json +++ b/package.json @@ -19,15 +19,14 @@ "grunt-contrib-concat": "~0.3.0", "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-cssmin": "~0.9.0", - "grunt-combine-media-queries": "~1.0.19", "load-grunt-tasks": "~0.6.0", "intern": "2.2.0", "grunt-contrib-imagemin": "~0.7.1", - "grunt-cssnext" : "^0.3.0", + "grunt-cssnext" : "^1.0.0", "suitcss-utils-display" : "^0.4.0", "suitcss-utils-align" : "^0.2.0", - "cssrecipes-reset" : "^0.4.0", - "cssrecipes-utils" : "^0.4.0", + "cssrecipes-reset" : "^0.5.0", + "cssrecipes-utils" : "^0.5.0", "cssrecipes-grid" : "^0.4.0", "cssrecipes-custom-media-queries" : "0.3.0" } diff --git a/webcompat/static/css/development/base/variable.css b/webcompat/static/css/development/base/variable.css index ef4b02378..97beb5a3b 100644 --- a/webcompat/static/css/development/base/variable.css +++ b/webcompat/static/css/development/base/variable.css @@ -8,7 +8,7 @@ --base-min-width: 320px; --base-max-width: 1920px; --base-width-content : 1180px; - --base-font-size:1.6rem; + --base-font-size: 1.6rem; } /* theme */ :root { diff --git a/webcompat/static/css/development/layout/body.css b/webcompat/static/css/development/layout/body.css index c2fe14cea..23aa6e222 100644 --- a/webcompat/static/css/development/layout/body.css +++ b/webcompat/static/css/development/layout/body.css @@ -31,11 +31,13 @@ html { color: var(--wc-variant-background-dark); box-sizing:border-box; font-size:62.5%; - font-size:calcl(1em * 0.625); + font-size:calc(1em * 0.625); -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; } -*, *:before, *:after { +*, +*:before, +*:after { box-sizing: inherit; } From ea544d8089763589e0832b8f9afe628cf61464fe Mon Sep 17 00:00:00 2001 From: Guillaume Demesy Date: Sun, 8 Mar 2015 22:24:14 +0100 Subject: [PATCH 2/3] Updated cssnext.j - better to not rebased url --- grunt-tasks/cssnext.js | 1 + 1 file changed, 1 insertion(+) diff --git a/grunt-tasks/cssnext.js b/grunt-tasks/cssnext.js index 9c26f50f0..f47393026 100644 --- a/grunt-tasks/cssnext.js +++ b/grunt-tasks/cssnext.js @@ -2,6 +2,7 @@ module.exports = function(grunt) { grunt.config('cssnext', { options: { sourcemap: true, + url : false browsers: ['ff >= 4', 'ie >= 8', 'safari >= 5.1', 'opera >= 12', 'chrome >=10'], import: { path: ["node_modules"] } }, From dfa6687f2e676282c1d50fcc04d24e47d8126822 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Mon, 9 Mar 2015 11:00:19 -0500 Subject: [PATCH 3/3] Comma fix. --- grunt-tasks/cssnext.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt-tasks/cssnext.js b/grunt-tasks/cssnext.js index f47393026..f4ae934a2 100644 --- a/grunt-tasks/cssnext.js +++ b/grunt-tasks/cssnext.js @@ -2,7 +2,7 @@ module.exports = function(grunt) { grunt.config('cssnext', { options: { sourcemap: true, - url : false + url : false, browsers: ['ff >= 4', 'ie >= 8', 'safari >= 5.1', 'opera >= 12', 'chrome >=10'], import: { path: ["node_modules"] } },