catscope 0.1.0 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (87) hide show
  1. checksums.yaml +4 -4
  2. data/assets/bower.json +1 -0
  3. data/assets/bower_components/foundation/LICENSE +22 -0
  4. data/assets/bower_components/foundation/README.md +46 -0
  5. data/assets/bower_components/foundation/bower.json +2 -4
  6. data/assets/bower_components/foundation/css/foundation.css +1695 -1230
  7. data/assets/bower_components/foundation/css/foundation.css.map +1 -1
  8. data/assets/bower_components/foundation/css/foundation.min.css +1 -0
  9. data/assets/bower_components/foundation/css/normalize.css +9 -12
  10. data/assets/bower_components/foundation/css/normalize.css.map +1 -1
  11. data/assets/bower_components/foundation/css/normalize.min.css +1 -0
  12. data/assets/bower_components/foundation/js/foundation/foundation.abide.js +171 -75
  13. data/assets/bower_components/foundation/js/foundation/foundation.accordion.js +70 -12
  14. data/assets/bower_components/foundation/js/foundation/foundation.alert.js +5 -5
  15. data/assets/bower_components/foundation/js/foundation/foundation.clearing.js +84 -40
  16. data/assets/bower_components/foundation/js/foundation/foundation.dropdown.js +104 -79
  17. data/assets/bower_components/foundation/js/foundation/foundation.equalizer.js +57 -26
  18. data/assets/bower_components/foundation/js/foundation/foundation.interchange.js +50 -38
  19. data/assets/bower_components/foundation/js/foundation/foundation.joyride.js +121 -110
  20. data/assets/bower_components/foundation/js/foundation/foundation.js +121 -79
  21. data/assets/bower_components/foundation/js/foundation/foundation.magellan.js +75 -59
  22. data/assets/bower_components/foundation/js/foundation/foundation.offcanvas.js +95 -22
  23. data/assets/bower_components/foundation/js/foundation/foundation.orbit.js +127 -123
  24. data/assets/bower_components/foundation/js/foundation/foundation.reveal.js +147 -69
  25. data/assets/bower_components/foundation/js/foundation/foundation.slider.js +101 -72
  26. data/assets/bower_components/foundation/js/foundation/foundation.tab.js +52 -39
  27. data/assets/bower_components/foundation/js/foundation/foundation.tooltip.js +97 -49
  28. data/assets/bower_components/foundation/js/foundation/foundation.topbar.js +70 -57
  29. data/assets/bower_components/foundation/js/foundation.js +1544 -951
  30. data/assets/bower_components/foundation/js/foundation.min.js +5 -4
  31. data/assets/bower_components/foundation/js/vendor/fastclick.js +8 -9
  32. data/assets/bower_components/foundation/js/vendor/jquery.js +6 -6
  33. data/assets/bower_components/foundation/js/vendor/modernizr.js +1 -1
  34. data/assets/bower_components/foundation/package.json +57 -0
  35. data/assets/bower_components/foundation/scss/foundation/_functions.scss +53 -43
  36. data/assets/bower_components/foundation/scss/foundation/_settings.scss +59 -37
  37. data/assets/bower_components/foundation/scss/foundation/components/_accordion.scss +12 -8
  38. data/assets/bower_components/foundation/scss/foundation/components/_alert-boxes.scss +12 -12
  39. data/assets/bower_components/foundation/scss/foundation/components/_block-grid.scss +14 -13
  40. data/assets/bower_components/foundation/scss/foundation/components/_breadcrumbs.scss +19 -19
  41. data/assets/bower_components/foundation/scss/foundation/components/_button-groups.scss +33 -25
  42. data/assets/bower_components/foundation/scss/foundation/components/_buttons.scss +30 -28
  43. data/assets/bower_components/foundation/scss/foundation/components/_clearing.scss +51 -47
  44. data/assets/bower_components/foundation/scss/foundation/components/_dropdown-buttons.scss +10 -11
  45. data/assets/bower_components/foundation/scss/foundation/components/_dropdown.scss +45 -38
  46. data/assets/bower_components/foundation/scss/foundation/components/_flex-video.scss +7 -7
  47. data/assets/bower_components/foundation/scss/foundation/components/_forms.scss +99 -62
  48. data/assets/bower_components/foundation/scss/foundation/components/_global.scss +152 -67
  49. data/assets/bower_components/foundation/scss/foundation/components/_grid.scss +39 -36
  50. data/assets/bower_components/foundation/scss/foundation/components/_icon-bar.scss +337 -235
  51. data/assets/bower_components/foundation/scss/foundation/components/_inline-lists.scss +9 -8
  52. data/assets/bower_components/foundation/scss/foundation/components/_joyride.scss +40 -42
  53. data/assets/bower_components/foundation/scss/foundation/components/_keystrokes.scss +2 -3
  54. data/assets/bower_components/foundation/scss/foundation/components/_labels.scss +6 -6
  55. data/assets/bower_components/foundation/scss/foundation/components/_magellan.scss +2 -2
  56. data/assets/bower_components/foundation/scss/foundation/components/_offcanvas.scss +259 -168
  57. data/assets/bower_components/foundation/scss/foundation/components/_orbit.scss +82 -62
  58. data/assets/bower_components/foundation/scss/foundation/components/_pagination.scss +16 -15
  59. data/assets/bower_components/foundation/scss/foundation/components/_panels.scss +21 -15
  60. data/assets/bower_components/foundation/scss/foundation/components/_pricing-tables.scss +16 -16
  61. data/assets/bower_components/foundation/scss/foundation/components/_progress-bars.scss +10 -4
  62. data/assets/bower_components/foundation/scss/foundation/components/_range-slider.scss +28 -20
  63. data/assets/bower_components/foundation/scss/foundation/components/_reveal.scss +38 -28
  64. data/assets/bower_components/foundation/scss/foundation/components/_side-nav.scss +15 -11
  65. data/assets/bower_components/foundation/scss/foundation/components/_split-buttons.scss +22 -18
  66. data/assets/bower_components/foundation/scss/foundation/components/_sub-nav.scss +14 -12
  67. data/assets/bower_components/foundation/scss/foundation/components/_switches.scss +22 -19
  68. data/assets/bower_components/foundation/scss/foundation/components/_tables.scss +8 -8
  69. data/assets/bower_components/foundation/scss/foundation/components/_tabs.scss +50 -31
  70. data/assets/bower_components/foundation/scss/foundation/components/_thumbs.scss +8 -8
  71. data/assets/bower_components/foundation/scss/foundation/components/_tooltips.scss +25 -25
  72. data/assets/bower_components/foundation/scss/foundation/components/_top-bar.scss +176 -122
  73. data/assets/bower_components/foundation/scss/foundation/components/_type.scss +38 -38
  74. data/assets/bower_components/foundation/scss/foundation/components/_visibility.scss +33 -16
  75. data/assets/bower_components/foundation/scss/foundation.scss +37 -40
  76. data/assets/bower_components/foundation/scss/normalize.scss +8 -11
  77. data/assets/bower_components/jquery/bower.json +2 -1
  78. data/assets/bower_components/jquery/dist/jquery.js +9 -4
  79. data/assets/bower_components/jquery/dist/jquery.min.js +4 -4
  80. data/assets/bower_components/jquery/dist/jquery.min.map +1 -1
  81. data/assets/bower_components/jquery/src/core.js +6 -1
  82. data/assets/scss/_settings.scss +2 -0
  83. data/assets/stylesheets/app.css +3066 -2429
  84. data/lib/catscope/version.rb +1 -1
  85. data/lib/catscope/views/layout.erb +6 -2
  86. metadata +8 -4
  87. 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 "global";
