materialize-sass 0.97.5 → 0.97.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/materialize.js +230 -141
  3. data/app/assets/javascripts/materialize.min.js +6 -6
  4. data/app/assets/javascripts/materialize/character_counter.js +20 -7
  5. data/app/assets/javascripts/materialize/collapsible.js +1 -1
  6. data/app/assets/javascripts/materialize/date_picker/picker.js +5 -5
  7. data/app/assets/javascripts/materialize/dropdown.js +12 -3
  8. data/app/assets/javascripts/materialize/extras/nouislider.js +1 -1
  9. data/app/assets/javascripts/materialize/extras/nouislider.min.js +0 -5
  10. data/app/assets/javascripts/materialize/forms.js +6 -5
  11. data/app/assets/javascripts/materialize/init.js +26 -9
  12. data/app/assets/javascripts/materialize/initial.js +2 -2
  13. data/app/assets/javascripts/materialize/leanModal.js +19 -6
  14. data/app/assets/javascripts/materialize/materialbox.js +9 -9
  15. data/app/assets/javascripts/materialize/pushpin.js +48 -53
  16. data/app/assets/javascripts/materialize/scrollFire.js +7 -3
  17. data/app/assets/javascripts/materialize/scrollspy.js +6 -6
  18. data/app/assets/javascripts/materialize/sideNav.js +66 -37
  19. data/app/assets/javascripts/materialize/slider.js +2 -2
  20. data/app/assets/javascripts/materialize/tabs.js +12 -6
  21. data/app/assets/stylesheets/materialize.scss +1 -1
  22. data/app/assets/stylesheets/materialize/components/_buttons.scss +49 -33
  23. data/app/assets/stylesheets/materialize/components/_cards.scss +9 -5
  24. data/app/assets/stylesheets/materialize/components/_color.scss +21 -21
  25. data/app/assets/stylesheets/materialize/components/_global.scss +27 -11
  26. data/app/assets/stylesheets/materialize/components/_icons-material-design.scss +0 -3258
  27. data/app/assets/stylesheets/materialize/components/_materialbox.scss +1 -1
  28. data/app/assets/stylesheets/materialize/components/_navbar.scss +1 -1
  29. data/app/assets/stylesheets/materialize/components/_normalize.scss +9 -12
  30. data/app/assets/stylesheets/materialize/components/_sideNav.scss +16 -11
  31. data/app/assets/stylesheets/materialize/components/_tooltip.scss +1 -0
  32. data/app/assets/stylesheets/materialize/components/_variables.scss +181 -34
  33. data/app/assets/stylesheets/materialize/components/date_picker/_default.date.scss +1 -1
  34. data/app/assets/stylesheets/materialize/components/date_picker/_default.scss +2 -2
  35. data/app/assets/stylesheets/materialize/components/forms/_checkboxes.scss +220 -0
  36. data/app/assets/stylesheets/materialize/components/forms/_file-input.scss +38 -0
  37. data/app/assets/stylesheets/materialize/components/forms/_forms.scss +22 -0
  38. data/app/assets/stylesheets/materialize/components/forms/_input-fields.scss +254 -0
  39. data/app/assets/stylesheets/materialize/components/forms/_radio-buttons.scss +119 -0
  40. data/app/assets/stylesheets/materialize/components/forms/_range.scss +159 -0
  41. data/app/assets/stylesheets/materialize/components/forms/_select.scss +116 -0
  42. data/app/assets/stylesheets/materialize/components/forms/_switches.scss +78 -0
  43. data/app/assets/stylesheets/materialize/extras/nouislider.css +2 -1
  44. data/lib/materialize-sass/version.rb +1 -1
  45. metadata +10 -9
  46. data/app/assets/fonts/material-design-icons/LICENSE.txt +0 -428
  47. data/app/assets/fonts/material-design-icons/Material-Design-Icons.eot +0 -0
  48. data/app/assets/fonts/material-design-icons/Material-Design-Icons.svg +0 -769
  49. data/app/assets/fonts/material-design-icons/Material-Design-Icons.ttf +0 -0
  50. data/app/assets/fonts/material-design-icons/Material-Design-Icons.woff +0 -0
  51. data/app/assets/fonts/material-design-icons/Material-Design-Icons.woff2 +0 -0
  52. data/app/assets/stylesheets/materialize/components/_form.scss +0 -954
