Skip to content

Updated lib - fixed bug #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miketaylr merged 3 commits into from
Mar 9, 2015
Merged

Updated lib - fixed bug #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fa10a0
Updated lib - fixed bug
magsout Mar 8, 2015
ea544d8
Updated cssnext.j - better to not rebased url
magsout Mar 8, 2015
dfa6687
Comma fix.
Mar 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
};
11 changes: 3 additions & 8 deletions grunt-tasks/cssnext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@ 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"]
}
}
url : false,
browsers: ['ff >= 4', 'ie >= 8', 'safari >= 5.1', 'opera >= 12', 'chrome >=10'],
import: { path: ["node_modules"] }
},
dist: {
files: {
Expand Down
7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion webcompat/static/css/development/base/variable.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 4 additions & 2 deletions webcompat/static/css/development/layout/body.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
*, *:before, *:after {
*,
*:before,
*:after {
box-sizing: inherit;
}

Expand Down