5
+ @import 'global';
6
6
 
7
7
  // @variables
8
8
  //
@@ -10,7 +10,7 @@ $include-html-orbit-classes: $include-html-classes !default;
10
10
 
11
11
  // We use these to control the caption styles
12
12
  $orbit-container-bg: none !default;
13
- $orbit-caption-bg: rgba(51,51,51, 0.8) !default;
13
+ $orbit-caption-bg: rgba(51,51,51, .8) !default;
14
14
  $orbit-caption-font-color: $white !default;
15
15
  $orbit-caption-font-size: rem-calc(14) !default;
16
16
  $orbit-caption-position: "bottom" !default; // Supported values: "bottom", "under"
@@ -51,20 +51,30 @@ $orbit-timer-hide-for-small: true !default;
51
51
  @if $include-html-orbit-classes {
52
52
 
53
53
  @-webkit-keyframes rotate {
54
- from { -webkit-transform: rotate(0deg); }
55
- to { -webkit-transform: rotate(360deg); }
56
- }
57
- @-moz-keyframes rotate {
58
- from { -moz-transform: rotate(0deg); }
59
- to { -moz-transform: rotate(360deg); }
60
- }
61
- @-o-keyframes rotate {
62
- from { -o-transform: rotate(0deg); }
63
- to { -o-transform: rotate(360deg); }
54
+ from {
55
+ -webkit-transform: rotate(0deg);
56
+ transform: rotate(0deg);
57
+ }
58
+ to {
59
+ -webkit-transform: rotate(360deg);
60
+ transform: rotate(360deg);
61
+ }
64
62
  }
63
+
64
+
65
65
  @keyframes rotate {
66
- from { transform: rotate(0deg); }
67
- to { transform: rotate(360deg); }
66
+ from {
67
+ -webkit-transform: rotate(0deg);
68
+ -moz-transform: rotate(0deg);
69
+ -ms-transform: rotate(0deg);
70
+ transform: rotate(0deg);
71
+ }
72
+ to {
73
+ -webkit-transform: rotate(360deg);
74
+ -moz-transform: rotate(360deg);
75
+ -ms-transform: rotate(360deg);
76
+ transform: rotate(360deg);
77
+ }
68
78
  }
69
79
 
70
80
  /* Orbit Graceful Loading */
@@ -98,30 +108,30 @@ $orbit-timer-hide-for-small: true !default;
98
108
 
99
109
  // Orbit preloader
100
110
  .#{$preloader-class} {
101
- display: block;
102
- width: 40px;
103
- height: 40px;
104
- position: absolute;
105
- top: 50%;
106
- left: 50%;
107
- margin-top: -20px;
108
- margin-left: -20px;
109
- border: solid 3px;
110
- border-color: $charcoal $white;
111
111
  @include radius(1000px);
112
- animation-name: rotate;
113
112
  animation-duration: 1.5s;
114
113
  animation-iteration-count: infinite;
114
+ animation-name: rotate;
115
115
  animation-timing-function: linear;
116
+ border-color: $charcoal $white;
117
+ border: solid 3px;
118
+ display: block;
119
+ height: 40px;
120
+ left: 50%;
121
+ margin-left: -20px;
122
+ margin-top: -20px;
123
+ position: absolute;
124
+ top: 50%;
125
+ width: 40px;
116
126
  }
