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
8 changes: 0 additions & 8 deletions bower.json

This file was deleted.

1 change: 1 addition & 0 deletions node_modules
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "purecss",
"version": "0.6.1-pre",
"version": "0.6.1",
"repository": {
"type": "git",
"url": "git://github.com/yahoo/pure.git"
Expand All @@ -11,7 +11,7 @@
},
"files": "build/",
"devDependencies": {
"bower": "^1.3.7",
"autoprefixer": "^6.3.1",
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "^0.5.0",
Expand All @@ -22,8 +22,10 @@
"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"
"grunt-stripmq": "0.0.6",
"normalize.css": "^4.0"
},
"description": "Pure is a ridiculously tiny CSS library you can use to start any web project.",
"bugs": {
Expand All @@ -41,7 +43,9 @@
"ericf <edf@ericf.me>",
"tilomitra <tilomitra@gmail.com>",
"msweeney <matt.sweeney@yahoo.com>",
"jamesalley <manalagi001@yahoo.com>"
"jamesalley <manalagi001@yahoo.com>",
"lkraav <leho@conversionready.com>",
"absalomedia <media@absalom.biz>",
],
"license": "BSD"
}
6 changes: 0 additions & 6 deletions src/buttons/css/buttons-core.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
.pure-button {
/* Structure */
display: inline-block;
zoom: 1;
line-height: normal;
white-space: nowrap;
vertical-align: middle;
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
14 changes: 6 additions & 8 deletions src/buttons/css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,18 @@
.pure-button-hover,
.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));
filter: alpha(opacity=90);
-khtml-opacity: 0.90;
-moz-opacity: 0.90;
opacity: 0.90;
}
.pure-button:focus {
outline: 0;
}
.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],
Expand All @@ -39,13 +37,13 @@
.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;
opacity: 0.40;
cursor: not-allowed;
box-shadow: none;
pointer-events: none;
}

.pure-button-hidden {
Expand Down
6 changes: 0 additions & 6 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 Expand Up @@ -209,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 {
Expand Down
36 changes: 13 additions & 23 deletions src/grids/css/grids-core.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +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 */

/*
Sets the font stack to fonts known to work properly with the above letter
Copy link
Contributor

Choose a reason for hiding this comment

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

why was this removed?

Copy link
Author

Choose a reason for hiding this comment

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

Removing IE specific calls less than 8. Text rendering is non W3C & should really be done outside the core from where I stand.

Expand All @@ -24,26 +21,22 @@
*/
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;
}

/* 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.
Expand All @@ -55,12 +48,9 @@

.pure-u {
display: inline-block;
*display: inline; /* IE < 8: fake inline-block */
zoom: 1;
letter-spacing: normal;
word-spacing: normal;
vertical-align: top;
text-rendering: auto;
vertical-align: bottom;
Copy link
Contributor

Choose a reason for hiding this comment

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

what was the reason for changing this one?

Copy link
Author

Choose a reason for hiding this comment

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

This is #539 (which I replicated in testing) & removing text-rendering as text-rendering isn't W3C valid, even at CSS3 spec.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Why would vertical-align: top go to bottom though? It isn't connected to text-rendering is it?

Copy link
Author

Choose a reason for hiding this comment

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

@lkraav no it's not connected to text-rendering. vertical-align needs to go to the bottom to fix #539

}

/*
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
2 changes: 0 additions & 2 deletions src/menus/css/menus-horizontal.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion src/tables/css/tables.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down