@@ -30,8 +30,12 @@
30
30
 
31
31
  if (windowScroll > (elementOffset + offset)) {
32
32
  if (value.done !== true) {
33
- var callbackFunc = new Function(callback);
34
- callbackFunc();
33
+ if (typeof(callback) === 'function') {
34
+ callback.call(this);
35
+ } else if (typeof(callback) === 'string') {
36
+ var callbackFunc = new Function(callback);
37
+ callbackFunc();
38
+ }
35
39
  value.done = true;
36
40
  }
37
41
  }
@@ -41,4 +45,4 @@
41
45
  }, 100);
42
46
  };
43
47
 
44
- })(jQuery);
48
+ })(jQuery);
@@ -176,7 +176,7 @@
176
176
  elements.push($(element));
177
177
  $(element).data("scrollSpy:id", i);
178
178
  // Smooth scroll to section
179
- $('a[href=#' + $(element).attr('id') + ']').click(function(e) {
179
+ $('a[href="#' + $(element).attr('id') + '"]').click(function(e) {
180
180
  e.preventDefault();
181
181
  var offset = $(this.hash).offset().top + 1;
182
182
 
@@ -218,7 +218,7 @@
218
218
  var $this = $(this);
219
219
 
220
220
  if (visible[0]) {
221
- $('a[href=#' + visible[0].attr('id') + ']').removeClass('active');
221
+ $('a[href="#' + visible[0].attr('id') + '"]').removeClass('active');
222
222
  if ($this.data('scrollSpy:id') < visible[0].data('scrollSpy:id')) {
223
223
  visible.unshift($(this));
224
224
  }
@@ -231,7 +231,7 @@
231
231
  }
232
232
 
233
233
 
234
- $('a[href=#' + visible[0].attr('id') + ']').addClass('active');
234
+ $('a[href="#' + visible[0].attr('id') + '"]').addClass('active');
235
235
  });
236
236
  selector.on('scrollSpy:exit', function() {
237
237
  visible = $.grep(visible, function(value) {
@@ -239,13 +239,13 @@
239
239
  });
240
240
 
241
241
  if (visible[0]) {
242
- $('a[href=#' + visible[0].attr('id') + ']').removeClass('active');
242
+ $('a[href="#' + visible[0].attr('id') + '"]').removeClass('active');
243
243
  var $this = $(this);
244
244
  visible = $.grep(visible, function(value) {
245
245
  return value.attr('id') != $this.attr('id');
246
246
  });
247
247
  if (visible[0]) { // Check if empty
248
- $('a[href=#' + visible[0].attr('id') + ']').addClass('active');
248
+ $('a[href="#' + visible[0].attr('id') + '"]').addClass('active');
249
249
  }
250
250
  }
251
251
  });
@@ -281,4 +281,4 @@
281
281
  return $.scrollSpy($(this), options);
282
282
  };
283
283
 
284
- })(jQuery);
284
+ })(jQuery);
@@ -23,20 +23,19 @@
23
23
  $('body').append(dragTarget);
24
24
 
25
25
  if (options.edge == 'left') {
26
- menu_id.css('left', -1 * (options.menuWidth + 10));
26
+ menu_id.css('transform', 'translateX(-100%)');
27
27
  dragTarget.css({'left': 0}); // Add Touch Area
28
28
  }
29
29
  else {
30
30
  menu_id.addClass('right-aligned') // Change text-alignment to right
31
- .css('right', -1 * (options.menuWidth + 10))
32
- .css('left', '');
31
+ .css('transform', 'translateX(100%)');
33
32
  dragTarget.css({'right': 0}); // Add Touch Area
34
33
  }
35
34
 
36
35
  // If fixed sidenav, bring menu out