117
127
  }
118
128
 
119
129
 
120
130
  .orbit-container {
131
+ background: $orbit-container-bg;
121
132
  overflow: hidden;
122
- width: 100%;
123
133
  position: relative;
124
- background: $orbit-container-bg;
134
+ width: 100%;
125
135
 
126
136
  .orbit-slides-container {
127
137
  list-style: none;
@@ -131,10 +141,14 @@ $orbit-timer-hide-for-small: true !default;
131
141
 
132
142
  // Prevents images (and captions) from disappearing after first rotation on Chrome for Android
133
143
  -webkit-transform: translateZ(0);
144
+ -moz-transform: translateZ(0);
145
+ -ms-transform: translateZ(0);
146
+ -o-transform: translateZ(0);
147
+ transform: translateZ(0);
134
148
 
135
149
  img { display: block; max-width: 100%; }
136
150
 
137
- &>* {
151
+ > * {
138
152
  position: absolute;
139
153
  top: 0;
140
154
  width: 100%;
@@ -147,48 +161,51 @@ $orbit-timer-hide-for-small: true !default;
147
161
 
148
162
  &:first-child {
149
163
  @if $text-direction == rtl {
150
- margin-right: 0;
164
+ margin-right: 0;
151
165
  }
152
166
  @else {
153
- margin-left: 0;
167
+ margin-left: 0;
154
168
  }
155
169
  }
156
170
 
157
171
  .orbit-caption {
158
172
  @if $orbit-caption-position == "bottom" {
159
- position: absolute;
160
173
  bottom: 0;
174
+ position: absolute;
161
175
  } @else if $orbit-caption-position == "under" {
162
176
  position: relative;
163
177
  }
164
178
 
165
179
  background-color: $orbit-caption-bg;
166
180
  color: $orbit-caption-font-color;
167
- width: 100%;
168
- padding: $orbit-caption-padding;
169
181
  font-size: $orbit-caption-font-size;
182
+ padding: $orbit-caption-padding;
183
+ width: 100%;
170
184
  }
171
185
  }
172
186
  }
173
187
 
174
188
  .orbit-slide-number {
175
- position: absolute;
176
- top: 10px;
177
189
  #{$default-float}: 10px;
190
+ background: $orbit-slide-number-bg;
191
+ color: $orbit-slide-number-font-color;
178
192
  font-size: 12px;
193
+ position: absolute;
179
194
  span { font-weight: 700; padding: $orbit-slide-number-padding;}
180
- color: $orbit-slide-number-font-color;
181
- background: $orbit-slide-number-bg;
195
+ top: 10px;
182
196
  z-index: 10;
183
197
  }
184
198
 
185
199
  .orbit-timer {
200
+
186
201
  position: absolute;
187
202
  top: 12px;
188
203
  #{$opposite-direction}: 10px;
189
204
  height: 6px;
190
205
  width: 100px;
191
206
  z-index: 10;
207
+
208
+
192
209
  .orbit-progress {
193
210
  @if $orbit-timer-show-progress-bar {
194
211
  height: 3px;
@@ -198,26 +215,26 @@ $orbit-timer-hide-for-small: true !default;
198
215
  position: relative;
199
216
  right: 20px;
200
217
  top: 5px;
218
+
201
219
  }
202
220
  }
203
221
 
204
222
  // Play button
205
223
  & > span {
224
+ border: solid 4px $white;
225
+ border-bottom: none;
226
+ border-top: none;
206
227
  display: none;
228
+ height: 14px;
207
229
  position: absolute;
208
230
  top: 0;
209
- #{$opposite-direction}: 0;
210
231
  width: 11px;
211
- height: 14px;
212
- border: solid 4px $white;
213
- border-top: none;
214
- border-bottom: none;
232
+ #{$opposite-direction}: 0;
215
233
  }
216
234
 
217
235
  // Pause button
218
236
  &.paused {
219
237
  & > span {
220
- #{$opposite-direction}: -4px;
221
238
  top: 0;
222
239
  width: 11px;
223
240
  height: 14px;
@@ -225,6 +242,8 @@ $orbit-timer-hide-for-small: true !default;
225
242
  border-left-style: solid;
226
243
  border-color: transparent;
227
244
  border-left-color: $white;
245
+ #{$opposite-direction}: -4px;
246
+
228
247
  &.dark {
229
248
  border-left-color: $oil;
230
249
  }
@@ -239,15 +258,15 @@ $orbit-timer-hide-for-small: true !default;
239
258
  // Let's get those controls to be right in the center on each side
240
259
  .orbit-prev,
241
260
  .orbit-next {
242
- position: absolute;
243
- top: 45%;
244
- margin-top: -25px;
245
- width: 36px;
261
+ background-color: $orbit-nav-bg;
262
+ color: white;
246
263
  height: 60px;
247
264
  line-height: 50px;
248
- color: white;
249
- background-color: $orbit-nav-bg;
265
+ margin-top: -25px;
266
+ position: absolute;
250
267
  text-indent: -9999px !important;
268
+ top: 45%;
269
+ width: 36px;
251
270
  z-index: 10;
252
271
 
253
272
  &:hover {
@@ -255,13 +274,13 @@ $orbit-timer-hide-for-small: true !default;
255
274
  }
256
275
 
257
276
  & > span {
277
+ border: inset 10px;
278
+ display: block;
279
+ height: 0;
280
+ margin-top: -10px;
258
281
  position: absolute;
259
282
  top: 50%;
260
- margin-top: -10px;
261
- display: block;
262
283
  width: 0;
263
- height: 0;
264
- border: inset 10px;
265
284
  }
266
285
  }
267
286
  .orbit-prev { #{$default-float}: 0;
@@ -290,23 +309,24 @@ $orbit-timer-hide-for-small: true !default;
290
309
 
291
310
  .orbit-bullets-container { text-align: center; }
292
311
  .orbit-bullets {
312
+ display: block;
313
+ float: none;
293
314
  margin: 0 auto 30px auto;
294
315
  overflow: hidden;
295
316
  position: relative;
296
- top: 10px;
297
- float: none;
298
317
  text-align: center;
299
- display: block;
318
+ top: 10px;
300
319
 
301
320
  li {
302
- cursor:pointer;
303
- display: inline-block;
304
- width: $orbit-bullet-radius;
305
- height: $orbit-bullet-radius;
306
321
  background: $orbit-bullet-nav-color;
322
+ cursor: pointer;
323
+ display: inline-block;
307
324
  // float: $default-float;
308
325
  float: none;
326
+ height: $orbit-bullet-radius;
309
327
  margin-#{$opposite-direction}: 6px;
328
+ width: $orbit-bullet-radius;
329
+
310
330
  @include radius(1000px);
311
331
 
312
332
  &.active {
@@ -344,9 +364,9 @@ $orbit-timer-hide-for-small: true !default;
344
364
  .orbit-stack-on-small {
345
365
  .orbit-slides-container {height: auto !important;}
346
366
  .orbit-slides-container > * {
367
+ margin:0 !important;
368
+ opacity: 1 !important;
347
369
  position: relative;
348
- margin:0 !important;
349
- opacity:1 !important;
350
370
  }
351
371
 
352
372
  .orbit-slide-number {
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
5
+ @import 'global';
6
6
 
7
7
  //
8
8
  // @variables
@@ -51,6 +51,7 @@ $pagination-link-current-active-bg: $primary-color !default;
51
51
  a, button {
52
52
  cursor: $pagination-link-unavailable-cursor;
53
53
  color: $pagination-link-unavailable-font-color;
54
+ pointer-events: none;
54
55
  }
55
56
  &:hover a,
56
57
  & a:focus,
@@ -68,19 +69,19 @@ $pagination-link-current-active-bg: $primary-color !default;
68
69
  a, button {
69
70
  background: $pagination-link-current-background;
70
71
  color: $pagination-link-current-font-color;
71
- font-weight: $pagination-link-current-font-weight;
72
72
  cursor: $pagination-link-current-cursor;
73
+ font-weight: $pagination-link-current-font-weight;
73
74
 
74
75
  &:hover,
75
76
  &:focus { background: $pagination-link-current-active-bg; }
76
77
  }
77
78
  } @else {
78
- height: auto;
79
- padding: $pagination-link-pad;
80
79
  background: $pagination-link-current-background;
81
80
  color: $pagination-link-current-font-color;
82
- font-weight: $pagination-link-current-font-weight;
83
81
  cursor: $pagination-link-current-cursor;
82
+ font-weight: $pagination-link-current-font-weight;
83
+ height: auto;
84
+ padding: $pagination-link-pad;
84
85
  @include radius;
85
86
 
86
87
  &:hover,
@@ -98,25 +99,25 @@ $pagination-link-current-active-bg: $primary-color !default;
98
99
 
99
100
  @if $base-style {
100
101
  display: block;
101
- min-height: $pagination-height;
102
102
  margin-#{$default-float}: $pagination-margin;
103
+ min-height: $pagination-height;
103
104
 
104
105
  li {
105
- height: $pagination-li-height;
106
106
  color: $pagination-li-font-color;
107
107
  font-size: $pagination-li-font-size;
108
+ height: $pagination-li-height;
108
109
  margin-#{$default-float}: $pagination-li-margin;
109
110
 
110
111
  a, button {
111
- display: block;
112
- padding: $pagination-link-pad;
113
- color: $pagination-link-font-color;
114
- background: none;
115
112
  @include radius;
116
- font-weight: normal;
113
+ @include single-transition(background-color);
114
+ background: none;
115
+ color: $pagination-link-font-color;
116
+ display: block;
117
117
  font-size: 1em;
118
+ font-weight: normal;
118
119
  line-height: inherit;
119
- @include single-transition(background-color);
120
+ padding: $pagination-link-pad;
120
121
  }
121
122
 
122
123
  &:hover a,
@@ -135,11 +136,11 @@ $pagination-link-current-active-bg: $primary-color !default;
135
136
  // Left or center align the li elements
136
137
  li {
137
138
  @if $center {
138
- float: none;
139
139
  display: inline-block;
140
+ float: none;
140
141
  } @else {
141
- float: $pagination-li-float;
142
142
  display: block;
143
+ float: $pagination-li-float;
143
144
  }
144
145
  }
145
146
  }
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
5
+ @import 'global';
6
6
 
7
7
  //
8
8
  // @variables
@@ -13,10 +13,10 @@ $include-html-panel-classes: $include-html-classes !default;
13
13
  $panel-bg: scale-color($white, $lightness: -5%) !default;
14
14
  $panel-border-style: solid !default;
15
15
  $panel-border-size: 1px !default;
16
+ $callout-panel-bg: scale-color($primary-color, $lightness: 94%) !default;
16
17
 
17
18
  // We use this % to control how much we darken things on hover
18
- $panel-function-factor: -11% !default;
19
- $panel-border-color: scale-color($panel-bg, $lightness: $panel-function-factor) !default;
19
+ $panel-border-color: scale-color($panel-bg, $lightness: -11%) !default;
20
20
 
21
21
  // We use these to set default inner padding and bottom margin
22
22
  $panel-margin-bottom: rem-calc(20) !default;
@@ -36,14 +36,20 @@ $callout-panel-link-color-hover: scale-color($callout-panel-link-color, $lightne
36
36
  // $bg - Sets the panel background color. Default: $panel-pg || scale-color($white, $lightness: -5%) !default
37
37
  // $padding - Sets the panel padding amount. Default: $panel-padding || rem-calc(20)
38
38
  // $adjust - Sets the font color based on the darkness of the bg & resets header line-heights for panels. Default: $panel-header-adjust || true
39
- @mixin panel($bg:$panel-bg, $padding:$panel-padding, $adjust:$panel-header-adjust) {
39
+ @mixin panel($bg:$panel-bg, $padding:$panel-padding, $adjust:$panel-header-adjust, $border:true) {
40
40
 
41
41
  @if $bg {
42
42
  $bg-lightness: lightness($bg);
43
43
 
44
- border-style: $panel-border-style;
45
- border-width: $panel-border-size;
46
- border-color: scale-color($bg, $lightness: $panel-function-factor);
44
+ @if $border {
45
+ border-style: $panel-border-style;
46
+ border-width: $panel-border-size;
47
+ border-color: $panel-border-color;
48
+ } @else {
49
+ border-style: none;
50
+ border-width: 0;
51
+ }
52
+
47
53
  margin-bottom: $panel-margin-bottom;
48
54
  padding: $padding;
49
55
 
@@ -52,20 +58,20 @@ $callout-panel-link-color-hover: scale-color($callout-panel-link-color, $lightne
52
58
  @else { color: $panel-font-color-alt; }
53
59
 
54
60
  // Respect the padding, fool.
55
- &>:first-child { margin-top: 0; }
56
- &>:last-child { margin-bottom: 0; }
61
+ > :first-child { margin-top: 0; }
62
+ > :last-child { margin-bottom: 0; }
57
63
 
58
64
  @if $adjust {
59
65
  // We set the font color based on the darkness of the bg.
60
- @if $bg-lightness >= 50% {
61
- h1,h2,h3,h4,h5,h6,p,li,dl { color: $panel-font-color; }
66
+ @if $bg-lightness >= 50% {
67
+ h1, h2, h3, h4, h5, h6, p, li, dl { color: $panel-font-color; }
62
68
  }
63
- @else {
64
- h1,h2,h3,h4,h5,h6,p,li,dl { color: $panel-font-color-alt; }
69
+ @else {
70
+ h1, h2, h3, h4, h5, h6, p, li, dl { color: $panel-font-color-alt; }
65
71
  }
66
72
 
67
73
  // reset header line-heights for panels
68
- h1,h2,h3,h4,h5,h6 {
74
+ h1, h2, h3, h4, h5, h6 {
69
75
  line-height: 1; margin-bottom: rem-calc(20) / 2;
70
76
  &.subheader { line-height: 1.4; }
71
77
  }
@@ -80,7 +86,7 @@ $callout-panel-link-color-hover: scale-color($callout-panel-link-color, $lightne
80
86
  .panel { @include panel;
81
87
 
82
88
  &.callout {
83
- @include panel(scale-color($primary-color, $lightness: 94%));
89
+ @include panel($callout-panel-bg);
84
90
  a:not(.button) {
85
91
  color: $callout-panel-link-color;
86
92
 
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
5
+ @import 'global';
6
6
 
7
7
  //
8
8
  // @variables
@@ -75,12 +75,12 @@ $price-cta-padding: rem-calc(20 20 0) !default;
75
75
  // We use this mixin to create the pricing table title styles
76
76
  @mixin pricing-table-title {
77
77
  background-color: $price-title-bg;
78
- padding: $price-title-padding;
79
- text-align: $price-title-align;
80
78
  color: $price-title-color;
81
- font-weight: $price-title-weight;
82
- font-size: $price-title-size;
83
79
  font-family: $price-title-font-family;
80
+ font-size: $price-title-size;
81
+ font-weight: $price-title-weight;
82
+ padding: $price-title-padding;
83
+ text-align: $price-title-align;
84
84
  }
85
85
 
86
86
  // @mixins
@@ -88,12 +88,12 @@ $price-cta-padding: rem-calc(20 20 0) !default;
88
88
  // We use this mixin to control the pricing table price styles
89
89
  @mixin pricing-table-price {
90
90
  background-color: $price-money-bg;
91
- padding: $price-money-padding;
92
- text-align: $price-money-align;
93
91
  color: $price-money-color;
94
- font-weight: $price-money-weight;
95
- font-size: $price-money-size;
96
92
  font-family: $price-money-font-family;
93
+ font-size: $price-money-size;
94
+ font-weight: $price-money-weight;
95
+ padding: $price-money-padding;
96
+ text-align: $price-money-align;
97
97
  }
98
98
 
99
99
  // @mixins
@@ -101,13 +101,13 @@ $price-cta-padding: rem-calc(20 20 0) !default;
101
101
  // We use this mixin to create the description styles for the pricing table
102
102
  @mixin pricing-table-description {
103
103
  background-color: $price-bg;
104
- padding: $price-desc-padding;
105
- text-align: $price-desc-align;
104
+ border-bottom: $price-desc-bottom-border;
106
105
  color: $price-desc-color;
107
106
  font-size: $price-desc-font-size;
108
107
  font-weight: $price-desc-weight;
109
108
  line-height: $price-desc-line-height;
110
- border-bottom: $price-desc-bottom-border;
109
+ padding: $price-desc-padding;
110
+ text-align: $price-desc-align;
111
111
  }
112
112
 
113
113
  // @mixins
@@ -115,12 +115,12 @@ $price-cta-padding: rem-calc(20 20 0) !default;
115
115
  // We use this mixin to style the bullet items in the pricing table
116
116
  @mixin pricing-table-bullet {
117
117
  background-color: $price-bg;
118
- padding: $price-item-padding;
119
- text-align: $price-item-align;
118
+ border-bottom: $price-item-bottom-border;
120
119
  color: $price-item-color;
121
120
  font-size: $price-item-font-size;
122
121
  font-weight: $price-item-weight;
123
- border-bottom: $price-item-bottom-border;
122
+ padding: $price-item-padding;
123
+ text-align: $price-item-align;
124
124
  }
125
125
 
126
126
  // @mixins
@@ -128,8 +128,8 @@ $price-cta-padding: rem-calc(20 20 0) !default;
128
128
  // We use this mixin to style the CTA area of the pricing tables
129
129
  @mixin pricing-table-cta {
130
130
  background-color: $price-cta-bg;
131
- text-align: $price-cta-align;
132
131
  padding: $price-cta-padding;
132
+ text-align: $price-cta-align;
133
133
  }
134
134
 
135
135
  @include exports("pricing-table") {
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
5
+ @import 'global';
6
6
 
7
7
  //
8
8
  // @variables
@@ -34,10 +34,10 @@ $progress-meter-alert-color: $alert-color !default;
34
34
  // We use this to set up the progress bar container
35
35
  @mixin progress-container {
36
36
  background-color: $progress-bar-color;
37
- height: $progress-bar-height;
38
37
  border: $progress-bar-border-size $progress-bar-border-style $progress-bar-border-color;
39
- padding: $progress-bar-pad;
38
+ height: $progress-bar-height;
40
39
  margin-bottom: $progress-bar-margin-bottom;
40
+ padding: $progress-bar-pad;
41
41
  }
42
42
 
43
43
  // @mixins
@@ -45,8 +45,10 @@ $progress-meter-alert-color: $alert-color !default;
45
45
  // $bg - Default: $progress-meter-color || $primary-color
46
46
  @mixin progress-meter($bg:$progress-meter-color) {
47
47
  background: $bg;
48
- height: 100%;
49
48
  display: block;
49
+ height: 100%;
50
+ float: left;
51
+ width: 0%;
50
52
  }
51
53
 
52
54
 
@@ -60,6 +62,10 @@ $progress-meter-alert-color: $alert-color !default;
60
62
  // Meter
61
63
  .meter {
62
64
  @include progress-meter;
65
+
66
+ &.secondary { @include progress-meter($bg:$progress-meter-secondary-color); }
67
+ &.success { @include progress-meter($bg:$progress-meter-success-color); }
68
+ &.alert { @include progress-meter($bg:$progress-meter-alert-color); }
63
69
  }
64
70
  &.secondary .meter { @include progress-meter($bg:$progress-meter-secondary-color); }
65
71
  &.success .meter { @include progress-meter($bg:$progress-meter-success-color); }