catscope 0.1.0 → 0.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/assets/bower.json +1 -0
- data/assets/bower_components/foundation/LICENSE +22 -0
- data/assets/bower_components/foundation/README.md +46 -0
- data/assets/bower_components/foundation/bower.json +2 -4
- data/assets/bower_components/foundation/css/foundation.css +1695 -1230
- data/assets/bower_components/foundation/css/foundation.css.map +1 -1
- data/assets/bower_components/foundation/css/foundation.min.css +1 -0
- data/assets/bower_components/foundation/css/normalize.css +9 -12
- data/assets/bower_components/foundation/css/normalize.css.map +1 -1
- data/assets/bower_components/foundation/css/normalize.min.css +1 -0
- data/assets/bower_components/foundation/js/foundation/foundation.abide.js +171 -75
- data/assets/bower_components/foundation/js/foundation/foundation.accordion.js +70 -12
- data/assets/bower_components/foundation/js/foundation/foundation.alert.js +5 -5
- data/assets/bower_components/foundation/js/foundation/foundation.clearing.js +84 -40
- data/assets/bower_components/foundation/js/foundation/foundation.dropdown.js +104 -79
- data/assets/bower_components/foundation/js/foundation/foundation.equalizer.js +57 -26
- data/assets/bower_components/foundation/js/foundation/foundation.interchange.js +50 -38
- data/assets/bower_components/foundation/js/foundation/foundation.joyride.js +121 -110
- data/assets/bower_components/foundation/js/foundation/foundation.js +121 -79
- data/assets/bower_components/foundation/js/foundation/foundation.magellan.js +75 -59
- data/assets/bower_components/foundation/js/foundation/foundation.offcanvas.js +95 -22
- data/assets/bower_components/foundation/js/foundation/foundation.orbit.js +127 -123
- data/assets/bower_components/foundation/js/foundation/foundation.reveal.js +147 -69
- data/assets/bower_components/foundation/js/foundation/foundation.slider.js +101 -72
- data/assets/bower_components/foundation/js/foundation/foundation.tab.js +52 -39
- data/assets/bower_components/foundation/js/foundation/foundation.tooltip.js +97 -49
- data/assets/bower_components/foundation/js/foundation/foundation.topbar.js +70 -57
- data/assets/bower_components/foundation/js/foundation.js +1544 -951
- data/assets/bower_components/foundation/js/foundation.min.js +5 -4
- data/assets/bower_components/foundation/js/vendor/fastclick.js +8 -9
- data/assets/bower_components/foundation/js/vendor/jquery.js +6 -6
- data/assets/bower_components/foundation/js/vendor/modernizr.js +1 -1
- data/assets/bower_components/foundation/package.json +57 -0
- data/assets/bower_components/foundation/scss/foundation/_functions.scss +53 -43
- data/assets/bower_components/foundation/scss/foundation/_settings.scss +59 -37
- data/assets/bower_components/foundation/scss/foundation/components/_accordion.scss +12 -8
- data/assets/bower_components/foundation/scss/foundation/components/_alert-boxes.scss +12 -12
- data/assets/bower_components/foundation/scss/foundation/components/_block-grid.scss +14 -13
- data/assets/bower_components/foundation/scss/foundation/components/_breadcrumbs.scss +19 -19
- data/assets/bower_components/foundation/scss/foundation/components/_button-groups.scss +33 -25
- data/assets/bower_components/foundation/scss/foundation/components/_buttons.scss +30 -28
- data/assets/bower_components/foundation/scss/foundation/components/_clearing.scss +51 -47
- data/assets/bower_components/foundation/scss/foundation/components/_dropdown-buttons.scss +10 -11
- data/assets/bower_components/foundation/scss/foundation/components/_dropdown.scss +45 -38
- data/assets/bower_components/foundation/scss/foundation/components/_flex-video.scss +7 -7
- data/assets/bower_components/foundation/scss/foundation/components/_forms.scss +99 -62
- data/assets/bower_components/foundation/scss/foundation/components/_global.scss +152 -67
- data/assets/bower_components/foundation/scss/foundation/components/_grid.scss +39 -36
- data/assets/bower_components/foundation/scss/foundation/components/_icon-bar.scss +337 -235
- data/assets/bower_components/foundation/scss/foundation/components/_inline-lists.scss +9 -8
- data/assets/bower_components/foundation/scss/foundation/components/_joyride.scss +40 -42
- data/assets/bower_components/foundation/scss/foundation/components/_keystrokes.scss +2 -3
- data/assets/bower_components/foundation/scss/foundation/components/_labels.scss +6 -6
- data/assets/bower_components/foundation/scss/foundation/components/_magellan.scss +2 -2
- data/assets/bower_components/foundation/scss/foundation/components/_offcanvas.scss +259 -168
- data/assets/bower_components/foundation/scss/foundation/components/_orbit.scss +82 -62
- data/assets/bower_components/foundation/scss/foundation/components/_pagination.scss +16 -15
- data/assets/bower_components/foundation/scss/foundation/components/_panels.scss +21 -15
- data/assets/bower_components/foundation/scss/foundation/components/_pricing-tables.scss +16 -16
- data/assets/bower_components/foundation/scss/foundation/components/_progress-bars.scss +10 -4
- data/assets/bower_components/foundation/scss/foundation/components/_range-slider.scss +28 -20
- data/assets/bower_components/foundation/scss/foundation/components/_reveal.scss +38 -28
- data/assets/bower_components/foundation/scss/foundation/components/_side-nav.scss +15 -11
- data/assets/bower_components/foundation/scss/foundation/components/_split-buttons.scss +22 -18
- data/assets/bower_components/foundation/scss/foundation/components/_sub-nav.scss +14 -12
- data/assets/bower_components/foundation/scss/foundation/components/_switches.scss +22 -19
- data/assets/bower_components/foundation/scss/foundation/components/_tables.scss +8 -8
- data/assets/bower_components/foundation/scss/foundation/components/_tabs.scss +50 -31
- data/assets/bower_components/foundation/scss/foundation/components/_thumbs.scss +8 -8
- data/assets/bower_components/foundation/scss/foundation/components/_tooltips.scss +25 -25
- data/assets/bower_components/foundation/scss/foundation/components/_top-bar.scss +176 -122
- data/assets/bower_components/foundation/scss/foundation/components/_type.scss +38 -38
- data/assets/bower_components/foundation/scss/foundation/components/_visibility.scss +33 -16
- data/assets/bower_components/foundation/scss/foundation.scss +37 -40
- data/assets/bower_components/foundation/scss/normalize.scss +8 -11
- data/assets/bower_components/jquery/bower.json +2 -1
- data/assets/bower_components/jquery/dist/jquery.js +9 -4
- data/assets/bower_components/jquery/dist/jquery.min.js +4 -4
- data/assets/bower_components/jquery/dist/jquery.min.map +1 -1
- data/assets/bower_components/jquery/src/core.js +6 -1
- data/assets/scss/_settings.scss +2 -0
- data/assets/stylesheets/app.css +3066 -2429
- data/lib/catscope/version.rb +1 -1
- data/lib/catscope/views/layout.erb +6 -2
- metadata +8 -4
- data/assets/bower_components/foundation/scss/foundation/components/_toolbar.scss +0 -70
@@ -2,7 +2,7 @@
|
|
2
2
|
// foundation.zurb.com
|
3
3
|
// Licensed under MIT Open Source
|
4
4
|
|
5
|
-
@import
|
5
|
+
@import '../functions';
|
6
6
|
//
|
7
7
|
// Foundation Variables
|
8
8
|
//
|
@@ -70,9 +70,76 @@ $base-line-height: 1.5 !default;
|
|
70
70
|
// We use this to add transitions to elements
|
71
71
|
// $property - Default: all, Options: http://www.w3.org/TR/css3-transitions/#animatable-properties
|
72
72
|
// $speed - Default: 300ms
|
73
|
-
// $ease - Default:ease-out, Options: http://css-tricks.com/almanac/properties/t/transition-timing-function/
|
73
|
+
// $ease - Default: ease-out, Options: http://css-tricks.com/almanac/properties/t/transition-timing-function/
|
74
74
|
@mixin single-transition($property:all, $speed:300ms, $ease:ease-out) {
|
75
|
-
transition
|
75
|
+
@include transition($property, $speed, $ease);
|
76
|
+
}
|
77
|
+
|
78
|
+
// @mixins
|
79
|
+
//
|
80
|
+
// We use this to add single or multiple transitions to elements
|
81
|
+
// $property - Default: all, Options: http://www.w3.org/TR/css3-transitions/#animatable-properties
|
82
|
+
// $speed - Default: 300ms
|
83
|
+
// $ease - Default: ease-out, Options: http://css-tricks.com/almanac/properties/t/transition-timing-function/
|
84
|
+
// $delay - Default: null (0s)
|
85
|
+
@mixin transition($property:all, $speed:300ms, $ease:ease-out, $delay:null) {
|
86
|
+
$transition: none;
|
87
|
+
|
88
|
+
@if length($property) > 1 {
|
89
|
+
|
90
|
+
@each $transition_list in $property {
|
91
|
+
|
92
|
+
@for $i from 1 through length($transition_list) {
|
93
|
+
|
94
|
+
@if $i == 1 {
|
95
|
+
$_property: nth($transition_list, $i);
|
96
|
+
}
|
97
|
+
|
98
|
+
@if length($transition_list) > 1 {
|
99
|
+
@if $i == 2 {
|
100
|
+
$_speed: nth($transition_list, $i);
|
101
|
+
}
|
102
|
+
} @else {
|
103
|
+
$_speed: $speed;
|
104
|
+
}
|
105
|
+
|
106
|
+
@if length($transition_list) > 2 {
|
107
|
+
@if $i == 3 {
|
108
|
+
$_ease: nth($transition_list, $i);
|
109
|
+
}
|
110
|
+
} @else {
|
111
|
+
$_ease: $ease;
|
112
|
+
}
|
113
|
+
|
114
|
+
@if length($transition_list) > 3 {
|
115
|
+
@if $i == 4 {
|
116
|
+
$_delay: nth($transition_list, $i);
|
117
|
+
}
|
118
|
+
} @else {
|
119
|
+
$_delay: $delay;
|
120
|
+
}
|
121
|
+
}
|
122
|
+
|
123
|
+
@if $transition == none {
|
124
|
+
$transition: $_property $_speed $_ease $_delay;
|
125
|
+
} @else {
|
126
|
+
$transition: $transition, $_property $_speed $_ease $_delay;
|
127
|
+
}
|
128
|
+
}
|
129
|
+
}
|
130
|
+
@else {
|
131
|
+
|
132
|
+
@each $prop in $property {
|
133
|
+
|
134
|
+
@if $transition == none {
|
135
|
+
$transition: $prop $speed $ease $delay;
|
136
|
+
} @else {
|
137
|
+
$transition: $transition, $prop $speed $ease $delay;
|
138
|
+
}
|
139
|
+
}
|
140
|
+
}
|
141
|
+
|
142
|
+
transition: $transition;
|
76
143
|
}
|
77
144
|
|
78
145
|
// @mixins
|
@@ -91,11 +158,11 @@ $base-line-height: 1.5 !default;
|
|
91
158
|
// $triangle-color - Used to set border-color which makes up triangle. No default
|
92
159
|
// $triangle-direction - Used to determine which direction triangle points. Options: top, bottom, left, right
|
93
160
|
@mixin css-triangle($triangle-size, $triangle-color, $triangle-direction) {
|
161
|
+
border: inset $triangle-size;
|
94
162
|
content: "";
|
95
163
|
display: block;
|
96
|
-
width: 0;
|
97
164
|
height: 0;
|
98
|
-
|
165
|
+
width: 0;
|
99
166
|
@if ($triangle-direction == top) {
|
100
167
|
border-color: $triangle-color transparent transparent transparent;
|
101
168
|
border-top-style: solid;
|
@@ -128,9 +195,9 @@ $base-line-height: 1.5 !default;
|
|
128
195
|
@mixin hamburger($width, $left, $top, $thickness, $gap, $color, $hover-color, $offcanvas) {
|
129
196
|
span::after {
|
130
197
|
content: "";
|
131
|
-
position: absolute;
|
132
198
|
display: block;
|
133
199
|
height: 0;
|
200
|
+
position: absolute;
|
134
201
|
|
135
202
|
@if $offcanvas {
|
136
203
|
@if $top {
|
@@ -148,8 +215,8 @@ $base-line-height: 1.5 !default;
|
|
148
215
|
}
|
149
216
|
}
|
150
217
|
@else {
|
151
|
-
top: 50%;
|
152
218
|
margin-top: -($width/2);
|
219
|
+
top: 50%;
|
153
220
|
#{$opposite-direction}: $topbar-link-padding;
|
154
221
|
}
|
155
222
|
|
@@ -183,8 +250,8 @@ $base-line-height: 1.5 !default;
|
|
183
250
|
transition: box-shadow $fade-time, border-color $fade-time ease-in-out;
|
184
251
|
|
185
252
|
&:#{$selector} {
|
186
|
-
box-shadow: 0 0 5px $glowing-effect-color;
|
187
253
|
border-color: $glowing-effect-color;
|
254
|
+
box-shadow: 0 0 5px $glowing-effect-color;
|
188
255
|
}
|
189
256
|
}
|
190
257
|
|
@@ -194,7 +261,7 @@ $base-line-height: 1.5 !default;
|
|
194
261
|
// $horizontal: Default: 0
|
195
262
|
// $vertical: Default: 0
|
196
263
|
@mixin translate2d($horizontal:0, $vertical:0) {
|
197
|
-
transform: translate($horizontal
|
264
|
+
transform: translate($horizontal, $vertical)
|
198
265
|
}
|
199
266
|
|
200
267
|
// @mixins
|
@@ -202,11 +269,11 @@ $base-line-height: 1.5 !default;
|
|
202
269
|
// Makes an element visually hidden, but accessible.
|
203
270
|
// @see http://snook.ca/archives/html_and_css/hiding-content-for-accessibility
|
204
271
|
@mixin element-invisible {
|
205
|
-
|
272
|
+
clip: rect(1px, 1px, 1px, 1px);
|
206
273
|
height: 1px;
|
207
|
-
width: 1px;
|
208
274
|
overflow: hidden;
|
209
|
-
|
275
|
+
position: absolute !important;
|
276
|
+
width: 1px;
|
210
277
|
}
|
211
278
|
|
212
279
|
// @mixins
|
@@ -291,17 +358,22 @@ $shiny-edge-active-color: rgba(#000, .2) !default;
|
|
291
358
|
// We use this to control whether or not CSS classes come through in the gem files.
|
292
359
|
$include-html-classes: true !default;
|
293
360
|
$include-print-styles: true !default;
|
361
|
+
$include-js-meta-styles: true !default; // Warning! Meta styles are a dependancy of the Javascript.
|
294
362
|
$include-html-global-classes: $include-html-classes !default;
|
295
363
|
|
296
364
|
$column-gutter: rem-calc(30) !default;
|
297
365
|
|
298
366
|
// Media Query Ranges
|
299
|
-
$small-
|
300
|
-
$medium-
|
301
|
-
$large-
|
302
|
-
$xlarge-
|
303
|
-
$xxlarge-range: (120.063em, 99999999em) !default;
|
367
|
+
$small-breakpoint: em-calc(640) !default;
|
368
|
+
$medium-breakpoint: em-calc(1024) !default;
|
369
|
+
$large-breakpoint: em-calc(1440) !default;
|
370
|
+
$xlarge-breakpoint: em-calc(1920) !default;
|
304
371
|
|
372
|
+
$small-range: (0, $small-breakpoint) !default;
|
373
|
+
$medium-range: ($small-breakpoint + em-calc(1), $medium-breakpoint) !default;
|
374
|
+
$large-range: ($medium-breakpoint + em-calc(1), $large-breakpoint) !default;
|
375
|
+
$xlarge-range: ($large-breakpoint + em-calc(1), $xlarge-breakpoint) !default;
|
376
|
+
$xxlarge-range: ($xlarge-breakpoint + em-calc(1), em-calc(99999999)) !default;
|
305
377
|
|
306
378
|
$screen: "only screen" !default;
|
307
379
|
|
@@ -323,8 +395,17 @@ $xlarge-only: "#{$screen} and (min-width:#{lower-bound($xlarge-range)}) and (max
|
|
323
395
|
$xxlarge-up: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)})" !default;
|
324
396
|
$xxlarge-only: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)}) and (max-width:#{upper-bound($xxlarge-range)})" !default;
|
325
397
|
|
398
|
+
$retina: (
|
399
|
+
"#{$screen} and (-webkit-min-device-pixel-ratio: 2)",
|
400
|
+
"#{$screen} and (min--moz-device-pixel-ratio: 2)",
|
401
|
+
"#{$screen} and (-o-min-device-pixel-ratio: 2/1)",
|
402
|
+
"#{$screen} and (min-device-pixel-ratio: 2)",
|
403
|
+
"#{$screen} and (min-resolution: 192dpi)",
|
404
|
+
"#{$screen} and (min-resolution: 2dppx)"
|
405
|
+
);
|
406
|
+
|
326
407
|
// Legacy
|
327
|
-
$small: $
|
408
|
+
$small: $small-up;
|
328
409
|
$medium: $medium-up;
|
329
410
|
$large: $large-up;
|
330
411
|
|
@@ -341,61 +422,65 @@ $cursor-text-value: text !default;
|
|
341
422
|
|
342
423
|
@include exports("global") {
|
343
424
|
|
344
|
-
// Meta styles are
|
425
|
+
// Meta styles are a dependancy of the Javascript.
|
345
426
|
// Used to provide media query values for javascript components.
|
346
427
|
// Forward slash placed around everything to convince PhantomJS to read the value.
|
347
428
|
|
348
|
-
meta
|
349
|
-
font-family: "/5.5.0/";
|
350
|
-
}
|
429
|
+
@if $include-js-meta-styles {
|
351
430
|
|
352
|
-
|
353
|
-
|
354
|
-
|
355
|
-
}
|
431
|
+
meta.foundation-version {
|
432
|
+
font-family: "/5.5.3/";
|
433
|
+
}
|
356
434
|
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
|
435
|
+
meta.foundation-mq-small {
|
436
|
+
font-family: "/" + unquote($small-up) + "/";
|
437
|
+
width: lower-bound($small-range);
|
438
|
+
}
|
361
439
|
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
440
|
+
meta.foundation-mq-small-only {
|
441
|
+
font-family: "/" + unquote($small-only) + "/";
|
442
|
+
width: lower-bound($small-range);
|
443
|
+
}
|
366
444
|
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
445
|
+
meta.foundation-mq-medium {
|
446
|
+
font-family: "/" + unquote($medium-up) + "/";
|
447
|
+
width: lower-bound($medium-range);
|
448
|
+
}
|
371
449
|
|
372
|
-
|
373
|
-
|
374
|
-
|
375
|
-
|
450
|
+
meta.foundation-mq-medium-only {
|
451
|
+
font-family: "/" + unquote($medium-only) + "/";
|
452
|
+
width: lower-bound($medium-range);
|
453
|
+
}
|
376
454
|
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
455
|
+
meta.foundation-mq-large {
|
456
|
+
font-family: "/" + unquote($large-up) + "/";
|
457
|
+
width: lower-bound($large-range);
|
458
|
+
}
|
381
459
|
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
460
|
+
meta.foundation-mq-large-only {
|
461
|
+
font-family: "/" + unquote($large-only) + "/";
|
462
|
+
width: lower-bound($large-range);
|
463
|
+
}
|
386
464
|
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
465
|
+
meta.foundation-mq-xlarge {
|
466
|
+
font-family: "/" + unquote($xlarge-up) + "/";
|
467
|
+
width: lower-bound($xlarge-range);
|
468
|
+
}
|
391
469
|
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
470
|
+
meta.foundation-mq-xlarge-only {
|
471
|
+
font-family: "/" + unquote($xlarge-only) + "/";
|
472
|
+
width: lower-bound($xlarge-range);
|
473
|
+
}
|
474
|
+
|
475
|
+
meta.foundation-mq-xxlarge {
|
476
|
+
font-family: "/" + unquote($xxlarge-up) + "/";
|
477
|
+
width: lower-bound($xxlarge-range);
|
478
|
+
}
|
479
|
+
|
480
|
+
meta.foundation-data-attribute-namespace {
|
481
|
+
font-family: #{$namespace};
|
482
|
+
}
|
396
483
|
|
397
|
-
meta.foundation-data-attribute-namespace {
|
398
|
-
font-family: #{$namespace};
|
399
484
|
}
|
400
485
|
|
401
486
|
@if $include-html-global-classes {
|
@@ -417,14 +502,14 @@ $cursor-text-value: text !default;
|
|
417
502
|
body {
|
418
503
|
background: $body-bg;
|
419
504
|
color: $body-font-color;
|
420
|
-
|
421
|
-
margin: 0;
|
505
|
+
cursor: $cursor-auto-value;
|
422
506
|
font-family: $body-font-family;
|
423
|
-
font-weight: $body-font-weight;
|
424
507
|
font-style: $body-font-style;
|
508
|
+
font-weight: $body-font-weight;
|
425
509
|
line-height: $base-line-height; // Set to $base-line-height to take on browser default of 150%
|
510
|
+
margin: 0;
|
511
|
+
padding: 0;
|
426
512
|
position: relative;
|
427
|
-
cursor: $cursor-auto-value;
|
428
513
|
}
|
429
514
|
|
430
515
|
a:hover { cursor: $cursor-pointer-value; }
|
@@ -435,7 +520,8 @@ $cursor-text-value: text !default;
|
|
435
520
|
img { -ms-interpolation-mode: bicubic; }
|
436
521
|
|
437
522
|
#map_canvas,
|
438
|
-
.map_canvas
|
523
|
+
.map_canvas,
|
524
|
+
.mqa-display {
|
439
525
|
img,
|
440
526
|
embed,
|
441
527
|
object { max-width: none !important;
|
@@ -449,8 +535,7 @@ $cursor-text-value: text !default;
|
|
449
535
|
|
450
536
|
// Hide visually and from screen readers
|
451
537
|
.hide {
|
452
|
-
display: none
|
453
|
-
visibility: hidden;
|
538
|
+
display: none;
|
454
539
|
}
|
455
540
|
|
456
541
|
// Hide visually and from screen readers, but maintain layout
|
@@ -2,7 +2,7 @@
|
|
2
2
|
// foundation.zurb.com
|
3
3
|
// Licensed under MIT Open Source
|
4
4
|
|
5
|
-
@import
|
5
|
+
@import 'global';
|
6
6
|
|
7
7
|
//
|
8
8
|
// @variables
|
@@ -29,7 +29,9 @@ $last-child-float: $opposite-direction !default;
|
|
29
29
|
// $colNumber - Found in settings file
|
30
30
|
// $totalColumns - Found in settings file
|
31
31
|
@function grid-calc($colNumber, $totalColumns) {
|
32
|
-
|
32
|
+
$result: percentage(($colNumber / $totalColumns));
|
33
|
+
@if $result == 0% { $result: 0; }
|
34
|
+
@return $result;
|
33
35
|
}
|
34
36
|
|
35
37
|
//
|
@@ -44,36 +46,30 @@ $last-child-float: $opposite-direction !default;
|
|
44
46
|
|
45
47
|
// use @include grid-row(nest); to include a nested row
|
46
48
|
@if $behavior == nest {
|
47
|
-
|
48
|
-
margin-#{$default-float}: -($column-gutter/2);
|
49
|
-
margin-#{$opposite-direction}: -($column-gutter/2);
|
50
|
-
margin-top: 0;
|
51
|
-
margin-bottom: 0;
|
49
|
+
margin: 0 (-($column-gutter/2));
|
52
50
|
max-width: none;
|
51
|
+
width: auto;
|
53
52
|
}
|
54
53
|
|
55
54
|
// use @include grid-row(collapse); to collapsed a container row margins
|
56
55
|
@else if $behavior == collapse {
|
57
|
-
width: 100%;
|
58
56
|
margin: 0;
|
59
57
|
max-width: $row-width;
|
58
|
+
width: 100%;
|
60
59
|
}
|
61
60
|
|
62
61
|
// use @include grid-row(nest-collapse); to collapse outer margins on a nested row
|
63
62
|
@else if $behavior == nest-collapse {
|
64
|
-
width: auto;
|
65
63
|
margin: 0;
|
66
64
|
max-width: none;
|
65
|
+
width: auto;
|
67
66
|
}
|
68
67
|
|
69
68
|
// use @include grid-row; to use a container row
|
70
69
|
@else {
|
71
|
-
|
72
|
-
margin-#{$default-float}: auto;
|
73
|
-
margin-#{$opposite-direction}: auto;
|
74
|
-
margin-top: 0;
|
75
|
-
margin-bottom: 0;
|
70
|
+
margin: 0 auto;
|
76
71
|
max-width: $row-width;
|
72
|
+
width: 100%;
|
77
73
|
}
|
78
74
|
|
79
75
|
// Clearfix for all rows
|
@@ -132,7 +128,7 @@ $last-child-float: $opposite-direction !default;
|
|
132
128
|
@if $push { #{$default-float}: grid-calc($push, $total-columns); #{$opposite-direction}: auto; }
|
133
129
|
@if $pull { #{$opposite-direction}: grid-calc($pull, $total-columns); #{$default-float}: auto; }
|
134
130
|
|
135
|
-
@if $float {
|
131
|
+
@if $float and $last-column == false {
|
136
132
|
@if $float == left or $float == true { float: $default-float; }
|
137
133
|
@else if $float == right { float: $opposite-direction; }
|
138
134
|
@else { float: none; }
|
@@ -169,19 +165,19 @@ $last-child-float: $opposite-direction !default;
|
|
169
165
|
|
170
166
|
|
171
167
|
@for $i from 1 through $total-columns {
|
172
|
-
.#{$size}-#{$i} { @include grid-column($columns:$i
|
168
|
+
.#{$size}-#{$i} { @include grid-column($columns:$i, $collapse:null, $float:false); }
|
173
169
|
}
|
174
170
|
|
175
171
|
@for $i from 0 through $total-columns - 1 {
|
176
|
-
.#{$size}-offset-#{$i} { @include grid-column($offset:$i, $collapse:null
|
172
|
+
.#{$size}-offset-#{$i} { @include grid-column($offset:$i, $collapse:null, $float:false); }
|
177
173
|
}
|
178
174
|
|
179
175
|
.#{$size}-reset-order {
|
176
|
+
float: $default-float;
|
177
|
+
left: auto;
|
180
178
|
margin-#{$default-float}: 0;
|
181
179
|
margin-#{$opposite-direction}: 0;
|
182
|
-
left: auto;
|
183
180
|
right: auto;
|
184
|
-
float: $default-float;
|
185
181
|
}
|
186
182
|
|
187
183
|
.column.#{$size}-centered,
|
@@ -189,9 +185,9 @@ $last-child-float: $opposite-direction !default;
|
|
189
185
|
|
190
186
|
.column.#{$size}-uncentered,
|
191
187
|
.columns.#{$size}-uncentered {
|
188
|
+
float: $default-float;
|
192
189
|
margin-#{$default-float}: 0;
|
193
190
|
margin-#{$opposite-direction}: 0;
|
194
|
-
float: $default-float;
|
195
191
|
}
|
196
192
|
|
197
193
|
// Fighting [class*="column"] + [class*="column"]:last-child
|
@@ -211,20 +207,20 @@ $last-child-float: $opposite-direction !default;
|
|
211
207
|
float: $opposite-direction;
|
212
208
|
}
|
213
209
|
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
210
|
+
.row {
|
211
|
+
&.#{$size}-collapse {
|
212
|
+
> .column,
|
213
|
+
> .columns { @include grid-column($collapse:true, $float:false); }
|
214
|
+
|
215
|
+
.row {margin-left:0; margin-right:0;}
|
216
|
+
}
|
217
|
+
&.#{$size}-uncollapse {
|
218
|
+
> .column,
|
219
|
+
> .columns {
|
220
|
+
@include grid-column;
|
221
|
+
}
|
222
|
+
}
|
223
|
+
}
|
228
224
|
}
|
229
225
|
|
230
226
|
@include exports("grid") {
|
@@ -247,8 +243,15 @@ $last-child-float: $opposite-direction !default;
|
|
247
243
|
.column,
|
248
244
|
.columns { @include grid-column($columns:$total-columns); }
|
249
245
|
|
250
|
-
|
251
|
-
|
246
|
+
.column,
|
247
|
+
.columns {
|
248
|
+
& + &:last-child {
|
249
|
+
float: $last-child-float;
|
250
|
+
}
|
251
|
+
& + &.end {
|
252
|
+
float: $default-float;
|
253
|
+
}
|
254
|
+
}
|
252
255
|
|
253
256
|
@media #{$small-up} {
|
254
257
|
@include grid-html-classes($size:small);
|