zen-grids 1.0.alpha.1 → 1.0.alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/stylesheets/zen/_grids.scss +14 -0
- data/templates/project/layout.scss +53 -14
- data/zen-grids.gemspec +2 -2
- metadata +4 -4
data/stylesheets/zen/_grids.scss
CHANGED
@@ -141,6 +141,20 @@ $legacy-support-for-ie6: false !default;
|
|
141
141
|
}
|
142
142
|
}
|
143
143
|
|
144
|
+
//
|
145
|
+
// Apply this to content boxes that need to be cleared below other content boxes.
|
146
|
+
//
|
147
|
+
@mixin zen-clear (
|
148
|
+
$float-direction: $zen-float-direction
|
149
|
+
) {
|
150
|
+
// Determine the float direction.
|
151
|
+
$dir: $float-direction;
|
152
|
+
@if $zen-reverse-all-floats {
|
153
|
+
$dir: zen-direction-flip($dir);
|
154
|
+
}
|
155
|
+
clear: $dir;
|
156
|
+
}
|
157
|
+
|
144
158
|
|
145
159
|
//
|
146
160
|
// Helper functions for the Zen mixins.
|
@@ -9,7 +9,6 @@ $legacy-support-for-ie7: false;
|
|
9
9
|
$zen-column-count: 12;
|
10
10
|
$zen-gutter-width: 20px;
|
11
11
|
|
12
|
-
$navbar-height: 4em;
|
13
12
|
|
14
13
|
//
|
15
14
|
// Skip link styling
|
@@ -36,44 +35,84 @@ $navbar-height: 4em;
|
|
36
35
|
}
|
37
36
|
}
|
38
37
|
|
38
|
+
#header,
|
39
|
+
#main,
|
40
|
+
#footer {
|
41
|
+
margin: {
|
42
|
+
left: auto;
|
43
|
+
right: auto;
|
44
|
+
}
|
45
|
+
max-width: 1100px;
|
46
|
+
}
|
47
|
+
|
39
48
|
#main {
|
40
49
|
@include zen-grid-container();
|
41
50
|
}
|
42
51
|
|
43
|
-
|
44
|
-
|
52
|
+
//
|
53
|
+
// Horizontal navigation bar
|
54
|
+
@media all and (min-width: 480px) {
|
55
|
+
$zen-column-count: 1;
|
56
|
+
$navbar-height: 4em;
|
45
57
|
|
46
58
|
#main {
|
47
59
|
padding-top: $navbar-height;
|
48
60
|
}
|
49
61
|
#main-menu {
|
50
|
-
@include zen-grid(1,
|
62
|
+
@include zen-grid(1, 1);
|
51
63
|
margin-top: -$navbar-height;
|
52
64
|
height: $navbar-height;
|
53
65
|
}
|
66
|
+
}
|
67
|
+
|
68
|
+
@media all and (min-width: 480px) and (max-width: 639px) {
|
69
|
+
$zen-column-count: 2;
|
70
|
+
|
54
71
|
#content {
|
55
72
|
@include zen-grid(1, 2);
|
56
73
|
}
|
57
74
|
#aside1 {
|
58
|
-
@include zen-grid(1, 1
|
75
|
+
@include zen-grid(1, 1);
|
76
|
+
@include zen-clear(); // Clear left-floated elements (#content)
|
59
77
|
}
|
60
78
|
#aside2 {
|
61
|
-
|
79
|
+
@include zen-grid(2, 1);
|
80
|
+
}
|
81
|
+
}
|
82
|
+
|
83
|
+
@media all and (min-width: 640px) and (max-width: 799px) {
|
84
|
+
$zen-column-count: 3;
|
85
|
+
|
86
|
+
#content {
|
87
|
+
@include zen-grid(1, 2);
|
88
|
+
}
|
89
|
+
#aside1 {
|
62
90
|
@include zen-grid(1, 1, right);
|
63
91
|
}
|
92
|
+
#aside2 {
|
93
|
+
@include zen-clear(left); // Clear right-floated elements (#content)
|
94
|
+
@include zen-grid(1, 2);
|
95
|
+
}
|
64
96
|
}
|
65
97
|
|
66
|
-
@media all and (min-width:
|
67
|
-
$zen-column-count:
|
98
|
+
@media all and (min-width: 800px) and (max-width: 959px) {
|
99
|
+
$zen-column-count: 3;
|
68
100
|
|
69
|
-
#
|
70
|
-
|
101
|
+
#content {
|
102
|
+
@include zen-grid(1, 2);
|
71
103
|
}
|
72
|
-
#
|
73
|
-
@include zen-grid(1,
|
74
|
-
margin-top: -$navbar-height;
|
75
|
-
height: $navbar-height;
|
104
|
+
#aside1 {
|
105
|
+
@include zen-grid(1, 1, right);
|
76
106
|
}
|
107
|
+
#aside2 {
|
108
|
+
@include zen-clear(right); // Clear right-floated elements (#aside1)
|
109
|
+
@include zen-grid(1, 1, right);
|
110
|
+
}
|
111
|
+
}
|
112
|
+
|
113
|
+
@media all and (min-width: 960px) {
|
114
|
+
$zen-column-count: 5;
|
115
|
+
|
77
116
|
#content {
|
78
117
|
@include zen-grid(2, 3);
|
79
118
|
}
|
data/zen-grids.gemspec
CHANGED
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
|
|
9
9
|
s.homepage = 'http://zengrids.com'
|
10
10
|
s.rubyforge_project =
|
11
11
|
|
12
|
-
s.version = '1.0.alpha.
|
13
|
-
s.date = '2012-01-
|
12
|
+
s.version = '1.0.alpha.2'
|
13
|
+
s.date = '2012-01-12'
|
14
14
|
|
15
15
|
s.authors = ['John Albin Wilkins']
|
16
16
|
s.email = 'virtually.johnalbin@gmail.com'
|
metadata
CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
|
|
6
6
|
- 1
|
7
7
|
- 0
|
8
8
|
- alpha
|
9
|
-
-
|
10
|
-
version: 1.0.alpha.
|
9
|
+
- 2
|
10
|
+
version: 1.0.alpha.2
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- John Albin Wilkins
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2012-01-
|
18
|
+
date: 2012-01-12 00:00:00 +08:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
79
79
|
version: 1.3.1
|
80
80
|
requirements: []
|
81
81
|
|
82
|
-
rubyforge_project: 1.0.alpha.
|
82
|
+
rubyforge_project: 1.0.alpha.2
|
83
83
|
rubygems_version: 1.3.6
|
84
84
|
signing_key:
|
85
85
|
specification_version: 3
|