Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------

Expand Down Expand Up @@ -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'
]},

Expand Down Expand Up @@ -104,6 +91,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: {
Expand Down Expand Up @@ -155,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')
Expand Down Expand Up @@ -258,14 +258,14 @@ 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');

// 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',
Expand All @@ -275,6 +275,7 @@ grunt.registerTask('build', [
'concat:build',
'clean:build_res',
'css_selectors:base',
'postcss',
'cssmin',
'license'
]);
Expand All @@ -287,7 +288,6 @@ grunt.registerTask('release', [
'default',
'clean:release',
'copy:release',
'bower_json:release',
'compress:release'
]);

Expand Down
9 changes: 0 additions & 9 deletions bower.json

This file was deleted.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"files": "build/",
"devDependencies": {
"bower": "^1.3.7",
"autoprefixer": "^6.3.1",
"grunt": "^1.0.1",
"grunt-cli": "^1.2.0",
"grunt-contrib-clean": "^1.0.0",
Expand All @@ -22,8 +22,10 @@
"grunt-contrib-cssmin": "^1.0.2",
"grunt-contrib-watch": "^1.0.0",
"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": {
Expand Down
5 changes: 0 additions & 5 deletions src/buttons/css/buttons-core.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 0 additions & 4 deletions src/buttons/css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
/* csslint ignore:start */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#1a000000',GradientType=0);
/* csslint ignore:end */
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 {
Expand Down
4 changes: 0 additions & 4 deletions src/forms/css/forms.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
20 changes: 4 additions & 16 deletions src/grids/css/grids-core.css
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions src/menus/css/menus-core.css
Original file line number Diff line number Diff line change
@@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions src/tables/css/tables.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ there's a rowspan on the first cell. Case added to the tests. issue#432 */
border-left-width: 0;
}

.pure-table tfoot,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I closed a similar PR for this because I was afraid of introducing these styles to the footer. Is it common for the table footer to have the same style as the thead?

.pure-table thead {
background-color: #e0e0e0;
color: #000;
Expand Down