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
  //
8
8
  // @name _range-slider.scss
@@ -15,7 +15,7 @@
15
15
 
16
16
  $include-html-range-slider-classes: $include-html-classes !default;
17
17
 
18
- // These variabels define the slider bar styles
18
+ // These variables define the slider bar styles
19
19
  $range-slider-bar-width: 100% !default;
20
20
  $range-slider-bar-height: rem-calc(16) !default;
21
21
 
@@ -31,7 +31,7 @@ $range-slider-active-segment-bg-color: scale-color($secondary-color, $lightness:
31
31
  $range-slider-vertical-bar-width: rem-calc(16) !default;
32
32
  $range-slider-vertical-bar-height: rem-calc(200) !default;
33
33
 
34
- // These variabels define the slider handle styles
34
+ // These variables define the slider handle styles
35
35
  $range-slider-handle-width: rem-calc(32) !default;
36
36
  $range-slider-handle-height: rem-calc(22) !default;
37
37
  $range-slider-handle-position-top: rem-calc(-5) !default;
@@ -44,7 +44,7 @@ $range-slider-handle-round: $global-rounded !default;
44
44
  $range-slider-handle-bg-hover-color: scale-color($primary-color, $lightness: -12%) !default;
45
45
  $range-slider-handle-cursor: pointer !default;
46
46
 
47
- $range-slider-disabled-opacity: 0.7 !default;
47
+ $range-slider-disabled-opacity: .7 !default;
48
48
  $range-slider-disabled-cursor: $cursor-disabled-value !default;
49
49
 
50
50
  //
@@ -52,18 +52,19 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
52
52
  //
53
53
 
54
54
  @mixin range-slider-bar-base($vertical: false) {
55
- display: block;
56
- position: relative;
57
- width: $range-slider-bar-width;
58
- height: $range-slider-bar-height;
59
55
  border: $range-slider-bar-border-width $range-slider-bar-border-style $range-slider-bar-border-color;
60
56
  margin: rem-calc(20 0);
57
+ position: relative;
61
58
  -ms-touch-action: none;
62
59
  touch-action: none;
63
60
  @if $vertical == true {
64
61
  display: inline-block;
65
- width: $range-slider-vertical-bar-width;
66
62
  height: $range-slider-vertical-bar-height;
63
+ width: $range-slider-vertical-bar-width;
64
+ } @else {
65
+ display: block;
66
+ height: $range-slider-bar-height;
67
+ width: $range-slider-bar-width;
67
68
  }
68
69
  }
69
70
  @mixin range-slider-bar-style(
@@ -88,19 +89,20 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
88
89
  }
89
90
 
90
91
  @mixin range-slider-handle-base() {
92
+ border: $range-slider-handle-border-width $range-slider-handle-border-style $range-slider-handle-border-color;
93
+ cursor: $range-slider-handle-cursor;
91
94
  display: inline-block;
95
+ height: $range-slider-handle-height;
92
96
  position: absolute;
93
- z-index: 1;
94
97
  top: $range-slider-handle-position-top;
95
98
  width: $range-slider-handle-width;
96
- height: $range-slider-handle-height;
97
- border: $range-slider-handle-border-width $range-slider-handle-border-style $range-slider-handle-border-color;
98
- cursor: $range-slider-handle-cursor;
99
+ z-index: 1;
99
100
 
100
101
  // This removes the 300ms touch delay on Windows 8
101
102
  -ms-touch-action: manipulation;
102
- touch-action: manipulation;
103
+ touch-action: manipulation;
103
104
  }
105
+
104
106
  @mixin range-slider-handle-style(
105
107
  $bg: true,
106
108
  $radius: false,
@@ -117,6 +119,7 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
117
119
  background: $range-slider-handle-bg-hover-color;
118
120
  }
119
121
  }
