library-mirrors/pure
1
0
Fork 0
mirror of https://github.com/pure-css/pure.git synced 2024-11-24 10:44:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merging from upstream

Browse Source
This commit is contained in:
James Alley 2015-01-27 15:20:34 -08:00
commit 25ef5c1ce4
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -1,5 +1,6 @@
Pure Pure
==== ====
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/yahoo/pure?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Pure](https://cloud.githubusercontent.com/assets/449779/5291099/1b554cca-7b03-11e4-9157-53a12d91b34a.png)][Pure] [![Pure](https://cloud.githubusercontent.com/assets/449779/5291099/1b554cca-7b03-11e4-9157-53a12d91b34a.png)][Pure]

2
package.json
View File

@ -11,7 +11,7 @@
"grunt": "^0.4.5", "grunt": "^0.4.5",
"grunt-cli": "^0.1.13", "grunt-cli": "^0.1.13",
"grunt-contrib-clean": "^0.5.0", "grunt-contrib-clean": "^0.5.0",
"grunt-contrib-compress": "^0.9.1", "grunt-contrib-compress": "^0.13.0",
"grunt-contrib-concat": "^0.4.0", "grunt-contrib-concat": "^0.4.0",
"grunt-contrib-copy": "^0.5.0", "grunt-contrib-copy": "^0.5.0",
"grunt-contrib-csslint": "^0.2.0", "grunt-contrib-csslint": "^0.2.0",

6
src/buttons/tests/manual/button.html
View File

@ -16,7 +16,7 @@
font-weight:bold; font-weight:bold;
color: white; color: white;
padding: 0.8em 2.5em; padding: 0.8em 2.5em;
background: #16bb51; background-color: #16bb51;
border-radius: 6px; border-radius: 6px;
text-shadow: 0 1px 1px rgb(22, 116, 29); text-shadow: 0 1px 1px rgb(22, 116, 29);
} }
@ -40,11 +40,11 @@
.pure-button-wedding:hover, .pure-button-wedding:hover,
.pure-button-wedding:focus { .pure-button-wedding:focus {
background: #555; background-color: #555;
color: #eee; color: #eee;
} }
.pure-button-wedding:active { .pure-button-wedding:active {
background: #222; background-color: #222;
color: #fff; color: #fff;
box-shadow: none; box-shadow: none;
} }

2
src/forms/css/forms.css
View File

@ -121,7 +121,7 @@ since IE8 won't execute CSS that contains a CSS3 selector.
.pure-form input[readonly], .pure-form input[readonly],
.pure-form select[readonly], .pure-form select[readonly],
.pure-form textarea[readonly] { .pure-form textarea[readonly] {
background: #eee; /* menu hover bg color */ background-color: #eee; /* menu hover bg color */
color: #777; /* menu text color */ color: #777; /* menu text color */
border-color: #ccc; border-color: #ccc;
} }

5
src/grids/css/grids-core.css
View File

@ -37,6 +37,11 @@
/* IE10 uses display: flexbox */ /* IE10 uses display: flexbox */
display: -ms-flexbox; display: -ms-flexbox;
-ms-flex-flow: row wrap; -ms-flex-flow: row wrap;
/* Prevents distributing space between rows */
-ms-align-content: flex-start;
-webkit-align-content: flex-start;
align-content: flex-start;
} }
/* Opera as of 12 on Windows needs word-spacing. /* Opera as of 12 on Windows needs word-spacing.

2
src/tables/css/tables.css
View File

@ -28,7 +28,7 @@
} }
.pure-table thead { .pure-table thead {
background: #e0e0e0; background-color: #e0e0e0;
color: #000; color: #000;
text-align: left; text-align: left;
vertical-align: bottom; vertical-align: bottom;