merging from upstream

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

View File

@ -1,5 +1,6 @@
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]

View File

@ -11,7 +11,7 @@
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13",
"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-copy": "^0.5.0",
"grunt-contrib-csslint": "^0.2.0",

View File

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

View File

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

View File

@ -37,6 +37,11 @@
/* 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;
}
/* Opera as of 12 on Windows needs word-spacing.

View File

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