122
+
120
123
  @mixin range-slider-handle() {
121
124
  @include range-slider-handle-base;
122
125
  @include range-slider-handle-style;
@@ -131,15 +134,18 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
131
134
  &.vertical-range {
132
135
  @include range-slider-bar-base($vertical: true);
133
136
  .range-slider-handle {
134
- margin-top: 0;
137
+ bottom: -($range-slider-vertical-bar-height - $range-slider-handle-width);
135
138
  margin-#{$default-float}: -($range-slider-handle-width / 4);
139
+ margin-top: 0;
136
140
  position: absolute;
137
- bottom: -($range-slider-vertical-bar-height - $range-slider-handle-width);
138
141
  }
139
142
  .range-slider-active-segment {
140
- width: $range-slider-bar-height - rem-calc((strip-unit($range-slider-bar-border-width) * 2));
141
- height: auto;
143
+ border-bottom-left-radius: inherit;
144
+ border-bottom-right-radius: inherit;
145
+ border-top-left-radius: initial;
142
146
  bottom: 0;
147
+ height: auto;
148
+ width: $range-slider-bar-height - rem-calc((strip-unit($range-slider-bar-border-width) * 2));
143
149
  }
144
150
  }
145
151
  &.radius {
@@ -156,10 +162,12 @@ $range-slider-disabled-cursor: $cursor-disabled-value !default;
156
162
  }
157
163
  }
158
164
  .range-slider-active-segment {
165
+ background: $range-slider-active-segment-bg-color;
166
+ border-bottom-left-radius: inherit;
167
+ border-top-left-radius: inherit;
159
168
  display: inline-block;
160
- position: absolute;
161
169
  height: $range-slider-bar-height - rem-calc((strip-unit($range-slider-bar-border-width) * 2));
162
- background: $range-slider-active-segment-bg-color;
170
+ position: absolute;
163
171
  }
164
172
  .range-slider-handle {
165
173
  @include range-slider-handle-base;
@@ -2,8 +2,8 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
6
- @import "grid";
5
+ @import 'global';
6
+ @import 'grid';
7
7
 
8
8
  //
9
9
  // @name _reveal.scss
@@ -21,7 +21,7 @@ $reveal-modal-bg: $white !default;
21
21
  $reveal-position-top: rem-calc(100) !default;
22
22
  $reveal-default-width: 80% !default;
23
23
  $reveal-max-width: $row-width !default;
24
- $reveal-modal-padding: rem-calc(20) !default;
24
+ $reveal-modal-padding: rem-calc(30) !default;
25
25
  $reveal-box-shadow: 0 0 10px rgba($black,.4) !default;
26
26
 
27
27
  // We use these to style the reveal close button
@@ -43,22 +43,25 @@ $reveal-border-color: $steel !default;
43
43
  $reveal-modal-class: "reveal-modal" !default;
44
44
  $close-reveal-modal-class: "close-reveal-modal" !default;
45
45
 
46
+ // Set base z-index
47
+ $z-index-base: 1005;
48
+
46
49
  //
47
50
  // @mixins
48
51
  //
49
52
 
50
53
  // We use this to create the reveal background overlay styles
51
54
  @mixin reveal-bg( $include-z-index-value: true ) {
52
- position: fixed;
53
55
  // position: absolute; // allows modal background to extend beyond window position
54
- top: 0;
55
- bottom: 0;
56
- left: 0;
57
- right: 0;
58
56
  background: $reveal-overlay-bg-old; // Autoprefixer should be used to avoid such variables needed when Foundation for Sites can do so in the near future.
59
57
  background: $reveal-overlay-bg;
60
- z-index: if( $include-z-index-value, 1004, auto );
58
+ bottom: 0;
61
59
  display: none;
60
+ left: 0;
61
+ position: fixed;
62
+ right: 0;
63
+ top: 0;
64
+ z-index: if( $include-z-index-value, $z-index-base - 1, auto );
62
65
  #{$default-float}: 0;
63
66
  }
64
67
 
@@ -69,13 +72,13 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
69
72
  //
70
73
  @mixin reveal-modal-base( $base-style: true, $width:$reveal-default-width, $max-width:$reveal-max-width, $border-radius: $reveal-radius) {
71
74
  @if $base-style {
72
- visibility: hidden;
75
+ border-radius: $border-radius;
73
76
  display: none;
74
77
  position: absolute;
75
- z-index: 1005;
76
- width: 100vw;
77
78
  top:0;
78
- border-radius: $border-radius;
79
+ visibility: hidden;
80
+ width: 100%;
81
+ z-index: $z-index-base;
79
82
  #{$default-float}: 0;
80
83
 
81
84
  @media #{$small-only} {
@@ -86,18 +89,18 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
86
89
  .column, .columns { min-width: 0; }
87
90
 
88
91
  // Get rid of margin from first and last element inside modal
89
- & > :first-child { margin-top: 0; }
92
+ > :first-child { margin-top: 0; }
90
93
 
91
- & > :last-child { margin-bottom: 0; }
94
+ > :last-child { margin-bottom: 0; }
92
95
  }
93
96
 
94
97
  @if $width {
95
98
  @media #{$medium-up} {
96
- width: $width;
97
- max-width: $max-width;
98
99
  left: 0;
99
- right: 0;
100
100
  margin: 0 auto;
101
+ max-width: $max-width;
102
+ right: 0;
103
+ width: $width;
101
104
  }
102
105
  }
103
106
  }
