From 662a0c5355dbd2f061186d9dcc7590e746d564d6 Mon Sep 17 00:00:00 2001 From: leho Date: Tue, 9 Feb 2016 00:40:41 +0200 Subject: [PATCH 01/12] Remove manual vendor prefixes --- src/buttons/css/buttons-core.css | 5 ----- src/buttons/css/buttons.css | 4 ---- src/forms/css/forms.css | 4 ---- src/grids/css/grids-core.css | 20 ++++---------------- src/menus/css/menus-core.css | 2 -- 5 files changed, 4 insertions(+), 31 deletions(-) diff --git a/src/buttons/css/buttons-core.css b/src/buttons/css/buttons-core.css index f007c91b5..3b81183e2 100644 --- a/src/buttons/css/buttons-core.css +++ b/src/buttons/css/buttons-core.css @@ -8,12 +8,7 @@ text-align: center; cursor: pointer; -webkit-user-drag: none; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; user-select: none; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; box-sizing: border-box; } diff --git a/src/buttons/css/buttons.css b/src/buttons/css/buttons.css index 92ed95238..fc50a601e 100644 --- a/src/buttons/css/buttons.css +++ b/src/buttons/css/buttons.css @@ -17,10 +17,6 @@ .pure-button:hover, .pure-button:focus { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#1a000000',GradientType=0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(transparent), color-stop(40%, rgba(0,0,0, 0.05)), to(rgba(0,0,0, 0.10))); - background-image: -webkit-linear-gradient(transparent, rgba(0,0,0, 0.05) 40%, rgba(0,0,0, 0.10)); - background-image: -moz-linear-gradient(top, rgba(0,0,0, 0.05) 0%, rgba(0,0,0, 0.10)); - background-image: -o-linear-gradient(transparent, rgba(0,0,0, 0.05) 40%, rgba(0,0,0, 0.10)); background-image: linear-gradient(transparent, rgba(0,0,0, 0.05) 40%, rgba(0,0,0, 0.10)); } .pure-button:focus { diff --git a/src/forms/css/forms.css b/src/forms/css/forms.css index 370d35033..336bdeb7d 100644 --- a/src/forms/css/forms.css +++ b/src/forms/css/forms.css @@ -28,8 +28,6 @@ so we can ignore the csslint warning. box-shadow: inset 0 1px 3px #ddd; border-radius: 4px; vertical-align: middle; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; box-sizing: border-box; } @@ -43,8 +41,6 @@ since IE8 won't execute CSS that contains a CSS3 selector. border: 1px solid #ccc; box-shadow: inset 0 1px 3px #ddd; border-radius: 4px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; box-sizing: border-box; } diff --git a/src/grids/css/grids-core.css b/src/grids/css/grids-core.css index 10294237e..d356dd5b3 100644 --- a/src/grids/css/grids-core.css +++ b/src/grids/css/grids-core.css @@ -24,24 +24,12 @@ */ font-family: FreeSans, Arimo, "Droid Sans", Helvetica, Arial, sans-serif; - /* - Use flexbox when possible to avoid `letter-spacing` side-effects. - - NOTE: Firefox (as of 25) does not currently support flex-wrap, so the - `-moz-` prefix version is omitted. - */ - - display: -webkit-flex; - -webkit-flex-flow: row wrap; + /* Use flexbox when possible to avoid `letter-spacing` side-effects. */ + display: flex; + flex-flow: row wrap; - /* IE10 uses display: flexbox */ - display: -ms-flexbox; - -ms-flex-flow: row wrap; - /* Prevents distributing space between rows */ - -ms-align-content: flex-start; - -webkit-align-content: flex-start; - align-content: flex-start; + align-content: flex-start; } /* Opera as of 12 on Windows needs word-spacing. diff --git a/src/menus/css/menus-core.css b/src/menus/css/menus-core.css index bfdc418c5..0ba775495 100644 --- a/src/menus/css/menus-core.css +++ b/src/menus/css/menus-core.css @@ -1,7 +1,5 @@ /*csslint adjoining-classes: false, box-model:false*/ .pure-menu { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; box-sizing: border-box; } From 2963cdc14656517295c2fee47e446cdd5a44fd09 Mon Sep 17 00:00:00 2001 From: leho Date: Tue, 9 Feb 2016 01:11:54 +0200 Subject: [PATCH 02/12] Implement autoprefixer via grunt-postcss --- Gruntfile.js | 15 +++++++++++++++ package.json | 2 ++ 2 files changed, 17 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 21a378f6b..86915512d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -104,6 +104,19 @@ grunt.initConfig({ } }, + // -- PostCSS Config -------------------------------------------------------- + + postcss: { + options: { + processors: [ + require('autoprefixer')({browsers: ['last 2 versions', 'ie >= 8', 'iOS >= 6', 'Android >= 4']}) + ] + }, + dist: { + src: 'build/*.css' + } + }, + // -- CSSLint Config ------------------------------------------------------- csslint: { @@ -258,6 +271,7 @@ grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-compress'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-css-selectors'); +grunt.loadNpmTasks('grunt-postcss'); grunt.loadNpmTasks('grunt-pure-grids'); grunt.loadNpmTasks('grunt-stripmq'); @@ -275,6 +289,7 @@ grunt.registerTask('build', [ 'concat:build', 'clean:build_res', 'css_selectors:base', + 'postcss', 'cssmin', 'license' ]); diff --git a/package.json b/package.json index 29e9549ae..ed89519a5 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "files": "build/", "devDependencies": { + "autoprefixer": "^6.3.1", "bower": "^1.3.7", "grunt": "^0.4.5", "grunt-cli": "^0.1.13", @@ -22,6 +23,7 @@ "grunt-contrib-cssmin": "^0.6.2", "grunt-contrib-watch": "^0.6.1", "grunt-css-selectors": "^1.1.0", + "grunt-postcss": "^0.7.1", "grunt-pure-grids": "^1.0.0", "grunt-stripmq": "0.0.6" }, From cd038f3ac6c37714527b3983519bd1cbeb3ef532 Mon Sep 17 00:00:00 2001 From: leho Date: Mon, 8 Feb 2016 22:15:18 +0200 Subject: [PATCH 03/12] yahoo/pure -> lkraav/pure --- package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ed89519a5..bf8354337 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "purecss", - "version": "0.6.1-pre", + "name": "purecss-conversionready", + "version": "0.6.1-pre+conversionready", "repository": { "type": "git", - "url": "git://github.com/yahoo/pure.git" + "url": "git://github.com/lkraav/pure.git" }, "scripts": { "test": "grunt test", @@ -29,7 +29,7 @@ }, "description": "Pure is a ridiculously tiny CSS library you can use to start any web project.", "bugs": { - "url": "https://github.com/yahoo/pure/issues" + "url": "https://github.com/lkraav/pure/issues" }, "homepage": "http://purecss.io", "main": "build/pure-min.css", @@ -43,7 +43,8 @@ "ericf ", "tilomitra ", "msweeney ", - "jamesalley " + "jamesalley ", + "lkraav " ], "license": "BSD" } From 2d772f67d391f349d2457310d784d60e0111b6ce Mon Sep 17 00:00:00 2001 From: leho Date: Mon, 8 Feb 2016 22:58:55 +0200 Subject: [PATCH 04/12] node_modules: shared ../node_modules/ --- node_modules | 1 + 1 file changed, 1 insertion(+) create mode 120000 node_modules diff --git a/node_modules b/node_modules new file mode 120000 index 000000000..68a084add --- /dev/null +++ b/node_modules @@ -0,0 +1 @@ +../node_modules \ No newline at end of file From e6a36657f949d77d834665afd46ca880addf5dda Mon Sep 17 00:00:00 2001 From: leho Date: Tue, 9 Feb 2016 02:23:47 +0200 Subject: [PATCH 05/12] Follow industry, drop bower [1] --- Gruntfile.js | 21 +++------------------ bower.json | 8 -------- package.json | 4 ++-- 3 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 bower.json diff --git a/Gruntfile.js b/Gruntfile.js index 86915512d..85f1b1bee 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,19 +6,6 @@ grunt.initConfig({ nick : 'pure', pkg : grunt.file.readJSON('package.json'), - bower: grunt.file.readJSON('bower.json'), - - // -- bower.json Config --------------------------------------------------------- - - bower_json: { - release: { - values: { - main: 'pure.css' - }, - - dest: 'build/' - } - }, // -- Clean Config --------------------------------------------------------- @@ -50,7 +37,7 @@ grunt.initConfig({ build: { files: [ {'build/base.css': [ - 'bower_components/normalize-css/normalize.css', + 'node_modules/normalize.css/normalize.css', 'build/base.css' ]}, @@ -168,7 +155,7 @@ grunt.initConfig({ options: { banner: [ '/*!', - 'normalize.css v<%= bower.devDependencies["normalize-css"] %> | MIT License | git.io/normalize', + 'normalize.css | MIT License | git.io/normalize', 'Copyright (c) Nicolas Gallagher and Jonathan Neal', '*/\n' ].join('\n') @@ -278,8 +265,7 @@ grunt.loadNpmTasks('grunt-stripmq'); // Local tasks. grunt.loadTasks('tasks/'); -grunt.registerTask('default', ['import', 'test', 'build']); -grunt.registerTask('import', ['bower_install']); +grunt.registerTask('default', ['test', 'build']); grunt.registerTask('test', ['csslint']); grunt.registerTask('build', [ 'clean:build', @@ -302,7 +288,6 @@ grunt.registerTask('release', [ 'default', 'clean:release', 'copy:release', - 'bower_json:release', 'compress:release' ]); diff --git a/bower.json b/bower.json deleted file mode 100644 index f4bc6832b..000000000 --- a/bower.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "pure", - "description": "Use Pure's ridiculously tiny CSS to start any web project.", - "main": "build/pure.css", - "devDependencies": { - "normalize-css": "^3.0" - } -} diff --git a/package.json b/package.json index bf8354337..a9f210a1a 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "files": "build/", "devDependencies": { "autoprefixer": "^6.3.1", - "bower": "^1.3.7", "grunt": "^0.4.5", "grunt-cli": "^0.1.13", "grunt-contrib-clean": "^0.5.0", @@ -25,7 +24,8 @@ "grunt-css-selectors": "^1.1.0", "grunt-postcss": "^0.7.1", "grunt-pure-grids": "^1.0.0", - "grunt-stripmq": "0.0.6" + "grunt-stripmq": "0.0.6", + "normalize.css": "^3.0" }, "description": "Pure is a ridiculously tiny CSS library you can use to start any web project.", "bugs": { From 3db8ab4387c294c2045b28e9c9680e944a5714ff Mon Sep 17 00:00:00 2001 From: Lawrence Date: Thu, 14 Jul 2016 10:13:41 +1000 Subject: [PATCH 06/12] IE8 specific fixes --- src/buttons/css/buttons-core.css | 1 - src/forms/css/forms.css | 2 -- src/grids/css/grids-core.css | 4 ---- src/menus/css/menus-horizontal.css | 2 -- 4 files changed, 9 deletions(-) diff --git a/src/buttons/css/buttons-core.css b/src/buttons/css/buttons-core.css index 3b81183e2..5ce5b0e5e 100644 --- a/src/buttons/css/buttons-core.css +++ b/src/buttons/css/buttons-core.css @@ -1,7 +1,6 @@ .pure-button { /* Structure */ display: inline-block; - zoom: 1; line-height: normal; white-space: nowrap; vertical-align: middle; diff --git a/src/forms/css/forms.css b/src/forms/css/forms.css index 336bdeb7d..83d7bf280 100644 --- a/src/forms/css/forms.css +++ b/src/forms/css/forms.css @@ -205,8 +205,6 @@ since IE8 won't execute CSS that contains a CSS3 selector. .pure-form-aligned .pure-help-inline, .pure-form-message-inline { display: inline-block; - *display: inline; - *zoom: 1; vertical-align: middle; } .pure-form-aligned textarea { diff --git a/src/grids/css/grids-core.css b/src/grids/css/grids-core.css index d356dd5b3..a7faa68b3 100644 --- a/src/grids/css/grids-core.css +++ b/src/grids/css/grids-core.css @@ -2,8 +2,6 @@ .pure-g { letter-spacing: -0.31em; /* Webkit: collapse white-space between units */ - *letter-spacing: normal; /* reset IE < 8 */ - *word-spacing: -0.43em; /* IE < 8: collapse white-space between units */ text-rendering: optimizespeed; /* Webkit: fixes text-rendering: optimizeLegibility */ /* @@ -43,8 +41,6 @@ .pure-u { display: inline-block; - *display: inline; /* IE < 8: fake inline-block */ - zoom: 1; letter-spacing: normal; word-spacing: normal; vertical-align: top; diff --git a/src/menus/css/menus-horizontal.css b/src/menus/css/menus-horizontal.css index de37fbf35..1bc755da8 100644 --- a/src/menus/css/menus-horizontal.css +++ b/src/menus/css/menus-horizontal.css @@ -13,7 +13,5 @@ .pure-menu-horizontal .pure-menu-heading, .pure-menu-horizontal .pure-menu-separator { display: inline-block; - *display: inline; - zoom: 1; vertical-align: middle; } From 182842ffbbc2a5efec56c04a6614e2135a843433 Mon Sep 17 00:00:00 2001 From: Lawrence Date: Mon, 25 Jul 2016 08:13:36 +1000 Subject: [PATCH 07/12] Including Pure PR #584, #583, #504, #539 & return basics of multilevel menus --- src/buttons/css/buttons.css | 1 + src/grids/css/grids-core.css | 10 ++++++- src/menus/css/menus-core.css | 45 ++++++++++++++++++++++++++++++ src/menus/css/menus-horizontal.css | 12 ++++++++ src/tables/css/tables.css | 2 +- 5 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/buttons/css/buttons.css b/src/buttons/css/buttons.css index fc50a601e..6357c2188 100644 --- a/src/buttons/css/buttons.css +++ b/src/buttons/css/buttons.css @@ -42,6 +42,7 @@ opacity: 0.40; cursor: not-allowed; box-shadow: none; + pointer-events: none; } .pure-button-hidden { diff --git a/src/grids/css/grids-core.css b/src/grids/css/grids-core.css index a7faa68b3..30c3fad03 100644 --- a/src/grids/css/grids-core.css +++ b/src/grids/css/grids-core.css @@ -30,6 +30,14 @@ align-content: flex-start; } +/* IE10 display: -ms-flexbox (and display: flex in IE 11) does not work inside a table; fall back to block and rely on font hack */ +@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { + table .pure-g { + display: block; + } +} + + /* Opera as of 12 on Windows needs word-spacing. The ".opera-only" selector is used to prevent actual prefocus styling and is not required in markup. @@ -43,7 +51,7 @@ display: inline-block; letter-spacing: normal; word-spacing: normal; - vertical-align: top; + vertical-align: bottom; text-rendering: auto; } diff --git a/src/menus/css/menus-core.css b/src/menus/css/menus-core.css index 0ba775495..613fd9081 100644 --- a/src/menus/css/menus-core.css +++ b/src/menus/css/menus-core.css @@ -33,3 +33,48 @@ text-decoration: none; white-space: nowrap; } + +.pure-menu > ul { position: relative; } + + +.pure-menu-open > ul:focus { + outline: 0; +} + +.pure-menu li { position: relative; } + +.pure-menu a, +.pure-menu .pure-menu-heading { + display: block; + color: inherit; + line-height: 1.5em; + padding: 5px 20px; + text-decoration: none; + white-space: nowrap; +} + +.pure-menu li a { padding: 5px 20px; } + +.pure-menu-has-children > .pure-menu-label:after { + content: '\25B8'; + float: right; + margin-right: -20px; + margin-top: -1px; +} + +.pure-menu-has-children > .pure-menu-label { + padding-right: 30px; +} + +.pure-menu-separator { + background-color: #dfdfdf; + display: block; + height: 1px; + font-size: 0; + margin: 7px 2px; + overflow: hidden; +} + +.pure-menu-hidden { + display: none; +} diff --git a/src/menus/css/menus-horizontal.css b/src/menus/css/menus-horizontal.css index 1bc755da8..933194ef8 100644 --- a/src/menus/css/menus-horizontal.css +++ b/src/menus/css/menus-horizontal.css @@ -1,4 +1,14 @@ /* HORIZONTAL MENU */ +.pure-menu.pure-menu-horizontal > .pure-menu-heading { + display: inline-block; + margin: 0; + vertical-align: middle; +} +.pure-menu.pure-menu-horizontal > ul { + display: inline-block; + vertical-align: middle; +} + .pure-menu-horizontal { width: 100%; white-space: nowrap; @@ -15,3 +25,5 @@ display: inline-block; vertical-align: middle; } + + diff --git a/src/tables/css/tables.css b/src/tables/css/tables.css index fdd0e7898..e1a5627b5 100644 --- a/src/tables/css/tables.css +++ b/src/tables/css/tables.css @@ -30,7 +30,7 @@ there's a rowspan on the first cell. Case added to the tests. issue#432 */ border-left-width: 0; } -.pure-table thead { +.pure-table thead, .pure-table tfoot { background-color: #e0e0e0; color: #000; text-align: left; From f6b72c09ace0453d3a77b848389d12ca6c3e84d7 Mon Sep 17 00:00:00 2001 From: Lawrence Date: Thu, 28 Jul 2016 15:55:57 +1000 Subject: [PATCH 08/12] Pure patch #381 - gradient to opacity --- src/buttons/css/buttons.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/buttons/css/buttons.css b/src/buttons/css/buttons.css index 6357c2188..b734750ae 100644 --- a/src/buttons/css/buttons.css +++ b/src/buttons/css/buttons.css @@ -16,8 +16,10 @@ .pure-button-hover, .pure-button:hover, .pure-button:focus { - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#1a000000',GradientType=0); - background-image: linear-gradient(transparent, rgba(0,0,0, 0.05) 40%, rgba(0,0,0, 0.10)); + filter: alpha(opacity=90); + -khtml-opacity: 0.90; + -moz-opacity: 0.90; + opacity: 0.90;; } .pure-button:focus { outline: 0; @@ -35,7 +37,6 @@ .pure-button-disabled:active { border: none; background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=40); -khtml-opacity: 0.40; -moz-opacity: 0.40; From cc56a165afc1fcf1a23886f3eda9c8b21aa664ff Mon Sep 17 00:00:00 2001 From: Lawrence Date: Fri, 5 Aug 2016 10:08:17 +1000 Subject: [PATCH 09/12] Remove 0.5 multi level code --- src/menus/css/menus-core.css | 45 ------------------------------ src/menus/css/menus-horizontal.css | 12 -------- 2 files changed, 57 deletions(-) diff --git a/src/menus/css/menus-core.css b/src/menus/css/menus-core.css index 613fd9081..0ba775495 100644 --- a/src/menus/css/menus-core.css +++ b/src/menus/css/menus-core.css @@ -33,48 +33,3 @@ text-decoration: none; white-space: nowrap; } - -.pure-menu > ul { position: relative; } - - -.pure-menu-open > ul:focus { - outline: 0; -} - -.pure-menu li { position: relative; } - -.pure-menu a, -.pure-menu .pure-menu-heading { - display: block; - color: inherit; - line-height: 1.5em; - padding: 5px 20px; - text-decoration: none; - white-space: nowrap; -} - -.pure-menu li a { padding: 5px 20px; } - -.pure-menu-has-children > .pure-menu-label:after { - content: '\25B8'; - float: right; - margin-right: -20px; - margin-top: -1px; -} - -.pure-menu-has-children > .pure-menu-label { - padding-right: 30px; -} - -.pure-menu-separator { - background-color: #dfdfdf; - display: block; - height: 1px; - font-size: 0; - margin: 7px 2px; - overflow: hidden; -} - -.pure-menu-hidden { - display: none; -} diff --git a/src/menus/css/menus-horizontal.css b/src/menus/css/menus-horizontal.css index 933194ef8..1bc755da8 100644 --- a/src/menus/css/menus-horizontal.css +++ b/src/menus/css/menus-horizontal.css @@ -1,14 +1,4 @@ /* HORIZONTAL MENU */ -.pure-menu.pure-menu-horizontal > .pure-menu-heading { - display: inline-block; - margin: 0; - vertical-align: middle; -} -.pure-menu.pure-menu-horizontal > ul { - display: inline-block; - vertical-align: middle; -} - .pure-menu-horizontal { width: 100%; white-space: nowrap; @@ -25,5 +15,3 @@ display: inline-block; vertical-align: middle; } - - From aed3bc9cc259200bba1cb52885164f8d54f404ab Mon Sep 17 00:00:00 2001 From: Lawrence Date: Tue, 9 Aug 2016 11:37:15 +1000 Subject: [PATCH 10/12] Remove optimise speed on grids & patch #480 / IE8 hack removal on button --- src/buttons/css/buttons.css | 2 +- src/grids/css/grids-core.css | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/buttons/css/buttons.css b/src/buttons/css/buttons.css index b734750ae..6c90b824e 100644 --- a/src/buttons/css/buttons.css +++ b/src/buttons/css/buttons.css @@ -27,7 +27,7 @@ .pure-button-active, .pure-button:active { box-shadow: 0 0 0 1px rgba(0,0,0, 0.15) inset, 0 0 6px rgba(0,0,0, 0.20) inset; - border-color: #000\9; + border-color: #000; } .pure-button[disabled], diff --git a/src/grids/css/grids-core.css b/src/grids/css/grids-core.css index 30c3fad03..dd0c961ab 100644 --- a/src/grids/css/grids-core.css +++ b/src/grids/css/grids-core.css @@ -2,7 +2,6 @@ .pure-g { letter-spacing: -0.31em; /* Webkit: collapse white-space between units */ - text-rendering: optimizespeed; /* Webkit: fixes text-rendering: optimizeLegibility */ /* Sets the font stack to fonts known to work properly with the above letter @@ -52,7 +51,6 @@ letter-spacing: normal; word-spacing: normal; vertical-align: bottom; - text-rendering: auto; } /* From e87102a7a66fd5c95e10d83c42238115c8045f6e Mon Sep 17 00:00:00 2001 From: Lawrence Date: Wed, 17 Aug 2016 10:06:16 +1000 Subject: [PATCH 11/12] Fix typo on button fix --- src/buttons/css/buttons.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buttons/css/buttons.css b/src/buttons/css/buttons.css index 6c90b824e..4218df71d 100644 --- a/src/buttons/css/buttons.css +++ b/src/buttons/css/buttons.css @@ -19,7 +19,7 @@ filter: alpha(opacity=90); -khtml-opacity: 0.90; -moz-opacity: 0.90; - opacity: 0.90;; + opacity: 0.90; } .pure-button:focus { outline: 0; From 18197780f76553f6bf3b072713598a0d5229e3ed Mon Sep 17 00:00:00 2001 From: Lawrence Meckan Date: Fri, 2 Dec 2016 11:46:29 +1000 Subject: [PATCH 12/12] Update package.json to suit PR direct into Pure --- package.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a9f210a1a..4583ce10a 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "purecss-conversionready", - "version": "0.6.1-pre+conversionready", + "name": "purecss", + "version": "0.6.1", "repository": { "type": "git", - "url": "git://github.com/lkraav/pure.git" + "url": "git://github.com/yahoo/pure.git" }, "scripts": { "test": "grunt test", @@ -25,11 +25,11 @@ "grunt-postcss": "^0.7.1", "grunt-pure-grids": "^1.0.0", "grunt-stripmq": "0.0.6", - "normalize.css": "^3.0" + "normalize.css": "^4.0" }, "description": "Pure is a ridiculously tiny CSS library you can use to start any web project.", "bugs": { - "url": "https://github.com/lkraav/pure/issues" + "url": "https://github.com/yahoo/pure/issues" }, "homepage": "http://purecss.io", "main": "build/pure-min.css", @@ -44,7 +44,8 @@ "tilomitra ", "msweeney ", "jamesalley ", - "lkraav " + "lkraav ", + "absalomedia ", ], "license": "BSD" }