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
  // @variables
@@ -14,6 +14,7 @@ $accordion-navigation-padding: rem-calc(16) !default;
14
14
  $accordion-navigation-bg-color: $silver !default;
15
15
  $accordion-navigation-hover-bg-color: scale-color($accordion-navigation-bg-color, $lightness: -5%) !default;
16
16
  $accordion-navigation-active-bg-color: scale-color($accordion-navigation-bg-color, $lightness: -3%) !default;
17
+ $accordion-navigation-active-font-color: $jet !default;
17
18
  $accordion-navigation-font-color: $jet !default;
18
19
  $accordion-navigation-font-size: rem-calc(16) !default;
19
20
  $accordion-navigation-font-family: $body-font-family !default;
@@ -32,7 +33,7 @@ $accordion-content-active-bg-color: $white !default;
32
33
  margin-bottom: 0;
33
34
  }
34
35
 
35
- // Mixin: accordion-navigation( $bg, $hover-bg, $active-bg, $padding, $active_class, $font-color, $font-size, $font-family){
36
+ // Mixin: accordion-navigation( $bg, $hover-bg, $active-bg, $padding, $active_class, $font-color, $font-size, $font-family) {
36
37
  // @params $bg-color: [ color or string ]: Specify the background color for the navigation element
37
38
  // @params $hover-bg-color [ color or string ]: Specify the background color for the navigation element when hovered
38
39
  // @params $active-bg [ color or string ]: Specify the background color for the navigation element when clicked and not released.
@@ -40,8 +41,9 @@ $accordion-content-active-bg-color: $white !default;
40
41
  // @params $font-color [ color or string ]: Color of the font for accordion
41
42
  // @params $font-size [ number ]: Specifiy the font-size of the text inside the navigation element
42
43
  // @params $font-family [ string ]: Specify the font family for the text of the navigation of the accorion
44
+ // @params $active-font [ color or string ]: Specify the font color for the navigation element when active.
43
45
 