@@ -133,6 +136,9 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
133
136
  @if $box-shadow {
134
137
  box-shadow: $reveal-box-shadow;
135
138
  }
139
+ @else{
140
+ box-shadow: none;
141
+ }
136
142
 
137
143
  // We can control how much radius is used on the modal
138
144
  @if $radius == true { @include radius($reveal-radius); }
@@ -149,14 +155,14 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
149
155
  //
150
156
  // $color - Default: $reveal-close-color || $base
151
157
  @mixin reveal-close($color:$reveal-close-color) {
158
+ color: $color;
159
+ cursor: $cursor-pointer-value;
152
160
  font-size: $reveal-close-font-size;
161
+ font-weight: $reveal-close-weight;
153
162
  line-height: 1;
154
163
  position: absolute;
155
164
  top: $reveal-close-top;
156
165
  #{$opposite-direction}: $reveal-close-side;
157
- color: $color;
158
- font-weight: $reveal-close-weight;
159
- cursor: $cursor-pointer-value;
160
166
  }
161
167
 
162
168
  @include exports("reveal") {
@@ -175,7 +181,6 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
175
181
  $radius:false,
176
182
  $top-offset:$reveal-position-top
177
183
  );
178
- @include reveal-modal-style($padding:$reveal-modal-padding * 1.5);
179
184
 
180
185
  &.radius { @include reveal-modal-style($radius:true); }
181
186
  &.round { @include reveal-modal-style($radius:$reveal-round); }
@@ -186,14 +191,19 @@ $close-reveal-modal-class: "close-reveal-modal" !default;
186
191
  &.large { @include reveal-modal-base(false, 70%); }
187
192
  &.xlarge { @include reveal-modal-base(false, 95%); }
188
193
  &.full {
189
- @include reveal-modal-base(false, 100vw);
190
- top:0;
191
- left:0;
192
- height:100%;
194
+ @include reveal-modal-base(false, 100%);
193
195
  height: 100vh;
194
- min-height:100vh;
195
- max-width: none !important;
196
+ height:100%;
197
+ left:0;
196
198
  margin-left: 0 !important;
199
+ max-width: none !important;
200
+ min-height:100vh;
201
+ top:0;
202
+ }
203
+
204
+ // Modals pushed to back
205
+ &.toback {
206
+ z-index: $z-index-base - 2;
197
207
  }
198
208
 
199
209
  .#{$close-reveal-modal-class} { @include reveal-close; }
