Skip to content

Commit 116286e

Browse files
committed
Merge pull request #267 from tilomitra/remove-responsive-grid
New Responsive Grids: Better Defaults, and Customizations via Tooling or Web UI
2 parents 58f2840 + 6b353a1 commit 116286e

File tree

6 files changed

+129
-414
lines changed

6 files changed

+129
-414
lines changed

Gruntfile.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,11 @@ grunt.initConfig({
6767
'build/forms-r.css'
6868
]},
6969

70-
{'build/grids-nr.css': [
70+
{'build/grids.css': [
7171
'build/grids-core.css',
7272
'build/grids-units.css'
7373
]},
7474

75-
{'build/grids.css': [
76-
'build/grids-nr.css',
77-
'build/grids-r.css'
78-
]},
79-
8075
{'build/menus-nr.css': [
8176
'build/menus-core.css',
8277
'build/menus.css',
@@ -101,7 +96,7 @@ grunt.initConfig({
10196

10297
{'build/<%= pkg.name %>-nr.css': [
10398
'build/base.css',
104-
'build/grids-nr.css',
99+
'build/grids.css',
105100
'build/buttons.css',
106101
'build/forms-nr.css',
107102
'build/menus-nr.css',
@@ -199,6 +194,19 @@ grunt.initConfig({
199194
options: {
200195
units: [5, 24]
201196
}
197+
},
198+
199+
responsive: {
200+
dest: 'build/grids-responsive.css',
201+
202+
options: {
203+
mediaQueries: {
204+
sm: 'screen and (min-width: 35.5em)', // 568px
205+
md: 'screen and (min-width: 48em)', // 768px
206+
lg: 'screen and (min-width: 64em)', // 1024px
207+
xl: 'screen and (min-width: 80em)' // 1280px
208+
}
209+
}
202210
}
203211
},
204212

HISTORY.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,33 @@ Pure Change History
44
NEXT
55
----
66

7+
### Base
8+
9+
* Added the `.pure-img` class name for make images scale with the viewport in
10+
fluid layouts.
11+
12+
### Grids
13+
14+
* __[!]__ Removed `.pure-g-r` from core, in favor of a mobile-first responsive
15+
grid system. ([#24][], [#267][])
16+
17+
To use the mobile-first grid system, you need to pull in `pure.css`, along with `grids-responsive.css`:
18+
19+
```html
20+
<link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.5.0-rc-1/pure-min.css">
21+
<link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.5.0-rc-1/grids-responsive-min.css">
22+
```
23+
24+
Find out more about the new grid system at [http://purecss.io/grids/][Grids].
25+
26+
### Tables
27+
728
* Switched cell padding in Tables from `px` to `em` units, and also increased
829
the amount of padding to `padding: 0.5em 1em`.
930

31+
[#24]: https://github.com/yui/pure/issues/24
32+
[#267]: https://github.com/yui/pure/pull/267
33+
[Grids]: http://purecss.io/grids/
1034

1135
0.4.2 (2014-02-13)
1236
------------------

src/base/css/base.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,13 @@
1515
[hidden] {
1616
display: none !important;
1717
}
18+
19+
/**
20+
* Add this class to an image to make it fit within it's fluid parent wrapper while maintaining
21+
* aspect ratio.
22+
*/
23+
.pure-img {
24+
max-width: 100%;
25+
height: auto;
26+
display: block;
27+
}

src/forms/tests/manual/forms.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<link rel="stylesheet" href="../../../../build/base.css">
99
<link rel="stylesheet" href="../../../../build/grids.css">
10+
<link rel="stylesheet" href="../../../../build/grids-responsive.css">
1011
<link rel="stylesheet" href="../../../../build/buttons.css">
1112
<link rel="stylesheet" href="../../../../build/forms.css">
1213
</head>
@@ -38,24 +39,24 @@ <h2>Multi-Column Form with Grids</h2>
3839
<fieldset>
3940
<legend>Legend</legend>
4041

41-
<div class="pure-g-r">
42-
<div class="pure-u-1-3">
42+
<div class="pure-g">
43+
<div class="pure-u-1 pure-u-md-1-3">
4344
<label>First Name</label>
4445
<input type="text">
4546
</div>
46-
<div class="pure-u-1-3">
47+
<div class="pure-u-1 pure-u-md-1-3">
4748
<label>Password</label>
4849
<input type="password">
4950
</div>
50-
<div class="pure-u-1-3">
51+
<div class="pure-u-1 pure-u-md-1-3">
5152
<label>E-Mail</label>
5253
<input type="email" required>
5354
</div>
54-
<div class="pure-u-1-3">
55+
<div class="pure-u-1 pure-u-md-1-3">
5556
<label>City</label>
5657
<input type="text">
5758
</div>
58-
<div class="pure-u-1-3">
59+
<div class="pure-u-1 pure-u-md-1-3">
5960
<label>State</label>
6061
<select class="pure-input-medium">
6162
<option>AL</option>

src/grids/css/grids-r.css

Lines changed: 0 additions & 102 deletions
This file was deleted.

0 commit comments

Comments
 (0)