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

resolving conflict with version of Normalize

Browse Source
This commit is contained in:
James Alley 2015-01-20 17:09:47 -08:00
commit 517029f43a
8 changed files with 69 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CONTRIBUTING.md
View File

@ -12,7 +12,7 @@ contributions along with all other developers who use Pure.
[Contributor License Agreement]: #contributor-license-agreement
[open issues]: https://github.com/yui/pure/issues
[open issues]: https://github.com/yahoo/pure/issues
Docs and Website
@ -24,7 +24,7 @@ repository.
[Pure]: http://purecss.io/
[pure-site]: https://github.com/yui/pure-site
[pure-site]: https://github.com/yahoo/pure-site
Building and Testing Pure
@ -36,7 +36,7 @@ Once installed, clone the `pure` repo (either the main repo or your fork) and
install Pure's gruntplugins via npm:
```shell
$ git clone git://github.com/yui/pure.git
$ git clone git://github.com/yahoo/pure.git
$ cd pure/
$ npm install
```
@ -101,8 +101,8 @@ naming conventions, along with examples of how to extend the library.
Contributor License Agreement
-----------------------------
Please [sign Pure's CLA][CLA] before sending pull requests. We can't merge your
pull requests unless you have a signed CLA.
Please [sign the Yahoo CLA][CLA] after sending pull requests. We can't merge
your pull requests unless you have a signed CLA.
The CLA ensures that everyone who submits a work of authorship to Pure is
contributing work that is their own or for which they can authoritatively speak.
@ -123,9 +123,8 @@ making your contribution:
**Note:** that the BSD license is very liberal; it allows for reuse and
adaptation in commercial projects.
2. [Sign the Pure CLA online][CLA]. You will receive confirmation of your CLA
submission via the email address provided on the CLA form. If you have
questions about the CLA, you can address them to yui-cla@yahoo-inc.com.
2. [Sign the Yahoo CLA][CLA] online. If you have questions about the CLA, you
can address them to opensource-cla@yahoo-inc.com.
[CLA]: https://secure.echosign.com/public/hostedForm?formid=A9PFU5T58653A
[CLA]: https://yahoocla.herokuapp.com/

2
Gruntfile.js
View File

@ -174,7 +174,7 @@ grunt.initConfig({
'Pure v<%= pkg.version %>',
'Copyright 2014 Yahoo! Inc. All rights reserved.',
'Licensed under the BSD License.',
'https://github.com/yui/pure/blob/master/LICENSE.md',
'https://github.com/yahoo/pure/blob/master/LICENSE.md',
'*/\n'
].join('\n')
},

97
HISTORY.md
View File

@ -1,6 +1,9 @@
Pure Change History
===================
* Upgraded Normalize.css to 3.0.1.
0.5.0 (2014-05-27)
------------------
@ -38,8 +41,8 @@ Pure Change History
the amount of padding to `padding: 0.5em 1em`.
[#24]: https://github.com/yui/pure/issues/24
[#267]: https://github.com/yui/pure/pull/267
[#24]: https://github.com/yahoo/pure/issues/24
[#267]: https://github.com/yahoo/pure/pull/267
0.4.2 (2014-02-13)
@ -61,10 +64,10 @@ Pure Change History
`border-width`. ([#295][] @kwando)
[#265]: https://github.com/yui/pure/issues/265
[#283]: https://github.com/yui/pure/issues/283
[#286]: https://github.com/yui/pure/issues/286
[#295]: https://github.com/yui/pure/issues/295
[#265]: https://github.com/yahoo/pure/issues/265
[#283]: https://github.com/yahoo/pure/issues/283
[#286]: https://github.com/yahoo/pure/issues/286
[#295]: https://github.com/yahoo/pure/issues/295
0.4.1 (2014-02-06)
@ -122,14 +125,14 @@ Pure Change History
* Removed hard-coded height for horizontal menus. ([#164][])
[#144]: https://github.com/yui/pure/issues/144
[#164]: https://github.com/yui/pure/issues/164
[#174]: https://github.com/yui/pure/issues/174
[#177]: https://github.com/yui/pure/issues/177
[#191]: https://github.com/yui/pure/issues/191
[#200]: https://github.com/yui/pure/issues/200
[#221]: https://github.com/yui/pure/issues/221
[#261]: https://github.com/yui/pure/issues/261
[#144]: https://github.com/yahoo/pure/issues/144
[#164]: https://github.com/yahoo/pure/issues/164
[#174]: https://github.com/yahoo/pure/issues/174
[#177]: https://github.com/yahoo/pure/issues/177
[#191]: https://github.com/yahoo/pure/issues/191
[#200]: https://github.com/yahoo/pure/issues/200
[#221]: https://github.com/yahoo/pure/issues/221
[#261]: https://github.com/yahoo/pure/issues/261
[rework-pure-grids]: https://github.com/ericf/rework-pure-grids
[Rework]: https://github.com/visionmedia/rework
@ -224,17 +227,17 @@ Pure Change History
aspect ratios are maintained when the page is resized. ([#172][]: @dchest)
[#41]: https://github.com/yui/pure/issues/41
[#143]: https://github.com/yui/pure/issues/143
[#154]: https://github.com/yui/pure/issues/154
[#160]: https://github.com/yui/pure/issues/160
[#162]: https://github.com/yui/pure/issues/162
[#166]: https://github.com/yui/pure/issues/166
[#170]: https://github.com/yui/pure/issues/170
[#171]: https://github.com/yui/pure/issues/171
[#172]: https://github.com/yui/pure/issues/172
[#185]: https://github.com/yui/pure/issues/185
[#189]: https://github.com/yui/pure/issues/189
[#41]: https://github.com/yahoo/pure/issues/41
[#143]: https://github.com/yahoo/pure/issues/143
[#154]: https://github.com/yahoo/pure/issues/154
[#160]: https://github.com/yahoo/pure/issues/160
[#162]: https://github.com/yahoo/pure/issues/162
[#166]: https://github.com/yahoo/pure/issues/166
[#170]: https://github.com/yahoo/pure/issues/170
[#171]: https://github.com/yahoo/pure/issues/171
[#172]: https://github.com/yahoo/pure/issues/172
[#185]: https://github.com/yahoo/pure/issues/185
[#189]: https://github.com/yahoo/pure/issues/189
[Customize]: http://purecss.io/customize/
[Grids-fonts]: http://purecss.io/grids/#using-grids-with-custom-fonts
@ -285,16 +288,16 @@ Pure Change History
where tables inside of grids would break the grid. ([#95][]: @AurelioDeRosa)
[#89]: https://github.com/yui/pure/issues/89
[#90]: https://github.com/yui/pure/issues/90
[#94]: https://github.com/yui/pure/issues/94
[#95]: https://github.com/yui/pure/issues/95
[#96]: https://github.com/yui/pure/issues/96
[#102]: https://github.com/yui/pure/issues/102
[#109]: https://github.com/yui/pure/issues/109
[#115]: https://github.com/yui/pure/issues/115
[#127]: https://github.com/yui/pure/issues/127
[#172]: https://github.com/yui/pure/pull/172
[#89]: https://github.com/yahoo/pure/issues/89
[#90]: https://github.com/yahoo/pure/issues/90
[#94]: https://github.com/yahoo/pure/issues/94
[#95]: https://github.com/yahoo/pure/issues/95
[#96]: https://github.com/yahoo/pure/issues/96
[#102]: https://github.com/yahoo/pure/issues/102
[#109]: https://github.com/yahoo/pure/issues/109
[#115]: https://github.com/yahoo/pure/issues/115
[#127]: https://github.com/yahoo/pure/issues/127
[#172]: https://github.com/yahoo/pure/pull/172
0.2.0 (2013-06-11)
@ -317,7 +320,7 @@ Pure Change History
* Added `grunt watch` task which runs tests and build.
* Added support to `pure-site` for serving `pure` locally during
development. ([#46][], [yui/pure-site#111][])
development. ([#46][], [yahoo/pure-site#111][])
* Removed vendor prefixes for `box-shadow`, `text-shadow`, `border-radius`. All
modern browsers support the non-prefixed versions of these properties.
@ -359,18 +362,18 @@ Pure Change History
background (`#dedede`) for accessibility. ([#22][])
[#22]: https://github.com/yui/pure/issues/22
[#23]: https://github.com/yui/pure/issues/23
[#25]: https://github.com/yui/pure/issues/25
[#32]: https://github.com/yui/pure/issues/32
[#42]: https://github.com/yui/pure/issues/42
[#44]: https://github.com/yui/pure/issues/44
[#46]: https://github.com/yui/pure/issues/46
[#49]: https://github.com/yui/pure/issues/49
[#53]: https://github.com/yui/pure/issues/53
[#54]: https://github.com/yui/pure/issues/54
[#22]: https://github.com/yahoo/pure/issues/22
[#23]: https://github.com/yahoo/pure/issues/23
[#25]: https://github.com/yahoo/pure/issues/25
[#32]: https://github.com/yahoo/pure/issues/32
[#42]: https://github.com/yahoo/pure/issues/42
[#44]: https://github.com/yahoo/pure/issues/44
[#46]: https://github.com/yahoo/pure/issues/46
[#49]: https://github.com/yahoo/pure/issues/49
[#53]: https://github.com/yahoo/pure/issues/53
[#54]: https://github.com/yahoo/pure/issues/54
[yui/pure-site#111]: https://github.com/yui/pure-site/issues/111
[yahoo/pure-site#111]: https://github.com/yahoo/pure-site/issues/111
0.1.0 (2013-05-24)

14
README.md
View File

@ -1,12 +1,12 @@
Pure
====
[![Pure](http://f.cl.ly/items/2y0M0E2Q3a2H0z1N1Y19/pure-banner.png)][Pure]
[![Pure](https://cloud.githubusercontent.com/assets/449779/5291099/1b554cca-7b03-11e4-9157-53a12d91b34a.png)][Pure]
A set of small, responsive CSS modules that you can use in every web project.
[http://purecss.io/][Pure]
[![Build Status](https://travis-ci.org/yui/pure.png?branch=master)][Build Status]
[![Build Status](https://travis-ci.org/yahoo/pure.png?branch=master)][Build Status]
**Use From the CDN:**
@ -25,7 +25,7 @@ $ bower install --save pure
[Pure]: http://purecss.io/
[Bower]: http://bower.io/
[Build Status]: https://travis-ci.org/yui/pure
[Build Status]: https://travis-ci.org/yahoo/pure
[customize]: http://purecss.io/customize/
@ -89,7 +89,7 @@ Optionally, you can build Pure from its source on Github. To do this, you'll
need to have Node.js and npm installed. We use [Grunt][] to build Pure.
```shell
$ git clone git@github.com:yui/pure.git
$ git clone git@github.com:yahoo/pure.git
$ cd pure
$ npm install
$ grunt
@ -154,7 +154,7 @@ requests for the docs and website over at the [`pure-site`][pure-site]
repository.
[pure-site]: https://github.com/yui/pure-site
[pure-site]: https://github.com/yahoo/pure-site
Contributing
@ -163,7 +163,7 @@ Contributing
See the [CONTRIBUTING file][] for information on how to contribute to Pure.
[CONTRIBUTING file]: https://github.com/yui/pure/blob/master/CONTRIBUTING.md
[CONTRIBUTING file]: https://github.com/yahoo/pure/blob/master/CONTRIBUTING.md
License
@ -173,4 +173,4 @@ This software is free to use under the Yahoo! Inc. BSD license.
See the [LICENSE file][] for license text and copyright information.
[LICENSE file]: https://github.com/yui/pure/blob/master/LICENSE.md
[LICENSE file]: https://github.com/yahoo/pure/blob/master/LICENSE.md

2
bower.json
View File

@ -4,6 +4,6 @@
"version": "0.6.0",
"main": "build/pure.css",
"devDependencies": {
"normalize-css": "3.0.2"
"normalize-css": "^3.0"
}
}

2
package.json
View File

@ -2,7 +2,7 @@
"name": "pure",
"version": "0.5.0",
"private": true,
"repository": "git://github.com/yui/pure.git",
"repository": "git://github.com/yahoo/pure.git",
"scripts": {
"test": "grunt test"
},

5
src/forms/css/forms.css
View File

@ -130,11 +130,6 @@ since IE8 won't execute CSS that contains a CSS3 selector.
.pure-form textarea:focus:invalid,
.pure-form select:focus:invalid {
color: #b94a48;
border-color: #ee5f5b;
}
.pure-form input:focus:invalid:focus,
.pure-form textarea:focus:invalid:focus,
.pure-form select:focus:invalid:focus {
border-color: #e9322d;
}
.pure-form input[type="file"]:focus:invalid:focus,

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

@ -8,7 +8,7 @@
/*
Sets the font stack to fonts known to work properly with the above letter
and word spacings. See: https://github.com/yui/pure/issues/41/
and word spacings. See: https://github.com/yahoo/pure/issues/41/
The following font stack makes Pure Grids work on all known environments.