@@ -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
@@ -22,7 +22,7 @@ $side-nav-list-margin: rem-calc(0 0 7 0) !default;
22
22
  $side-nav-link-color: $primary-color !default;
23
23
  $side-nav-link-color-active: scale-color($side-nav-link-color, $lightness: 30%) !default;
24
24
  $side-nav-link-color-hover: scale-color($side-nav-link-color, $lightness: 30%) !default;
25
- $side-nav-link-bg-hover: hsla(0, 0, 0, 0.025) !default;
25
+ $side-nav-link-bg-hover: hsla(0, 0, 0, .025) !default;
26
26
  $side-nav-link-margin: 0 !default;
27
27
  $side-nav-link-padding: rem-calc(7 14) !default;
28
28
  $side-nav-font-size: rem-calc(14) !default;
@@ -40,7 +40,7 @@ $side-nav-heading-text-transform: uppercase !default;
40
40
  // We use these to control border styles
41
41
  $side-nav-divider-size: 1px !default;
42
42
  $side-nav-divider-style: solid !default;
43
- $side-nav-divider-color: scale-color($white, $lightness: 10%) !default;
43
+ $side-nav-divider-color: scale-color($white, $lightness: -10%) !default;
44
44
 
45
45
 
46
46
  //
@@ -58,23 +58,24 @@ $side-nav-divider-color: scale-color($white, $lightness: 10%) !default;
58
58
  $divider-color:$side-nav-divider-color,
59
59
  $font-size:$side-nav-font-size,
60
60
  $link-color:$side-nav-link-color,
61
+ $link-color-active:$side-nav-link-color-active,
61
62
  $link-color-hover:$side-nav-link-color-hover,
