edge_framework 1.3.0 → 1.3.1
Sign up to get free protection for your applications and to get access to all the features.
- data/assets/kitchen-sink.html +14 -7
- data/assets/sass/edge.scss +1 -1
- data/assets/sass/edge/components/_grid.scss +13 -15
- data/assets/sass/kitchen-sink.scss +19 -4
- data/lib/edge/version.rb +1 -1
- metadata +2 -2
data/assets/kitchen-sink.html
CHANGED
@@ -381,11 +381,11 @@
|
|
381
381
|
</div>
|
382
382
|
</div> -->
|
383
383
|
|
384
|
-
|
384
|
+
<div class="row" data-page="custom-tile">
|
385
385
|
<div class="large-12 columns">
|
386
386
|
<div class="demo-tile">
|
387
387
|
<h1>Custom Tile</h1>
|
388
|
-
<ul class="custom-
|
388
|
+
<ul class="custom-tile-1">
|
389
389
|
<li><p>1</p></li>
|
390
390
|
<li><p>1</p></li>
|
391
391
|
<li><p>1</p></li>
|
@@ -400,7 +400,7 @@
|
|
400
400
|
<li><p>1</p></li>
|
401
401
|
</ul>
|
402
402
|
<h2>Custom Tile Collapsed</h2>
|
403
|
-
<ul class="custom-
|
403
|
+
<ul class="custom-tile-2">
|
404
404
|
<li><p>1</p></li>
|
405
405
|
<li><p>1</p></li>
|
406
406
|
<li><p>1</p></li>
|
@@ -415,7 +415,7 @@
|
|
415
415
|
<li><p>1</p></li>
|
416
416
|
</ul>
|
417
417
|
<h2>Custom Tile Mini</h2>
|
418
|
-
<ul class="custom-
|
418
|
+
<ul class="custom-tile-3">
|
419
419
|
<li><p>1</p></li>
|
420
420
|
<li><p>1</p></li>
|
421
421
|
<li><p>1</p></li>
|
@@ -431,7 +431,7 @@
|
|
431
431
|
</ul>
|
432
432
|
</div>
|
433
433
|
</div>
|
434
|
-
</div>
|
434
|
+
</div>
|
435
435
|
|
436
436
|
<!-- <div data-page="grid">
|
437
437
|
<div>
|
@@ -693,7 +693,7 @@
|
|
693
693
|
</section>
|
694
694
|
-->
|
695
695
|
|
696
|
-
<section class="row" data-page="custom-grid">
|
696
|
+
<!-- <section class="row" data-page="custom-grid">
|
697
697
|
<div class="large-12 column">
|
698
698
|
<div class="demo-grid">
|
699
699
|
|
@@ -717,6 +717,13 @@
|
|
717
717
|
</div>
|
718
718
|
</div>
|
719
719
|
|
720
|
+
<h3>Centering and Small uncentering</h3>
|
721
|
+
<div class="row">
|
722
|
+
<div class="cgrid-center column">
|
723
|
+
<p>l-center s-uncenter</p>
|
724
|
+
</div>
|
725
|
+
</div>
|
726
|
+
|
720
727
|
<h3>L-S-Mini (M) Collapse</h3>
|
721
728
|
<div class="row collapse">
|
722
729
|
<div class="cgrid-b1 column">
|
@@ -812,7 +819,7 @@
|
|
812
819
|
|
813
820
|
</div>
|
814
821
|
</div>
|
815
|
-
</section>
|
822
|
+
</section> -->
|
816
823
|
|
817
824
|
<!-- <section class="row" data-page="design-grid">
|
818
825
|
<div class="large-12 column demo-grid">
|
data/assets/sass/edge.scss
CHANGED
@@ -43,7 +43,7 @@ $column-gutter : 20px !default;
|
|
43
43
|
|
44
44
|
@if $adaptive {
|
45
45
|
@if $collapse {
|
46
|
-
min-width: $width;
|
46
|
+
min-width: $width + $gutter;
|
47
47
|
} @else {
|
48
48
|
min-width: $width + $gutter;
|
49
49
|
}
|
@@ -83,11 +83,6 @@ $column-gutter : 20px !default;
|
|
83
83
|
padding-right: $gutter / 2;
|
84
84
|
padding-left: $gutter / 2;
|
85
85
|
width: 100%;
|
86
|
-
max-width: $width;
|
87
|
-
|
88
|
-
@if not $responsive {
|
89
|
-
min-width: $width;
|
90
|
-
}
|
91
86
|
}
|
92
87
|
}
|
93
88
|
|
@@ -139,11 +134,11 @@ $column-gutter : 20px !default;
|
|
139
134
|
|
140
135
|
@mixin base-column(
|
141
136
|
$size : 0,
|
142
|
-
$offset :
|
137
|
+
$offset : null,
|
143
138
|
$push : 0,
|
144
139
|
$pull : 0,
|
145
140
|
$collapse : false,
|
146
|
-
$centered :
|
141
|
+
$centered : null,
|
147
142
|
$gutter : 0px,
|
148
143
|
$total : $total-columns,
|
149
144
|
$for-base : false) {
|
@@ -162,7 +157,7 @@ $column-gutter : 20px !default;
|
|
162
157
|
}
|
163
158
|
|
164
159
|
// Offset, calculate margins
|
165
|
-
@if $offset
|
160
|
+
@if $offset {
|
166
161
|
margin-#{$default-float}: gridCalc($offset, $total);
|
167
162
|
}
|
168
163
|
|
@@ -178,11 +173,14 @@ $column-gutter : 20px !default;
|
|
178
173
|
}
|
179
174
|
|
180
175
|
// Centered, add centered margin
|
181
|
-
@if $centered {
|
176
|
+
@if $centered == true {
|
182
177
|
display: block;
|
183
178
|
float: none;
|
184
|
-
margin-right: auto
|
185
|
-
margin-left: auto
|
179
|
+
margin-right: auto;
|
180
|
+
margin-left: auto;
|
181
|
+
} @else if $centered == false {
|
182
|
+
margin-right: 0;
|
183
|
+
margin-left: 0;
|
186
184
|
}
|
187
185
|
|
188
186
|
// Source Ordering
|
@@ -194,7 +192,7 @@ $column-gutter : 20px !default;
|
|
194
192
|
@if $pull > 0 {
|
195
193
|
#{$default-opposite}: gridCalc($pull, $total);
|
196
194
|
#{$default-float}: auto;
|
197
|
-
}
|
195
|
+
}
|
198
196
|
}
|
199
197
|
|
200
198
|
// -----------------------------------
|
@@ -206,11 +204,11 @@ $column-gutter : 20px !default;
|
|
206
204
|
$size : 0,
|
207
205
|
$small : 0,
|
208
206
|
$mini : 0,
|
209
|
-
$offset :
|
207
|
+
$offset : null,
|
210
208
|
$push : 0,
|
211
209
|
$pull : 0,
|
212
210
|
$collapse : false,
|
213
|
-
$centered :
|
211
|
+
$centered : null,
|
214
212
|
$gutter : 0px,
|
215
213
|
$total : $total-columns) {
|
216
214
|
|
@@ -173,8 +173,23 @@
|
|
173
173
|
@include column($size:7, $small:2);
|
174
174
|
}
|
175
175
|
|
176
|
+
.cgrid-center {
|
177
|
+
@include column($size: 8, $centered: true);
|
178
|
+
@include below(small) {
|
179
|
+
@include column($size: 6, $centered: false);
|
180
|
+
}
|
181
|
+
}
|
182
|
+
|
176
183
|
.cgrid-b1 {
|
177
|
-
@include column(
|
184
|
+
@include column(10, $offset: 2);
|
185
|
+
|
186
|
+
@include below(small) {
|
187
|
+
@include column(6, $offset: 6);
|
188
|
+
}
|
189
|
+
|
190
|
+
@include below(mini) {
|
191
|
+
@include column(4, $offset: 1)
|
192
|
+
}
|
178
193
|
}
|
179
194
|
.cgrid-b2 {
|
180
195
|
@include column($size:2, $small:4, $mini:6);
|
@@ -246,15 +261,15 @@
|
|
246
261
|
}
|
247
262
|
|
248
263
|
/* Custom Tile */
|
249
|
-
.custom-
|
264
|
+
.custom-tile-1 {
|
250
265
|
@include tile($size:7, $small:5, $gutter: 50px);
|
251
266
|
}
|
252
267
|
|
253
|
-
.custom-
|
268
|
+
.custom-tile-2 {
|
254
269
|
@include tile($size:5, $small:3, $collapse:true);
|
255
270
|
}
|
256
271
|
|
257
|
-
.custom-
|
272
|
+
.custom-tile-3 {
|
258
273
|
@include tile(5, 3, 2);
|
259
274
|
}
|
260
275
|
|
data/lib/edge/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: edge_framework
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-08-
|
12
|
+
date: 2014-08-19 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: sass
|