37
36
  if (menu_id.hasClass('fixed')) {
38
37
  if (window.innerWidth > 992) {
39
- menu_id.css('left', 0);
38
+ menu_id.css('transform', 'translateX(0)');
40
39
  }
41
40
  }
42
41
 
@@ -45,19 +44,22 @@
45
44
  $(window).resize( function() {
46
45
  if (window.innerWidth > 992) {
47
46
  // Close menu if window is resized bigger than 992 and user has fixed sidenav
48
- if ($('#sidenav-overlay').css('opacity') !== 0 && menuOut) {
47
+ if ($('#sidenav-overlay').length != 0 && menuOut) {
49
48
  removeMenu(true);
50
49
  }
51
50
  else {
52
- menu_id.removeAttr('style');
53
- menu_id.css('width', options.menuWidth);
51
+ // menu_id.removeAttr('style');
52
+ menu_id.css('transform', 'translateX(0%)');
53
+ // menu_id.css('width', options.menuWidth);
54
54
  }
55
55
  }
56
56
  else if (menuOut === false){
57
- if (options.edge === 'left')
58
- menu_id.css('left', -1 * (options.menuWidth + 10));
59
- else
60
- menu_id.css('right', -1 * (options.menuWidth + 10));
57
+ if (options.edge === 'left') {
58
+ menu_id.css('transform', 'translateX(-100%)');
59
+ } else {
60
+ menu_id.css('transform', 'translateX(100%)');
61
+ }
62
+
61
63
  }
62
64
 
63
65
  });
@@ -73,11 +75,14 @@
73
75
  function removeMenu(restoreNav) {
74
76
  panning = false;
75
77
  menuOut = false;
76
-
77
78
  // Reenable scrolling
78
- $('body').css('overflow', '');
79
+ $('body').css({
80
+ overflow: '',
81
+ width: ''
82
+ });
79
83
 
80
- $('#sidenav-overlay').velocity({opacity: 0}, {duration: 200, queue: false, easing: 'easeOutQuad',
84
+ $('#sidenav-overlay').velocity({opacity: 0}, {duration: 200,
85
+ queue: false, easing: 'easeOutQuad',
81
86
  complete: function() {
82
87
  $(this).remove();
83
88
  } });
@@ -85,7 +90,7 @@
85
90
  // Reset phantom div
86
91
  dragTarget.css({width: '', right: '', left: '0'});
87
92
  menu_id.velocity(
88
- {left: -1 * (options.menuWidth + 10)},
93
+ {'translateX': '-100%'},
89
94
  { duration: 200,
90
95
  queue: false,
91
96
  easing: 'easeOutCubic',
@@ -103,7 +108,7 @@
103
108
  // Reset phantom div
104
109
  dragTarget.css({width: '', right: '0', left: ''});
105
110
  menu_id.velocity(
106
- {right: -1 * (options.menuWidth + 10)},
111
+ {'translateX': '100%'},
107
112
  { duration: 200,
108
113
  queue: false,
109
114
  easing: 'easeOutCubic',
@@ -140,7 +145,10 @@
140
145
  var velocityX = e.gesture.velocityX;
141
146
 
142
147
  // Disable Scrolling
143
- $('body').css('overflow', 'hidden');
148
+ var $body = $('body');
149
+ var oldWidth = $body.innerWidth();
150
+ $body.css('overflow', 'hidden');
151
+ $body.width(oldWidth);
144
152
 
145
153
  // If overlay does not exist, create one and if it is clicked, close menu
146
154
  if ($('#sidenav-overlay').length === 0) {
@@ -162,8 +170,7 @@
162
170
  if (x < (options.menuWidth / 2)) { menuOut = false; }
163
171
  // Right Direction
164
172
  else if (x >= (options.menuWidth / 2)) { menuOut = true; }
165
-
166
- menu_id.css('left', (x - options.menuWidth));
173
+ menu_id.css('transform', 'translateX(' + (x - options.menuWidth) + 'px)');
167
174
  }
168
175
  else {
169
176
  // Left Direction
@@ -174,26 +181,24 @@
174
181
  else if (x >= (window.innerWidth - options.menuWidth / 2)) {
175
182
  menuOut = false;
176
183
  }
177
- var rightPos = -1 *(x - options.menuWidth / 2);
178
- if (rightPos > 0) {
184
+ var rightPos = (x - options.menuWidth / 2);
185
+ if (rightPos < 0) {
179
186
  rightPos = 0;
180
187
  }
181
188
 
182
- menu_id.css('right', rightPos);
189
+ menu_id.css('transform', 'translateX(' + rightPos + 'px)');
183
190
  }
184
191
 
185
192
 
186
-
187
-
188
193
  // Percentage overlay
189
194
  var overlayPerc;
190
195
  if (options.edge === 'left') {
191
196
  overlayPerc = x / options.menuWidth;
192
- $('#sidenav-overlay').velocity({opacity: overlayPerc }, {duration: 50, queue: false, easing: 'easeOutQuad'});
197
+ $('#sidenav-overlay').velocity({opacity: overlayPerc }, {duration: 10, queue: false, easing: 'easeOutQuad'});
193
198
  }
194
199
  else {
195
200
  overlayPerc = Math.abs((x - window.innerWidth) / options.menuWidth);
196
- $('#sidenav-overlay').velocity({opacity: overlayPerc }, {duration: 50, queue: false, easing: 'easeOutQuad'});
201
+ $('#sidenav-overlay').velocity({opacity: overlayPerc }, {duration: 10, queue: false, easing: 'easeOutQuad'});
197
202
  }
198
203
  }
199
204
 
@@ -201,19 +206,36 @@
201
206
 
202
207
  if (e.gesture.pointerType == "touch") {
203
208
  var velocityX = e.gesture.velocityX;
209
+ var x = e.gesture.center.x;
210
+ var leftPos = x - options.menuWidth;
211
+ var rightPos = x - options.menuWidth / 2;
212
+ if (leftPos > 0 ) {
213
+ leftPos = 0;
214
+ }
215
+ if (rightPos < 0) {
216
+ rightPos = 0;
217
+ }
204
218
  panning = false;
219
+
205
220
  if (options.edge === 'left') {
206
221
  // If velocityX <= 0.3 then the user is flinging the menu closed so ignore menuOut
207
222
  if ((menuOut && velocityX <= 0.3) || velocityX < -0.5) {
208
- menu_id.velocity({left: 0}, {duration: 300, queue: false, easing: 'easeOutQuad'});
223
+ if (leftPos != 0) {
224
+ menu_id.velocity({'translateX': [0, leftPos]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
225
+ }
226
+
227
+ // menu_id.css({'translateX': 0});
209
228
  $('#sidenav-overlay').velocity({opacity: 1 }, {duration: 50, queue: false, easing: 'easeOutQuad'});
210
229
  dragTarget.css({width: '50%', right: 0, left: ''});
211
230
  }
212
231
  else if (!menuOut || velocityX > 0.3) {
213
232
  // Enable Scrolling
214
- $('body').css('overflow', '');
233
+ $('body').css({
234
+ overflow: '',
235
+ width: ''
236
+ });
215
237
  // Slide menu closed
216
- menu_id.velocity({left: -1 * (options.menuWidth + 10)}, {duration: 200, queue: false, easing: 'easeOutQuad'});
238
+ menu_id.velocity({'translateX': [-1 * options.menuWidth - 10, leftPos]}, {duration: 200, queue: false, easing: 'easeOutQuad'});
217
239
  $('#sidenav-overlay').velocity({opacity: 0 }, {duration: 200, queue: false, easing: 'easeOutQuad',
218
240
  complete: function () {
219
241
  $(this).remove();
@@ -223,15 +245,19 @@
223
245
  }
224
246
  else {
225
247
  if ((menuOut && velocityX >= -0.3) || velocityX > 0.5) {
226
- menu_id.velocity({right: 0}, {duration: 300, queue: false, easing: 'easeOutQuad'});
248
+ menu_id.velocity({'translateX': [0, rightPos]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
227
249
  $('#sidenav-overlay').velocity({opacity: 1 }, {duration: 50, queue: false, easing: 'easeOutQuad'});
228
250
  dragTarget.css({width: '50%', right: '', left: 0});
229
251
  }
230
252
  else if (!menuOut || velocityX < -0.3) {
231
253
  // Enable Scrolling
232
- $('body').css('overflow', '');
254
+ $('body').css({
255
+ overflow: '',
256
+ width: ''
257
+ });
258
+
233
259
  // Slide menu closed
234
- menu_id.velocity({right: -1 * (options.menuWidth + 10)}, {duration: 200, queue: false, easing: 'easeOutQuad'});
260
+ menu_id.velocity({'translateX': [options.menuWidth + 10, rightPos]}, {duration: 200, queue: false, easing: 'easeOutQuad'});
235
261
  $('#sidenav-overlay').velocity({opacity: 0 }, {duration: 200, queue: false, easing: 'easeOutQuad',
236
262
  complete: function () {
237
263
  $(this).remove();
@@ -252,18 +278,21 @@
252
278
  else {
253
279
 
254
280
  // Disable Scrolling
255
- $('body').css('overflow', 'hidden');
281
+ var $body = $('body');
282
+ var oldWidth = $body.innerWidth();
283
+ $body.css('overflow', 'hidden');
284
+ $body.width(oldWidth);
285
+
256
286
  // Push current drag target on top of DOM tree
257
287
  $('body').append(dragTarget);
258
-
288
+
259
289
  if (options.edge === 'left') {
260
290
  dragTarget.css({width: '50%', right: 0, left: ''});
261
- menu_id.velocity({left: 0}, {duration: 300, queue: false, easing: 'easeOutQuad'});
291
+ menu_id.velocity({'translateX': [0, -1 * options.menuWidth]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
262
292
  }
263
293
  else {
264
294
  dragTarget.css({width: '50%', right: '', left: 0});
265
- menu_id.velocity({right: 0}, {duration: 300, queue: false, easing: 'easeOutQuad'});
266
- menu_id.css('left','');
295
+ menu_id.velocity({'translateX': [0, options.menuWidth]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
267
296
  }
268
297
 
269
298
  var overlay = $('<div id="sidenav-overlay"></div>');
@@ -223,7 +223,7 @@
223
223
  panning = false;
224
224
  curr_index = $slider.find('.active').index();
225
225
 
226
- if (!swipeRight && !swipeLeft) {
226
+ if (!swipeRight && !swipeLeft || $slides.length <=1) {
227
227
  // Return to original spot
228
228
  $curr_slide.velocity({ translateX: 0
229
229
  }, {duration: 300, queue: false, easing: 'easeOutQuad'});
@@ -318,4 +318,4 @@
318
318
  $.error( 'Method ' + methodOrOptions + ' does not exist on jQuery.tooltip' );
319
319
  }
320
320
  }; // Plugin end
321
- }( jQuery ));
321
+ }( jQuery ));
@@ -12,7 +12,7 @@
12
12
  $this.width('100%');
13
13
  var $active, $content, $links = $this.find('li.tab a'),
14
14
  $tabs_width = $this.width(),
15
- $tab_width = $this.find('li').first().outerWidth(),
15
+ $tab_width = Math.max($tabs_width, $this[0].scrollWidth) / $links.length,
16
16
  $index = 0;
17
17
 
18
18
  // If the location.hash matches one of the links, use that as the active tab.
@@ -32,7 +32,9 @@
32
32
  $index = 0;
33
33
  }
34
34
 
35
- $content = $($active[0].hash);
35
+ if ($active[0] !== undefined) {
36
+ $content = $($active[0].hash);
37
+ }
36
38
 
37
39
  // append indicator then set indicator width to tab width
38
40
  $this.append('<div class="indicator"></div>');
@@ -43,7 +45,7 @@
43
45
  }
44
46
  $(window).resize(function () {
45
47
  $tabs_width = $this.width();
46
- $tab_width = $this.find('li').first().outerWidth();
48
+ $tab_width = Math.max($tabs_width, $this[0].scrollWidth) / $links.length;
47
49
  if ($index < 0) {
48
50
  $index = 0;
49
51
  }
@@ -67,11 +69,13 @@
67
69
  }
68
70
 
69
71
  $tabs_width = $this.width();
70
- $tab_width = $this.find('li').first().outerWidth();
72
+ $tab_width = Math.max($tabs_width, $this[0].scrollWidth) / $links.length;
71
73
 
72
74
  // Make the old tab inactive.
73
75
  $active.removeClass('active');
74
- $content.hide();
76
+ if ($content !== undefined) {
77
+ $content.hide();
78
+ }
75
79
 
76
80
  // Update the variables with the new link and content
77
81
  $active = $(this);
@@ -88,7 +92,9 @@
88
92
  // Change url to current tab
89
93
  // window.location.hash = $active.attr('href');
90
94
 
91
- $content.show();
95
+ if ($content !== undefined) {
96
+ $content.show();
97
+ }
92
98
 
93
99
  // Update indicator
94
100
  if (($index - $prev_index) >= 0) {
@@ -29,7 +29,7 @@
29
29
  @import "materialize/components/collapsible";
30
30
  @import "materialize/components/chips";
31
31
  @import "materialize/components/materialbox";
32
- @import "materialize/components/form";
32
+ @import "materialize/components/forms/forms";
33
33
  @import "materialize/components/table_of_contents";
34
34
  @import "materialize/components/sideNav";
35
35
  @import "materialize/components/preloader";
@@ -1,46 +1,57 @@
1
1
  // shared styles
2
- .btn, .btn-flat {
3
- border: none;
4
- border-radius: 2px;
2
+ .btn,
3
+ .btn-flat {
4
+ border: $button-border;
5
+ border-radius: $button-radius;
5
6
  display: inline-block;
6
7
  height: $button-height;
7
- line-height: $button-line-height;
8
- // margin-bottom: 15px;
8
+ line-height: $button-height;
9
9
  outline: 0;
10
- padding: 0 2rem;
10
+ padding: $button-padding;
11
11
  text-transform: uppercase;
12
12
  vertical-align: middle;
13
13
  // Gets rid of tap active state
14
14
  -webkit-tap-highlight-color: transparent;
15
15
  }
16
+
16
17
  // Disabled shared style
17
- .btn.disabled, .btn-floating.disabled, .btn-large.disabled, .btn:disabled, .btn-large:disabled, .btn-floating:disabled {
18
- background-color: $button-bg-color-disabled !important;
18
+ .btn.disabled,
19
+ .btn-floating.disabled,
20
+ .btn-large.disabled,
21
+ .btn:disabled,
22
+ .btn-large:disabled,
23
+ .btn-floating:disabled {
24
+ background-color: $button-disabled-background !important;
19
25
  box-shadow: none;
20
- color: $button-color-disabled !important;
26
+ color: $button-disabled-color !important;
21
27
  cursor: default;
28
+
22
29
  * {
23
30
  pointer-events: none;
24
31
  }
25
32
 
26
33
  &:hover {
27
- background-color: $button-bg-color-disabled !important;
28
- color: $button-color-disabled !important;
34
+ background-color: $button-disabled-background !important;
35
+ color: $button-disabled-color !important;
29
36
  }
30
37
  }
38
+
31
39
  // Shared icon styles
32
- .btn, .btn-floating, .btn-large, .btn-flat {
40
+ .btn,
41
+ .btn-floating,
42
+ .btn-large,
43
+ .btn-flat {
33
44
  i {
34
- font-size: $button-font-size-shared;
45
+ font-size: $button-font-size;
35
46
  line-height: inherit;
36
47
  }
37
48
  }
38
49
 
39
50
  // Raised Button
40
51
  .btn {
41
- text-decoration:none;
42
- color: $button-color-raised;
43
- background-color: $button-color;
52
+ text-decoration: none;
53
+ color: $button-raised-color;
54
+ background-color: $button-raised-background;
44
55
  text-align: center;
45
56
  letter-spacing: .5px;
46
57
  @extend .z-depth-1;
@@ -48,7 +59,7 @@
48
59
  cursor: pointer;
49
60
 
50
61
  &:hover {
51
- background-color: lighten($button-color, 5%);
62
+ background-color: $button-raised-background-hover;
52
63
  @extend .z-depth-1-half;
53
64
  }
54
65
  }
@@ -56,7 +67,7 @@
56
67
  // Floating button
57
68
  .btn-floating {
58
69
  display: inline-block;
59
- color: $button-color-raised;
70
+ color: $button-floating-color;
60
71
  position: relative;
61
72
  overflow: hidden;
62
73
  z-index: 1;
@@ -64,8 +75,8 @@
64
75
  height: $button-floating-size;
65
76
  line-height: $button-floating-size;
66
77
  padding: 0;
67
- background-color: $button-color;
68
- border-radius: 50%;
78
+ background-color: $button-floating-background;
79
+ border-radius: $button-floating-radius;
69
80
  @extend .z-depth-1;
70
81
  transition: .3s;
71
82
  cursor: pointer;
@@ -75,30 +86,32 @@
75
86
  width: inherit;
76
87
  display: inline-block;
77
88
  text-align: center;
78
- color: $button-color-raised;
89
+ color: $button-floating-color;
79
90
  font-size: $button-large-icon-font-size;
80
91
  line-height: $button-floating-size;
81
92
  }
82
93
 
83
94
  &:hover {
84
- background-color: $button-color;
95
+ background-color: $button-floating-background-hover;
85
96
  @extend .z-depth-1-half;
86
97
  }
98
+
87
99
  &:before {
88
100
  border-radius: 0;
89
101
  }
102
+
90
103
  &.btn-large {
91
- width: $button-floating-size * 1.5;
92
- height: $button-floating-size * 1.5;
93
- i{
94
- line-height: $button-floating-size * 1.5;
104
+ width: $button-floating-large-size;
105
+ height: $button-floating-large-size;
106
+ i {
107
+ line-height: $button-floating-large-size;
95
108
  }
96
109
  }
97
-
98
110
  }
111
+
99
112
  // button fix
100
113
  button.btn-floating {
101
- border: none;
114
+ border: $button-border;
102
115
  }
103
116
 
104
117
  // Fixed Action Button
@@ -108,15 +121,17 @@ button.btn-floating {
108
121
  visibility: visible;
109
122
  }
110
123
  }
124
+
111
125
  &.horizontal {
112
126
  padding: 0 0 0 15px;
127
+
113
128
  ul {
114
129
  text-align: right;
115
130
  right: 64px;
116
131
  top: 50%;
117
132
  transform: translateY(-50%);
118
133
  height: 100%;
119
- left: initial;
134
+ left: auto;
120
135
  width: 500px; /*width 100% only goes to width of button container */
121
136
 
122
137
  li {
@@ -125,6 +140,7 @@ button.btn-floating {
125
140
  }
126
141
  }
127
142
  }
143
+
128
144
  position: fixed;
129
145
  right: 23px;
130
146
  bottom: 23px;
@@ -155,11 +171,11 @@ button.btn-floating {
155
171
  .btn-flat {
156
172
  box-shadow: none;
157
173
  background-color: transparent;
158
- color: $button-color-flat;
174
+ color: $button-flat-color;
159
175
  cursor: pointer;
160
176
 
161
177
  &.disabled {
162
- color: lighten(#999, 10%);
178
+ color: $button-flat-disabled-color;
163
179
  cursor: default;
164
180
  }
165
181
  }
@@ -167,8 +183,8 @@ button.btn-floating {
167
183
  // Large button
168
184
  .btn-large {
169
185
  @extend .btn;
170
- height: $button-height * 1.5;
171
- line-height: 56px;
186
+ height: $button-large-height;
187
+ line-height: $button-large-height;
172
188
 
173
189
  i {
174
190
  font-size: $button-large-icon-font-size;