62
63
  $link-bg-hover:$side-nav-link-bg-hover) {
63
64
  display: block;
65
+ font-family: $side-nav-font-family;
66
+ list-style-position: $side-nav-list-position;
67
+ list-style-type: $side-nav-list-type;
64
68
  margin: 0;
65
69
  padding: $side-nav-padding;
66
- list-style-type: $side-nav-list-type;
67
- list-style-position: $side-nav-list-position;
68
- font-family: $side-nav-font-family;
69
70
 
70
71
  li {
71
- margin: $side-nav-list-margin;
72
72
  font-size: $font-size;
73
73
  font-weight: $side-nav-font-weight;
74
+ margin: $side-nav-list-margin;
74
75
 
75
76
  a:not(.button) {
76
- display: block;
77
77
  color: $link-color;
78
+ display: block;
78
79
  margin: $side-nav-link-margin;
79
80
  padding: $side-nav-link-padding;
80
81
  &:hover,
@@ -82,19 +83,22 @@ $side-nav-divider-color: scale-color($white, $lightness: 10%) !default;
82
83
  background: $link-bg-hover;
83
84
  color: $link-color-hover;
84
85
  }
86
+ &:active {
87
+ color: $link-color-active;
88
+ }
85
89
  }
86
90
 
87
91
  &.active > a:first-child:not(.button) {
88
92
  color: $side-nav-link-color-active;
89
- font-weight: $side-nav-font-weight-active;
90
93
  font-family: $side-nav-font-family-active;
94
+ font-weight: $side-nav-font-weight-active;
91
95
  }
92
96
 
93
97
  &.divider {
94
98
  border-top: $side-nav-divider-size $side-nav-divider-style;
95
99
  height: 0;
96
- padding: 0;
97
100
  list-style: none;
101
+ padding: 0;
98
102
  border-top-color: $divider-color;
99
103
  }
100
104
 
@@ -111,6 +115,6 @@ $side-nav-divider-color: scale-color($white, $lightness: 10%) !default;
111
115
 
112
116
  @include exports("side-nav") {
113
117
  @if $include-html-nav-classes {
114
- .side-nav { @include side-nav; }
118
+ .side-nav {@include side-nav;}
115
119
  }
116
120
  }
@@ -2,9 +2,9 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
6
- @import "buttons";
7
- @import "dropdown-buttons";
5
+ @import 'global';
6
+ @import 'buttons';
7
+ @import 'dropdown-buttons';
8
8
 
9
9
  //
10
10
  // @name _split-buttons.scss
@@ -22,6 +22,7 @@ $split-button-function-factor: 10% !default;
22
22
  $split-button-pip-color: $white !default;
23
23
  $split-button-pip-color-alt: $oil !default;
24
24
  $split-button-active-bg-tint: rgba(0,0,0,0.1) !default;
25
+ $split-button-span-border-color: rgba(255,255,255,0.5) !default;
25
26
 
26
27
  // We use these to control tiny split buttons
27
28
  $split-button-padding-tny: $button-pip-tny * 10 !default;
@@ -60,12 +61,12 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
60
61
  //
61
62
  // $padding - Type of padding to apply. Default: medium. Options: tiny, small, medium, large.
62
63
  // $pip-color - Color of the triangle. Default: $split-button-pip-color.
63
- // $span-border - Border color of button divider. Default: $primary-color.
64
+ // $span-border - Border color of button divider. Default: $split-button-span-border-color.
64
65
  // $base-style - Apply base style to split button. Default: true.
65
66
  @mixin split-button(
66
67
  $padding:medium,
67
68
  $pip-color:$split-button-pip-color,
68
- $span-border:$primary-color,
69
+ $span-border:$split-button-span-border-color,
69
70
  $base-style:true) {
70
71
 
71
72
  // With this, we can control whether or not the base styles come through.
@@ -90,7 +91,6 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
90
91
  display: block;
91
92
  border-style: inset;
92
93
  top: 50%;
93
-
94
94
  #{$default-float}: 50%;
95
95
  }
96
96
 
@@ -101,7 +101,7 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
101
101
  // Control the border color for the span area of the split button
102
102
  @if $span-border {
103
103
  span {
104
- border-#{$default-float}-color: rgba(255,255,255,0.5);
104
+ border-#{$default-float}-color: $span-border;
105
105
  }
106
106
  }
107
107
 
@@ -113,8 +113,8 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
113
113
  &:after {
114
114
  border-top-style: solid;
115
115
  border-width: $split-button-pip-size-tny;
116
- top: 48%;
117
116
  margin-#{$default-float}: $split-button-pip-default-float-tny;
117
+ top: 48%;
118
118
  }
119
119
  }
120
120
  }
@@ -127,8 +127,8 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
127
127
  &:after {
128
128
  border-top-style: solid;
129
129
  border-width: $split-button-pip-size-sml;
130
- top: 48%;
131
130
  margin-#{$default-float}: $split-button-pip-default-float-sml;
131
+ top: 48%;
132
132
  }
133
133
  }
134
134
  }
@@ -141,8 +141,8 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
141
141
  &:after {
142
142
  border-top-style: solid;
143
143
  border-width: $split-button-pip-size-med;
144
- top: 48%;
145
144
  margin-#{$default-float}: $split-button-pip-default-float-med;
145
+ top: 48%;
146
146
  }
147
147
  }
148
148
  }
@@ -155,8 +155,8 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
155
155
  &:after {
156
156
  border-top-style: solid;
157
157
  border-width: $split-button-pip-size-lrg;
158
- top: 48%;
159
158
  margin-#{$default-float}: $split-button-pip-default-float-lrg;
159
+ top: 48%;
160
160
  }
161
161
  }
162
162
  }
@@ -172,9 +172,9 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
172
172
 