44
- @mixin accordion-navigation( $bg: $accordion-navigation-bg-color, $hover-bg: $accordion-navigation-hover-bg-color, $active-bg: $accordion-navigation-active-bg-color, $padding: $accordion-navigation-padding, $active_class: 'active', $font-color: $accordion-navigation-font-color, $font-size: $accordion-navigation-font-size, $font-family: $accordion-navigation-font-family ){
46
+ @mixin accordion-navigation( $bg: $accordion-navigation-bg-color, $hover-bg: $accordion-navigation-hover-bg-color, $active-bg: $accordion-navigation-active-bg-color, $padding: $accordion-navigation-padding, $active_class: 'active', $font-color: $accordion-navigation-font-color, $font-size: $accordion-navigation-font-size, $font-family: $accordion-navigation-font-family, $active-font: $accordion-navigation-active-font-color ) {
45
47
  display: block;
46
48
  margin-bottom: 0 !important;
47
49
  @if type-of($active_class) != "string" {
@@ -50,6 +52,7 @@ $accordion-content-active-bg-color: $white !default;
50
52
  @else {
51
53
  &.#{ $active_class } > a {
52
54
  background: $active-bg;
55
+ color: $active-font;
53
56
  }
54
57
  }
55
58
  > a {
@@ -98,7 +101,7 @@ $accordion-content-active-bg-color: $white !default;
98
101
  // @params $bg [ color ]: Background color for the content when it's visible
99
102
  // @params $active_class [ string ]: Class name used to keep track of which accordion tab should be visible.
100
103
 
101
- @mixin accordion-content($bg: $accordion-content-active-bg-color, $padding: $accordion-content-padding, $active_class: 'active'){
104
+ @mixin accordion-content($bg: $accordion-content-active-bg-color, $padding: $accordion-content-padding, $active_class: 'active') {
102
105
  display: none;
103
106
  @if type-of($padding) != "number" {
104
107
  @warn "#{$padding} was read as a #{type-of($padding)}";
@@ -118,8 +121,8 @@ $accordion-content-active-bg-color: $white !default;
118
121
  }
119
122
  @else {
120
123
  &.#{$active_class} {
121
- display: block;
122
124
  background: $bg;
125
+ display: block;
123
126
  }
124
127
  }
125
128
  }
@@ -129,17 +132,18 @@ $accordion-content-active-bg-color: $white !default;
129
132
  .accordion {
130
133
  @include clearfix;
131
134
  margin-bottom: 0;
135
+ margin-left: 0;
132
136
  .accordion-navigation, dd {
133
137
  display: block;
134
138
  margin-bottom: 0 !important;
135
- &.active > a { background: $accordion-navigation-active-bg-color; }
139
+ &.active > a { background: $accordion-navigation-active-bg-color; color: $accordion-navigation-active-font-color; }
136
140
  > a {
137
141
  background: $accordion-navigation-bg-color;
138
142
  color: $accordion-navigation-font-color;
139
- padding: $accordion-navigation-padding;
140
143
  display: block;
141
144
  font-family: $accordion-navigation-font-family;
142
145
  font-size: $accordion-navigation-font-size;
146
+ padding: $accordion-navigation-padding;
143
147
  &:hover { background: $accordion-navigation-hover-bg-color; }
144
148
  }
145
149
 
@@ -147,8 +151,8 @@ $accordion-content-active-bg-color: $white !default;
147
151
  display: none;
148
152
  padding: $accordion-content-padding;
149
153
  &.active {
150
- display: block;
151
154
  background: $accordion-content-active-bg-color;
155
+ display: block;
152
156
  }
153
157
  }
154
158
  }
@@ -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
  // Alert Box Variables
@@ -35,9 +35,9 @@ $alert-close-color: $oil !default;
35
35
  $alert-close-top: 50% !default;
36
36
  $alert-close-position: rem-calc(4) !default;
37
37
  $alert-close-font-size: rem-calc(22) !default;
38
- $alert-close-opacity: 0.3 !default;
39
- $alert-close-opacity-hover: 0.5 !default;
40
- $alert-close-padding: 9px 6px 4px !default;
38
+ $alert-close-opacity: .3 !default;
39
+ $alert-close-opacity-hover: .5 !default;
40
+ $alert-close-padding: 0 6px 4px !default;
41
41
  $alert-close-background: inherit !default;
42
42
 
43
43
  // We use this to control border radius
@@ -55,11 +55,11 @@ $alert-transition-ease: ease-out !default;
55
55
  border-style: $alert-border-style;
56
56
  border-width: $alert-border-width;
57
57
  display: block;
58
+ font-size: $alert-font-size;
58
59
  font-weight: $alert-font-weight;
59
60
  margin-bottom: $alert-bottom-margin;
60
- position: relative;
61
61
  padding: $alert-padding-top $alert-padding-opposite-direction $alert-padding-bottom $alert-padding-default-float;
62
- font-size: $alert-font-size;
62
+ position: relative;
63
63
  @include single-transition(opacity, $alert-transition-speed, $alert-transition-ease)
64
64
  }
65
65
 
@@ -83,16 +83,16 @@ $alert-transition-ease: ease-out !default;
83
83
 
84
84
  // We use this to create the close button.
85
85
  @mixin alert-close {
86
+ #{$opposite-direction}: $alert-close-position;
87
+ background: $alert-close-background;
88
+ color: $alert-close-color;
86
89
  font-size: $alert-close-font-size;
90
+ line-height: .9;
91
+ margin-top: -($alert-close-font-size / 2);
92
+ opacity: $alert-close-opacity;
87
93
  padding: $alert-close-padding;
88
- line-height: 0;
89
94
  position: absolute;
90
95
  top: $alert-close-top;
91
- margin-top: -($alert-close-font-size / 2);
92
- #{$opposite-direction}: $alert-close-position;
93
- color: $alert-close-color;
94
- opacity: $alert-close-opacity;
95
- background: $alert-close-background;
96
96
  &:hover,
97
97
  &:focus { opacity: $alert-close-opacity-hover; }
98
98
  }
@@ -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
  // Block Grid Variables
@@ -30,6 +30,7 @@ $block-grid-media-queries: true !default;
30
30
  //
31
31
  // $per-row - # of items to display per row. Default: false.
32
32
  // $spacing - # of ems to use as padding on each block item. Default: rem-calc(20).
33
+ // $include-spacing - Adds padding to our list item. Default: true.
33
34
  // $base-style - Apply a base style to block grid. Default: true.
34
35
  @mixin block-grid(
35
36
  $per-row:false,
@@ -47,10 +48,10 @@ $block-grid-media-queries: true !default;
47
48
  }
48
49
  @include clearfix;
49
50
 
50
- &>li {
51
+ > li {
51
52
  display: block;
52
- height: auto;
53
53
  float: $default-float;
54
+ height: auto;
54
55
  @if $include-spacing {
55
56
  padding: 0 ($spacing/2) $spacing;
56
57
  }
@@ -58,12 +59,12 @@ $block-grid-media-queries: true !default;
58
59
  }
59
60
 
60
61
  @if $per-row {
61
- &>li {
62
- width: 100%/$per-row;
62
+ > li {
63
+ list-style: none;
63
64
  @if $include-spacing {
64
65
  padding: 0 ($spacing/2) $spacing;
65
66
  }
66
- list-style: none;
67
+ width: 100%/$per-row;
67
68
 
68
69
  &:nth-of-type(1n) { clear: none; }
69
70
  &:nth-of-type(#{$per-row}n+1) { clear: both; }
@@ -92,10 +93,10 @@ $block-grid-media-queries: true !default;
92
93
  // Generate presentational markup for block grid.
93
94
  //
94
95
  // $size - Name of class to use, i.e. "large" will generate .large-block-grid-1, .large-block-grid-2, etc.
95
- @mixin block-grid-html-classes($size,$include-spacing) {
96
+ @mixin block-grid-html-classes($size, $include-spacing) {
96
97
  @for $i from 1 through $block-grid-elements {
97
98
  .#{$size}-block-grid-#{($i)} {
98
- @include block-grid($i,$block-grid-default-spacing,$include-spacing,false);
99
+ @include block-grid($i, $block-grid-default-spacing, $include-spacing, false);
99
100
  }
100
101
  }
101
102
  }
@@ -107,24 +108,24 @@ $block-grid-media-queries: true !default;
107
108
 
108
109
  @if $block-grid-media-queries {
109
110
  @media #{$small-up} {
110
- @include block-grid-html-classes($size:small,$include-spacing:false);
111
+ @include block-grid-html-classes($size:small, $include-spacing:false);
111
112
  }
112
113
 
113
114
  @media #{$medium-up} {
114
- @include block-grid-html-classes($size:medium,$include-spacing:false);
115
+ @include block-grid-html-classes($size:medium, $include-spacing:false);
115
116
  }
116
117
 
117
118
  @media #{$large-up} {
118
- @include block-grid-html-classes($size:large,$include-spacing:false);
119
+ @include block-grid-html-classes($size:large, $include-spacing:false);
119
120
  }
120
121
 
121
122
  @if $include-xl-html-block-grid-classes {
122
123
  @media #{$xlarge-up} {
123
- @include block-grid-html-classes($size:xlarge,$include-spacing:false);
124
+ @include block-grid-html-classes($size:xlarge, $include-spacing:false);
124
125
  }
125
126
 
126
127
  @media #{$xxlarge-up} {
127
- @include block-grid-html-classes($size:xxlarge,$include-spacing:false);
128
+ @include block-grid-html-classes($size:xxlarge, $include-spacing:false);
128
129
  }
129
130
  }
130
131
  }
@@ -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
  // Breadcrumb Variables
@@ -34,6 +34,7 @@ $crumb-link-decor: underline !default;
34
34
  // We use these to control the slash between breadcrumbs
35
35
  $crumb-slash-color: $base !default;
36
36
  $crumb-slash: "/" !default;
37
+ $crumb-slash-position: 1px !default;
37
38
 
38
39
  //
39
40
  // Breadcrumb Mixins
@@ -41,13 +42,13 @@ $crumb-slash: "/" !default;
41
42
 
42
43
  // We use this mixin to create a container around our breadcrumbs
43
44
  @mixin crumb-container {
44
- display: block;
45
- padding: $crumb-padding;
46
- overflow: hidden;
47
- margin-#{$default-float}: 0;
48
- list-style: none;
49
45
  border-style: $crumb-border-style;
50
46
  border-width: $crumb-border-size;
47
+ display: block;
48
+ list-style: none;
49
+ margin-#{$default-float}: 0;
50
+ overflow: hidden;
51
+ padding: $crumb-padding;
51
52
 
52
53
  // We control which background color and border come through.
53
54
  background-color: $crumb-bg;
@@ -58,12 +59,12 @@ $crumb-slash: "/" !default;
58
59
  @mixin crumbs {
59
60
 
60
61
  // A normal state will make the links look and act like clickable breadcrumbs.
61
- margin: 0;
62
+ color: $crumb-font-color;
62
63
  float: $default-float;
63
64
  font-size: $crumb-font-size;
64
65
  line-height: $crumb-font-size;
66
+ margin: 0;
65
67
  text-transform: $crumb-font-transform;
66
- color: $crumb-font-color;
67
68
 
68
69
  &:hover a, &:focus a { text-decoration: $crumb-link-decor; }
69
70
 
@@ -73,11 +74,11 @@ $crumb-slash: "/" !default;
73
74
 
74
75
  // Current is for the link of the current page
75
76
  &.current {
76
- cursor: $cursor-default-value;
77
77
  color: $crumb-font-color-current;
78
+ cursor: $cursor-default-value;
78
79
  a {
79
- cursor: $cursor-default-value;
80
80
  color: $crumb-font-color-current;
81
+ cursor: $cursor-default-value;
81
82
  }
82
83
 
83
84
  &:hover, &:hover a,
@@ -93,18 +94,18 @@ $crumb-slash: "/" !default;
93
94
  &:hover a,
94
95
  &:focus,
95
96
  a:focus {
96
- text-decoration: none;
97
97
  color: $crumb-font-color-unavailable;
98
98
  cursor: $cursor-disabled-value;
99
+ text-decoration: none;
99
100
  }
100
101
  }
101
102
 
102
103
  &:before {
103
- content: "#{$crumb-slash}";
104
104
  color: $crumb-slash-color;
105
+ content: "#{$crumb-slash}";
105
106
  margin: 0 $crumb-side-padding;
106
107
  position: relative;
107
- top: 1px;
108
+ top: $crumb-slash-position;
108
109
  }
109
110
 
110
111
  &:first-child:before {
@@ -119,14 +120,13 @@ $crumb-slash: "/" !default;
119
120
  @include crumb-container;
120
121
  @include radius($crumb-radius);
121
122
 
122
- &>* {
123
+ > * {
123
124
  @include crumbs;
124
125
  }
125
126
  }
127
+ /* Accessibility - hides the forward slash */
128
+ [aria-label="breadcrumbs"] [aria-hidden="true"]:after {
129
+ content: "/";
130
+ }
126
131
  }
127
132
  }
128
-
129
- /* Accessibility - hides the forward slash */
130
- [aria-label="breadcrumbs"] [aria-hidden="true"]:after {
131
- content: "/";
132
- }
@@ -2,8 +2,8 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
6
- @import "buttons";
5
+ @import 'global';
6
+ @import 'buttons';
7
7
 
8
8
  //
9
9
  // Button Group Variables
@@ -38,7 +38,7 @@ $button-group-border-width: 1px !default;
38
38
 
39
39
  > button, .button {
40
40
  border-#{$default-float}: $button-group-border-width solid;
41
- border-color: rgba(255, 255, 255, 0.5);
41
+ border-color: rgba(255, 255, 255, .5);
42
42
  }
43
43
 
44
44
  &:first-child {
@@ -47,28 +47,31 @@ $button-group-border-width: 1px !default;
47
47
  }
48
48
  }
49
49
 
50
+ $button-group-display: list-item;
51
+ $button-group-margin: 0;
52
+
50
53
  // We use this to control the flow, or remove those styles completely.
51
54
  @if $float {
52
- margin: 0;
55
+ $button-group-display: list-item;
56
+ $button-group-margin: 0;
53
57
  float: $float;
54
- display: list-item;
55
58
  // Make sure the first child doesn't get the negative margin.
56
59
  &:first-child { margin-#{$default-float}: 0; }
57
60
  }
58
61
  @else {
59
- margin: 0 -2px;
60
- display: inline-block;
62
+ $button-group-display: inline-block;
63
+ $button-group-margin: 0 -2px;
61
64
  }
62
65
 
63
66
  @if $orientation == vertical {
64
- display:block;
65
- margin:0;
67
+ $button-group-display: block;
68
+ $button-group-margin: 0;
66
69
  > button, .button {
67
- border-top: $button-group-border-width solid;
68
- border-color: rgba(255, 255, 255, 0.5);
70
+ border-color: rgba(255, 255, 255, .5);
69
71
  border-left-width: 0;
70
- margin:0;
72
+ border-top: $button-group-border-width solid;
71
73
  display: block;
74
+ margin:0;
72
75
  }
73
76
  > button {
74
77
  width: 100%;
@@ -81,12 +84,16 @@ $button-group-border-width: 1px !default;
81
84
  }
82
85
  }
83
86
 
87
+ display: $button-group-display;
88
+ margin: $button-group-margin;
89
+
90
+
84
91
  // We use these to control left and right radius on first/last buttons in the group.
85
92
  @if $radius == true {
86
93
  &,
87
- & > a,
88
- & > button,
89
- & > .button { @include radius(0); }
94
+ > a,
95
+ > button,
96
+ > .button { @include radius(0); }
90
97
  &:first-child,
91
98
  &:first-child > a,
92
99
  &:first-child > button,
@@ -112,9 +119,9 @@ $button-group-border-width: 1px !default;
112
119
  }
113
120
  @else if $radius {
114
121
  &,
115
- & > a,
116
- & > button,
117
- & > .button { @include radius(0); }
122
+ > a,
123
+ > button,
124
+ > .button { @include radius(0); }
118
125
  &:first-child,
119
126
  &:first-child > a,
120
127
  &:first-child > button,
@@ -150,17 +157,22 @@ $button-group-border-width: 1px !default;
150
157
  @if $include-html-button-classes {
151
158
  .button-group { @include button-group-container;
152
159
 
153
- & > li { @include button-group-style(); }
160
+ @for $i from 2 through 8 {
161
+ &.even-#{$i} li { @include button-group-style($even:$i, $float:null); }
162
+ }
163
+
164
+ > li { @include button-group-style(); }
154
165
 
155
166
  &.stack {
156
- & > li { @include button-group-style($orientation:vertical); float: none; }
167
+ > li { @include button-group-style($orientation:vertical); float: none; }
157
168
  }
158
169
 
159
170
  &.stack-for-small {
160
- & > li {
171
+ > li {
161
172
  @include button-group-style($orientation:horizontal);
162
173
  @media #{$small-only} {
163
174
  @include button-group-style($orientation:vertical);
175
+ width: 100%;
164
176
  }
165
177
  }
166
178
  }
@@ -186,10 +198,6 @@ $button-group-border-width: 1px !default;
186
198
  @include button-group-style($radius:$button-med, $orientation:vertical);
187
199
  }
188
200
  }
189
-
190
- @for $i from 2 through 8 {
191
- &.even-#{$i} li { @include button-group-style($even:$i, $float:null); }
192
- }
193
201
  }
194
202
 
195
203
  .button-bar {
@@ -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
@@ -39,14 +39,19 @@ $button-border-style: solid !default;
39
39
  $button-bg-color: $primary-color !default;
40
40
  $button-bg-hover: scale-color($button-bg-color, $lightness: $button-function-factor) !default;
41
41
  $button-border-color: $button-bg-hover !default;
42
+ $secondary-button-bg-color: $secondary-color !default;
42
43
  $secondary-button-bg-hover: scale-color($secondary-color, $lightness: $button-function-factor) !default;
43
44
  $secondary-button-border-color: $secondary-button-bg-hover !default;
45
+ $success-button-bg-color: $success-color !default;
44
46
  $success-button-bg-hover: scale-color($success-color, $lightness: $button-function-factor) !default;
45
47
  $success-button-border-color: $success-button-bg-hover !default;
48
+ $alert-button-bg-color: $alert-color !default;
46
49
  $alert-button-bg-hover: scale-color($alert-color, $lightness: $button-function-factor) !default;
47
50
  $alert-button-border-color: $alert-button-bg-hover !default;
51
+ $warning-button-bg-color: $warning-color !default;
48
52
  $warning-button-bg-hover: scale-color($warning-color, $lightness: $button-function-factor) !default;
49
53
  $warning-button-border-color: $warning-button-bg-hover !default;
54
+ $info-button-bg-color: $info-color !default;
50
55
  $info-button-bg-hover: scale-color($info-color, $lightness: $button-function-factor) !default;
51
56
  $info-button-border-color: $info-button-bg-hover !default;
52
57
 
@@ -55,7 +60,7 @@ $button-radius: $global-radius !default;
55
60
  $button-round: $global-rounded !default;
56
61
 
57
62
  // We use this to set default opacity and cursor for disabled buttons.
58
- $button-disabled-opacity: 0.7 !default;
63
+ $button-disabled-opacity: .7 !default;
59
64
  $button-disabled-cursor: $cursor-default-value !default;
60
65
 
61
66
 
@@ -69,6 +74,9 @@ $button-disabled-cursor: $cursor-default-value !default;
69
74
 
70
75
  @mixin button-base($style:true, $display:$button-display) {
71
76
  @if $style {
77
+ -webkit-appearance: none;
78
+ -moz-appearance: none;
79
+ border-radius:0;
72
80
  border-style: $button-border-style;
73
81
  border-width: $button-border-width;
74
82
  cursor: $cursor-pointer-value;
@@ -77,10 +85,8 @@ $button-disabled-cursor: $cursor-default-value !default;
77
85
  line-height: normal;
78
86
  margin: 0 0 $button-margin-bottom;
79
87
  position: relative;
80
- text-decoration: none;
81
88
  text-align: $button-font-align;
82
- -webkit-appearance: none;
83
- border-radius:0;
89
+ text-decoration: none;
84
90
  }
85
91
  @if $display { display: $display; }
86
92
  }
@@ -97,11 +103,7 @@ $button-disabled-cursor: $cursor-default-value !default;
97
103
  // We control which padding styles come through,
98
104
  // these can be turned off by setting $padding:false
99
105
  @if $padding {
100
- padding-top: $padding;
101
- padding-#{$opposite-direction}: $padding * 2;
102
- padding-bottom: $padding + rem-calc(1);
103
- padding-#{$default-float}: $padding * 2;
104
-
106
+ padding: $padding ($padding * 2) ($padding + rem-calc(1)) ($padding * 2);
105
107
  // We control the font-size based on mixin input.
106
108
  @if $padding == $button-med { font-size: $button-font-med; }
107
109
  @else if $padding == $button-tny { font-size: $button-font-tny; }
@@ -113,14 +115,14 @@ $button-disabled-cursor: $cursor-default-value !default;
113
115
  @if $full-width {
114
116
  // We still need to check if $padding is set.
115
117
  @if $padding {
116
- padding-top: $padding;
117
- padding-bottom: $padding + rem-calc(1);
118
+ padding-bottom: $padding + rem-calc(1);
119
+ padding-top: $padding;
118
120
  } @else if $padding == false {
119
- padding-top:0;
120
121
  padding-bottom:0;
122
+ padding-top:0;
121
123
  }
122
- padding-right: 0;
123
- padding-left: 0;
124
+ padding-left: $button-med;
125
+ padding-right: $button-med;
124
126
  width: 100%;
125
127
  }
126
128
  }
@@ -134,7 +136,7 @@ $button-disabled-cursor: $cursor-default-value !default;
134
136
  // We use this mixin to add button color styles
135
137
  //
136
138
  // $bg - Background color. We can set $bg:false for a transparent background. Default: $primary-color.
137
- // $radius - If true, set to button radius which is $global-radius || explicitly set radius amount in px (ex. $radius:10px). Default: true
139
+ // $radius - If true, set to button radius which is $button-radius || explicitly set radius amount in px (ex. $radius:10px). Default: false
138
140
  // $disabled - We can set $disabled:true to create a disabled transparent button. Default: false
139
141
  // $bg-hover - Button Hover Background Color. Default: $button-bg-hover
140
142
  // $border-color - Button Border Color. Default: $button-border-color
@@ -172,9 +174,9 @@ $button-disabled-cursor: $cursor-default-value !default;
172
174
 
173
175
  // We can set $disabled:true to create a disabled transparent button.
174
176
  @if $disabled {
177
+ box-shadow: none;
175
178
  cursor: $button-disabled-cursor;
176
179
  opacity: $button-disabled-opacity;
177
- box-shadow: none;
178
180
  &:hover,
179
181
  &:focus { background-color: $bg; }
180
182
  }
@@ -220,16 +222,16 @@ $button-disabled-cursor: $cursor-default-value !default;
220
222
 
221
223
  @include single-transition(background-color);
222
224
 
223
- &.secondary { @include button-style($bg:$secondary-color, $bg-hover:$secondary-button-bg-hover, $border-color:$secondary-button-border-color); }
224
- &.success { @include button-style($bg:$success-color, $bg-hover:$success-button-bg-hover, $border-color:$success-button-border-color); }
225
- &.alert { @include button-style($bg:$alert-color, $bg-hover:$alert-button-bg-hover, $border-color:$alert-button-border-color); }
226
- &.warning { @include button-style($bg:$warning-color, $bg-hover:$warning-button-bg-hover, $border-color:$warning-button-border-color); }
227
- &.info { @include button-style($bg:$info-color, $bg-hover:$info-button-bg-hover, $border-color:$info-button-border-color); }
225
+ &.secondary { @include button-style($bg:$secondary-button-bg-color, $bg-hover:$secondary-button-bg-hover, $border-color:$secondary-button-border-color); }
226
+ &.success { @include button-style($bg:$success-button-bg-color, $bg-hover:$success-button-bg-hover, $border-color:$success-button-border-color); }
227
+ &.alert { @include button-style($bg:$alert-button-bg-color, $bg-hover:$alert-button-bg-hover, $border-color:$alert-button-border-color); }
228
+ &.warning { @include button-style($bg:$warning-button-bg-color, $bg-hover:$warning-button-bg-hover, $border-color:$warning-button-border-color); }
229
+ &.info { @include button-style($bg:$info-button-bg-color, $bg-hover:$info-button-bg-hover, $border-color:$info-button-border-color); }
228
230
 
229
231
  &.large { @include button-size($padding:$button-lrg); }
230
232
  &.small { @include button-size($padding:$button-sml); }
231
233
  &.tiny { @include button-size($padding:$button-tny); }
232
- &.expand { @include button-size($padding:null,$full-width:true); }
234
+ &.expand { @include button-size($full-width:true); }
233
235
 
234
236
  &.left-align { text-align: left; text-indent: rem-calc(12); }
235
237
  &.right-align { text-align: right; padding-right: rem-calc(12); }
@@ -238,11 +240,11 @@ $button-disabled-cursor: $cursor-default-value !default;
238
240
  &.round { @include button-style($bg:false, $radius:$button-round); }
239
241
 
240
242
  &.disabled, &[disabled] { @include button-style($bg:$button-bg-color, $disabled:true, $bg-hover:$button-bg-hover, $border-color:$button-border-color);
241
- &.secondary { @include button-style($bg:$secondary-color, $disabled:true, $bg-hover:$secondary-button-bg-hover, $border-color:$secondary-button-border-color); }
242
- &.success { @include button-style($bg:$success-color, $disabled:true, $bg-hover:$success-button-bg-hover, $border-color:$success-button-border-color); }
243
- &.alert { @include button-style($bg:$alert-color, $disabled:true, $bg-hover:$alert-button-bg-hover, $border-color:$alert-button-border-color); }
244
- &.warning { @include button-style($bg:$warning-color, $disabled:true, $bg-hover:$warning-button-bg-hover, $border-color:$warning-button-border-color); }
245
- &.info { @include button-style($bg:$info-color, $disabled:true, $bg-hover:$info-button-bg-hover, $border-color:$info-button-border-color); }
243
+ &.secondary { @include button-style($bg:$secondary-button-bg-color, $disabled:true, $bg-hover:$secondary-button-bg-hover, $border-color:$secondary-button-border-color); }
244
+ &.success { @include button-style($bg:$success-button-bg-color, $disabled:true, $bg-hover:$success-button-bg-hover, $border-color:$success-button-border-color); }
245
+ &.alert { @include button-style($bg:$alert-button-bg-color, $disabled:true, $bg-hover:$alert-button-bg-hover, $border-color:$alert-button-border-color); }
246
+ &.warning { @include button-style($bg:$warning-button-bg-color, $disabled:true, $bg-hover:$warning-button-bg-hover, $border-color:$warning-button-border-color); }
247
+ &.info { @include button-style($bg:$info-button-bg-color, $disabled:true, $bg-hover:$info-button-bg-hover, $border-color:$info-button-border-color); }
246
248
  }
247
249
  }
248
250