173
173
  .split.button { @include split-button;
174
174
 
175
- &.secondary { @include split-button(false, $split-button-pip-color, $secondary-color, false); }
176
- &.alert { @include split-button(false, false, $alert-color, false); }
177
- &.success { @include split-button(false, false, $success-color, false); }
175
+ &.secondary { @include split-button(false, $split-button-pip-color, $split-button-span-border-color, false); }
176
+ &.alert { @include split-button(false, false, $split-button-span-border-color, false); }
177
+ &.success { @include split-button(false, false, $split-button-span-border-color, false); }
178
178
 
179
179
  &.tiny { @include split-button(tiny, false, false, false); }
180
180
  &.small { @include split-button(small, false, false, false); }
@@ -188,10 +188,14 @@ $split-button-pip-default-float-lrg: rem-calc(-6) !default;
188
188
  &.no-pip{
189
189
  span:before{ border-style:none; }
190
190
  span:after{ border-style:none; }
191
- span{padding-top:$split-button-pip-top-med;}
192
- &.tiny{ span{ padding-top:$split-button-pip-top-tny; } }
193
- &.small{ span{ padding-top:$split-button-pip-top-sml; } }
194
- &.large{ span{ padding-top:$split-button-pip-top-lrg; } }
191
+ span>i{
192
+ display: block;
193
+ left: 50%;
194
+ margin-left: -0.28889em;
195
+ margin-top: -0.48889em;
196
+ position: absolute;
197
+ top: 50%;
198
+ }
195
199
  }
196
200
  }
197
201
 
@@ -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
  // @name _sub-nav.scss
@@ -59,10 +59,10 @@ $sub-nav-item-divider-margin: rem-calc(12) !default;
59
59
  $active-bg: $sub-nav-active-bg,
60
60
  $active-bg-hover: $sub-nav-active-bg-hover) {
61
61
  display: block;
62
- width: auto;
63
- overflow: hidden;
64
62
  margin: $sub-nav-list-margin;
63
+ overflow: hidden;
65
64
  padding-top: $sub-nav-list-padding-top;
65
+ width: auto;
66
66
 
67
67
  dt {
68
68
  text-transform: uppercase;
@@ -71,19 +71,19 @@ $sub-nav-item-divider-margin: rem-calc(12) !default;
71
71
  dt,
72
72
  dd,
73
73
  li {
74
+ color: $font-color;
74
75
  float: $default-float;
75
- display: inline;
76
- margin-#{$default-float}: rem-calc(16);
77
- margin-bottom: 0;
78
76
  font-family: $sub-nav-font-family;
79
- font-weight: $sub-nav-font-weight;
80
77
  font-size: $font-size;
81
- color: $font-color;
78
+ font-weight: $sub-nav-font-weight;
79
+ margin-#{$default-float}: rem-calc(16);
80
+ margin-bottom: 0;
82
81
 
83
82
  a {
84
- text-decoration: $sub-nav-text-decoration;
85
83
  color: $sub-nav-font-color;
86
84
  padding: $sub-nav-padding;
85
+ text-decoration: $sub-nav-text-decoration;
86
+
87
87
  &:hover {
88
88
  color: $sub-nav-font-color-hover;
89
89
  }
@@ -91,15 +91,17 @@ $sub-nav-item-divider-margin: rem-calc(12) !default;
91
91
 
92
92
  &.active a {
93
93
  @include radius($sub-nav-border-radius);
94
- font-weight: $sub-nav-active-font-weight;
95
94
  background: $active-bg;
96
- padding: $sub-nav-active-padding;
97
- cursor: $sub-nav-active-cursor;
98
95
  color: $sub-nav-active-color;
96
+ cursor: $sub-nav-active-cursor;
97
+ font-weight: $sub-nav-active-font-weight;
98
+ padding: $sub-nav-active-padding;
99
+
99
100
  &:hover {
100
101
  background: $active-bg-hover;
101
102
  }
102
103
  }
104
+
103
105
  @if $sub-nav-item-divider != "" {
104
106
  margin-#{$default-float}: 0;
105
107
 
@@ -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
  // @name
@@ -44,24 +44,26 @@ $switch-active-color: $primary-color !default;
44
44
  $transition-speed:$switch-paddle-transition-speed,
45
45
  $transition-ease:$switch-paddle-transition-ease) {
46
46
 
47
- padding: 0;
48
47
  border: none;
49
- position: relative;
48
+ margin-bottom: $switch-bottom-margin;
50
49
  outline: 0;
50
+ padding: 0;
51
+ position: relative;
51
52
  -webkit-user-select: none;
52
- -moz-user-select: none;
53
- user-select: none;
53
+ -moz-user-select: none;
54
+ -ms-user-select: none;
55
+ user-select: none;
54
56
 
55
57
  // Default label styles for type and transition
56
58
  label {
59
+ background: $switch-bg;
60
+ color: transparent;
61
+ cursor: pointer;
57
62
  display: block;
58
63
  margin-bottom: ($switch-height-med / 2);
59
64
  position: relative;
60
- color: transparent;
61
- background: $switch-bg;
62
65
  text-indent: 100%;
63
66
  width: $switch-height-med * 2; height: $switch-height-med;
64
- cursor: pointer;
65
67
 
66
68
  // Transition for the switch label to follow paddle
67
69
  @include single-transition(left, $transition-speed, $transition-ease);
@@ -70,11 +72,11 @@ $switch-active-color: $primary-color !default;
70
72
  // So that we don't need to recreate the form with any JS, we use the
71
73
  // existing checkbox or radio button, but we cleverly position and hide it.
72
74
  input {
75
+ left: 10px;
73
76
  opacity: 0;
77
+ padding:0;
74
78
  position: absolute;
75
79
  top: 9px;
76
- left: 10px;
77
- padding:0;
78
80
 
79
81
  & + label { margin-left: 0; margin-right: 0; }
80
82
  }
@@ -84,14 +86,14 @@ $switch-active-color: $primary-color !default;
84
86
  // the state of the input.
85
87
 
86
88
  label:after {
89
+ background: $switch-paddle-bg;
87
90
  content: "";
88
91
  display: block;
89
- background: $switch-paddle-bg;
92
+ height: $switch-height-med - .5rem;
93
+ left: .25rem;
90
94
  position: absolute;
91
95
  top: .25rem;
92
- left: .25rem;
93
- width: $switch-height-med - 0.5rem;
94
- height: $switch-height-med - 0.5rem;
96
+ width: $switch-height-med - .5rem;
95
97
 
96
98
  -webkit-transition: left $transition-speed $transition-ease;
97
99
  -moz-transition: left $transition-speed $transition-ease;
@@ -100,6 +102,7 @@ $switch-active-color: $primary-color !default;
100
102
 
101
103
  -webkit-transform: translate3d(0,0,0);
102
104
  -moz-transform: translate3d(0,0,0);
105
+ -ms-transform: translate3d(0,0,0);
103
106
  -o-transform: translate3d(0,0,0);
104
107
  transform: translate3d(0,0,0);
105
108
  }
@@ -109,7 +112,7 @@ $switch-active-color: $primary-color !default;
109
112
  }
110
113
 
111
114
  input:checked + label:after {
112
- left: $switch-height-med + 0.25rem;
115
+ left: $switch-height-med + .25rem;
113
116
  }
114
117
  }
115
118
 
@@ -121,17 +124,17 @@ $switch-active-color: $primary-color !default;
121
124
  @mixin switch-size($height: $switch-height-med) {
122
125
 
123
126
  label {
124
- width: $height * 2;
125
127
  height: $height;
128
+ width: $height * 2;
126
129
  }
127
130
 
128
131
  label:after {
129
- width: $height - 0.5rem;
130
- height: $height - 0.5rem;
132
+ height: $height - .5rem;
133
+ width: $height - .5rem;
131
134
  }
132
135
 
133
136
  input:checked + label:after {
134
- left: $height + 0.25rem;
137
+ left: $height + .25rem;
135
138
  }
136
139
 
137
140
  }