material-sass 4.0.0.beta3 → 4.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (59) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +11 -10
  3. data/assets/javascripts/material-sprockets.js +1 -5
  4. data/assets/javascripts/material.js +155 -109
  5. data/assets/javascripts/material.min.js +4 -5
  6. data/assets/javascripts/material/addons/pickadate.js +0 -1
  7. data/assets/javascripts/material/components/expansion-panel.js +4 -5
  8. data/assets/javascripts/material/components/floating-label.js +10 -10
  9. data/assets/javascripts/material/components/nav-drawer.js +94 -68
  10. data/assets/javascripts/material/components/selection-control-focus.js +4 -5
  11. data/assets/javascripts/material/components/tab-switch.js +22 -11
  12. data/assets/javascripts/material/components/util.js +4 -14
  13. data/assets/stylesheets/material/{_colours.scss → _colors.scss} +414 -6
  14. data/assets/stylesheets/material/_functions.scss +17 -5
  15. data/assets/stylesheets/material/base/_base.scss +24 -0
  16. data/assets/stylesheets/material/bootstrap/_alert.scss +2 -2
  17. data/assets/stylesheets/material/bootstrap/_badge.scss +4 -4
  18. data/assets/stylesheets/material/bootstrap/_carousel.scss +36 -0
  19. data/assets/stylesheets/material/bootstrap/_close.scss +1 -1
  20. data/assets/stylesheets/material/bootstrap/_form.scss +26 -25
  21. data/assets/stylesheets/material/bootstrap/_pagination.scss +1 -1
  22. data/assets/stylesheets/material/material.scss +1 -1
  23. data/assets/stylesheets/material/material/_button-flat.scss +1 -1
  24. data/assets/stylesheets/material/material/_button-float.scss +22 -0
  25. data/assets/stylesheets/material/material/_button-group.scss +2 -2
  26. data/assets/stylesheets/material/material/_button.scss +6 -6
  27. data/assets/stylesheets/material/material/_card.scss +4 -4
  28. data/assets/stylesheets/material/material/_chip.scss +2 -2
  29. data/assets/stylesheets/material/material/_data-table.scss +62 -35
  30. data/assets/stylesheets/material/material/_dialog.scss +1 -1
  31. data/assets/stylesheets/material/material/_expansion-panel.scss +6 -6
  32. data/assets/stylesheets/material/material/_menu.scss +14 -0
  33. data/assets/stylesheets/material/material/_navdrawer.scss +99 -90
  34. data/assets/stylesheets/material/material/_picker.scss +69 -10
  35. data/assets/stylesheets/material/material/_progress-circular.scss +3 -3
  36. data/assets/stylesheets/material/material/_progress.scss +7 -7
  37. data/assets/stylesheets/material/material/_tab.scss +4 -0
  38. data/assets/stylesheets/material/material/_text-field-box.scss +19 -19
  39. data/assets/stylesheets/material/material/_text-field-floating-label.scss +8 -8
  40. data/assets/stylesheets/material/material/_text-field-input-group.scss +3 -3
  41. data/assets/stylesheets/material/material/_text-field.scss +3 -3
  42. data/assets/stylesheets/material/material/_toolbar.scss +48 -65
  43. data/assets/stylesheets/material/mixins/_breakpoint.scss +40 -22
  44. data/assets/stylesheets/material/mixins/_grid-framework.scss +6 -2
  45. data/assets/stylesheets/material/mixins/_grid.scss +10 -19
  46. data/assets/stylesheets/material/utilities/_background.scss +1 -1
  47. data/assets/stylesheets/material/utilities/_border.scss +1 -2
  48. data/assets/stylesheets/material/utilities/_display.scss +24 -16
  49. data/assets/stylesheets/material/utilities/_flex.scss +4 -0
  50. data/assets/stylesheets/material/utilities/_text.scss +1 -1
  51. data/assets/stylesheets/material/variables/_elevation-shadow.scss +0 -6
  52. data/assets/stylesheets/material/variables/_grid.scss +10 -19
  53. data/assets/stylesheets/material/variables/_palette.scss +26 -25
  54. data/assets/stylesheets/material/variables/_spacer.scss +24 -21
  55. data/assets/stylesheets/material/variables/_typography.scss +0 -1
  56. data/assets/stylesheets/material/variables/_variable-bootstrap.scss +7 -9
  57. data/assets/stylesheets/material/variables/_variable-material.scss +34 -29
  58. data/lib/material-sass/version.rb +1 -1
  59. metadata +5 -5
@@ -1,13 +1,16 @@
1
1
  /*
2
- * tab indicator animation
3
- * requires bootstrap's (v4.0.0-beta) tab.js
2
+ * Tab indicator animation
3
+ * Requires Bootstrap's (v4.0.0) `tab.js`
4
4
  */
5
5
  var TabSwitch = function ($) {
6
6
  // constants >>>
7
7
  var DATA_KEY = 'md.tabswitch';
8
8
  var NAME = 'tabswitch';
9
9
  var NO_CONFLICT = $.fn[NAME];
10
- var TRANSITION_DURATION = 390;
10
+ var Breakpoints = {
11
+ DESKTOP: 992,
12
+ TABLET: 576
13
+ };
11
14
  var ClassName = {
12
15
  ANIMATE: 'animate',
13
16
  DROPDOWN_ITEM: 'dropdown-item',
@@ -22,7 +25,12 @@ var TabSwitch = function ($) {
22
25
  var Selector = {
23
26
  DATA_TOGGLE: '.nav-tabs [data-toggle="tab"]',
24
27
  DROPDOWN: '.dropdown',
25
- NAV: '.nav-tabs' // <<< constants
28
+ NAV: '.nav-tabs'
29
+ };
30
+ var TransitionDuration = {
31
+ DESKTOP: 200,
32
+ MOBILE: 300,
33
+ TABLET: 390 // <<< constants
26
34
 
27
35
  };
28
36
 
@@ -30,10 +38,6 @@ var TabSwitch = function ($) {
30
38
  /*#__PURE__*/
31
39
  function () {
32
40
  function TabSwitch(nav) {
33
- if (typeof $.fn.tab === 'undefined') {
34
- throw new Error('Material\'s JavaScript requires Bootstrap\'s tab.js');
35
- }
36
-
37
41
  this._nav = nav;
38
42
  this._navindicator = null;
39
43
  }
@@ -80,7 +84,15 @@ var TabSwitch = function ($) {
80
84
  return;
81
85
  }
82
86
 
83
- $(this._navindicator).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION);
87
+ var transitionDuration = TransitionDuration.MOBILE;
88
+
89
+ if (window.innerWidth >= Breakpoints.DESKTOP) {
90
+ transitionDuration = TransitionDuration.DESKTOP;
91
+ } else if (window.innerWidth >= Breakpoints.TABLET) {
92
+ transitionDuration = TransitionDuration.TABLET;
93
+ }
94
+
95
+ $(this._navindicator).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
84
96
  };
85
97
 
86
98
  _proto._createIndicator = function _createIndicator(navLeft, navScrollLeft, navWidth, relatedTarget) {
@@ -126,7 +138,7 @@ var TabSwitch = function ($) {
126
138
  }();
127
139
 
128
140
  $(document).on(Event.SHOW_BS_TAB, Selector.DATA_TOGGLE, function (event) {
129
- TabSwitch._jQueryInterface.call($(event.target), event.relatedTarget);
141
+ TabSwitch._jQueryInterface.call($(this), event.relatedTarget);
130
142
  });
131
143
  $.fn[NAME] = TabSwitch._jQueryInterface;
132
144
  $.fn[NAME].Constructor = TabSwitch;
@@ -138,4 +150,3 @@ var TabSwitch = function ($) {
138
150
 
139
151
  return TabSwitch;
140
152
  }($);
141
- //# sourceMappingURL=tab-switch.js.map
@@ -1,16 +1,11 @@
1
1
  /*
2
- * global util js
3
- * based on bootstrap's (v4.0.0-beta) util.js
2
+ * Global util js
3
+ * Based on Bootstrap's (v4.0.0) `util.js`
4
4
  */
5
5
  var Util = function ($) {
6
6
  var MAX_UID = 1000000;
7
7
  var transition = false;
8
8
 
9
- function escapeId(selector) {
10
- selector = typeof $.escapeSelector === 'function' ? $.escapeSelector(selector).substr(1) : selector.replace(/(:|\.|\[|\]|,|=|@)/g, '\\$1');
11
- return selector;
12
- }
13
-
14
9
  function getSpecialTransitionEndEvent() {
15
10
  return {
16
11
  bindType: transition.end,
@@ -35,7 +30,7 @@ var Util = function ($) {
35
30
  }
36
31
 
37
32
  function toType(obj) {
38
- return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
33
+ return {}.toString.call(obj).match(/\s([a-z]+)/i)[1].toLowerCase();
39
34
  }
40
35
 
41
36
  function transitionEndEmulator(duration) {
@@ -54,7 +49,7 @@ var Util = function ($) {
54
49
  }
55
50
 
56
51
  function transitionEndTest() {
57
- if (window.QUnit) {
52
+ if (typeof window !== 'undefined' && window.QUnit) {
58
53
  return false;
59
54
  }
60
55
 
@@ -72,10 +67,6 @@ var Util = function ($) {
72
67
  selector = element.getAttribute('href') || '';
73
68
  }
74
69
 
75
- if (selector.charAt(0) === '#') {
76
- selector = escapeId(selector);
77
- }
78
-
79
70
  try {
80
71
  var $selector = $(document).find(selector);
81
72
  return $selector.length > 0 ? selector : null;
@@ -120,4 +111,3 @@ var Util = function ($) {
120
111
  setTransitionEndSupport();
121
112
  return Util;
122
113
  }($);
123
- //# sourceMappingURL=util.js.map
@@ -81,7 +81,7 @@ $material-color-deep-orange-900: #bf360c !default;
81
81
  $material-color-deep-orange-a100: #ff9e80 !default;
82
82
  $material-color-deep-orange-a200: #ff6e40 !default;
83
83
  $material-color-deep-orange-a400: #ff3d00 !default;
84
- $material-color-deep-orange-a700: #ee2c00 !default;
84
+ $material-color-deep-orange-a700: #dd2c00 !default;
85
85
 
86
86
  $material-color-deep-purple-050: #ede7f6 !default;
87
87
  $material-color-deep-purple-100: #d1c4e9 !default;
@@ -274,6 +274,419 @@ $material-color-yellow-a200: #ffff00 !default;
274
274
  $material-color-yellow-a400: #ffea00 !default;
275
275
  $material-color-yellow-a700: #ffd600 !default;
276
276
 
277
+ $ambers: () !default;
278
+ $ambers: map-merge(
279
+ (
280
+ 50: $material-color-amber-050,
281
+ 100: $material-color-amber-100,
282
+ 200: $material-color-amber-200,
283
+ 300: $material-color-amber-300,
284
+ 400: $material-color-amber-400,
285
+ 500: $material-color-amber-500,
286
+ 600: $material-color-amber-600,
287
+ 700: $material-color-amber-700,
288
+ 800: $material-color-amber-800,
289
+ 900: $material-color-amber-900,
290
+ a100: $material-color-amber-a100,
291
+ a200: $material-color-amber-a200,
292
+ a400: $material-color-amber-a400,
293
+ a700: $material-color-amber-a700
294
+ ),
295
+ $ambers
296
+ );
297
+
298
+ $blues: () !default;
299
+ $blues: map-merge(
300
+ (
301
+ 50: $material-color-blue-050,
302
+ 100: $material-color-blue-100,
303
+ 200: $material-color-blue-200,
304
+ 300: $material-color-blue-300,
305
+ 400: $material-color-blue-400,
306
+ 500: $material-color-blue-500,
307
+ 600: $material-color-blue-600,
308
+ 700: $material-color-blue-700,
309
+ 800: $material-color-blue-800,
310
+ 900: $material-color-blue-900,
311
+ a100: $material-color-blue-a100,
312
+ a200: $material-color-blue-a200,
313
+ a400: $material-color-blue-a400,
314
+ a700: $material-color-blue-a700
315
+ ),
316
+ $blues
317
+ );
318
+
319
+ $blue-greys: () !default;
320
+ $blue-greys: map-merge(
321
+ (
322
+ 50: $material-color-blue-grey-050,
323
+ 100: $material-color-blue-grey-100,
324
+ 200: $material-color-blue-grey-200,
325
+ 300: $material-color-blue-grey-300,
326
+ 400: $material-color-blue-grey-400,
327
+ 500: $material-color-blue-grey-500,
328
+ 600: $material-color-blue-grey-600,
329
+ 700: $material-color-blue-grey-700,
330
+ 800: $material-color-blue-grey-800,
331
+ 900: $material-color-blue-grey-900
332
+ ),
333
+ $blue-greys
334
+ );
335
+
336
+ $browns: () !default;
337
+ $browns: map-merge(
338
+ (
339
+ 50: $material-color-brown-050,
340
+ 100: $material-color-brown-100,
341
+ 200: $material-color-brown-200,
342
+ 300: $material-color-brown-300,
343
+ 400: $material-color-brown-400,
344
+ 500: $material-color-brown-500,
345
+ 600: $material-color-brown-600,
346
+ 700: $material-color-brown-700,
347
+ 800: $material-color-brown-800,
348
+ 900: $material-color-brown-900
349
+ ),
350
+ $browns
351
+ );
352
+
353
+ $cyans: () !default;
354
+ $cyans: map-merge(
355
+ (
356
+ 50: $material-color-cyan-050,
357
+ 100: $material-color-cyan-100,
358
+ 200: $material-color-cyan-200,
359
+ 300: $material-color-cyan-300,
360
+ 400: $material-color-cyan-400,
361
+ 500: $material-color-cyan-500,
362
+ 600: $material-color-cyan-600,
363
+ 700: $material-color-cyan-700,
364
+ 800: $material-color-cyan-800,
365
+ 900: $material-color-cyan-900,
366
+ a100: $material-color-cyan-a100,
367
+ a200: $material-color-cyan-a200,
368
+ a400: $material-color-cyan-a400,
369
+ a700: $material-color-cyan-a700
370
+ ),
371
+ $cyans
372
+ );
373
+
374
+ $deep-oranges: () !default;
375
+ $deep-oranges: map-merge(
376
+ (
377
+ 50: $material-color-deep-orange-050,
378
+ 100: $material-color-deep-orange-100,
379
+ 200: $material-color-deep-orange-200,
380
+ 300: $material-color-deep-orange-300,
381
+ 400: $material-color-deep-orange-400,
382
+ 500: $material-color-deep-orange-500,
383
+ 600: $material-color-deep-orange-600,
384
+ 700: $material-color-deep-orange-700,
385
+ 800: $material-color-deep-orange-800,
386
+ 900: $material-color-deep-orange-900,
387
+ a100: $material-color-deep-orange-a100,
388
+ a200: $material-color-deep-orange-a200,
389
+ a400: $material-color-deep-orange-a400,
390
+ a700: $material-color-deep-orange-a700
391
+ ),
392
+ $deep-oranges
393
+ );
394
+
395
+ $deep-purples: () !default;
396
+ $deep-purples: map-merge(
397
+ (
398
+ 50: $material-color-deep-purple-050,
399
+ 100: $material-color-deep-purple-100,
400
+ 200: $material-color-deep-purple-200,
401
+ 300: $material-color-deep-purple-300,
402
+ 400: $material-color-deep-purple-400,
403
+ 500: $material-color-deep-purple-500,
404
+ 600: $material-color-deep-purple-600,
405
+ 700: $material-color-deep-purple-700,
406
+ 800: $material-color-deep-purple-800,
407
+ 900: $material-color-deep-purple-900,
408
+ a100: $material-color-deep-purple-a100,
409
+ a200: $material-color-deep-purple-a200,
410
+ a400: $material-color-deep-purple-a400,
411
+ a700: $material-color-deep-purple-a700
412
+ ),
413
+ $deep-purples
414
+ );
415
+
416
+ $greens: () !default;
417
+ $greens: map-merge(
418
+ (
419
+ 50: $material-color-green-050,
420
+ 100: $material-color-green-100,
421
+ 200: $material-color-green-200,
422
+ 300: $material-color-green-300,
423
+ 400: $material-color-green-400,
424
+ 500: $material-color-green-500,
425
+ 600: $material-color-green-600,
426
+ 700: $material-color-green-700,
427
+ 800: $material-color-green-800,
428
+ 900: $material-color-green-900,
429
+ a100: $material-color-green-a100,
430
+ a200: $material-color-green-a200,
431
+ a400: $material-color-green-a400,
432
+ a700: $material-color-green-a700
433
+ ),
434
+ $greens
435
+ );
436
+
437
+ $greys: () !default;
438
+ $greys: map-merge(
439
+ (
440
+ 50: $material-color-grey-050,
441
+ 100: $material-color-grey-100,
442
+ 200: $material-color-grey-200,
443
+ 300: $material-color-grey-300,
444
+ 400: $material-color-grey-400,
445
+ 500: $material-color-grey-500,
446
+ 600: $material-color-grey-600,
447
+ 700: $material-color-grey-700,
448
+ 800: $material-color-grey-800,
449
+ 900: $material-color-grey-900
450
+ ),
451
+ $greys
452
+ );
453
+
454
+ $indigos: () !default;
455
+ $indigos: map-merge(
456
+ (
457
+ 50: $material-color-indigo-050,
458
+ 100: $material-color-indigo-100,
459
+ 200: $material-color-indigo-200,
460
+ 300: $material-color-indigo-300,
461
+ 400: $material-color-indigo-400,
462
+ 500: $material-color-indigo-500,
463
+ 600: $material-color-indigo-600,
464
+ 700: $material-color-indigo-700,
465
+ 800: $material-color-indigo-800,
466
+ 900: $material-color-indigo-900,
467
+ a100: $material-color-indigo-a100,
468
+ a200: $material-color-indigo-a200,
469
+ a400: $material-color-indigo-a400,
470
+ a700: $material-color-indigo-a700
471
+ ),
472
+ $indigos
473
+ );
474
+
475
+ $light-blues: () !default;
476
+ $light-blues: map-merge(
477
+ (
478
+ 50: $material-color-light-blue-050,
479
+ 100: $material-color-light-blue-100,
480
+ 200: $material-color-light-blue-200,
481
+ 300: $material-color-light-blue-300,
482
+ 400: $material-color-light-blue-400,
483
+ 500: $material-color-light-blue-500,
484
+ 600: $material-color-light-blue-600,
485
+ 700: $material-color-light-blue-700,
486
+ 800: $material-color-light-blue-800,
487
+ 900: $material-color-light-blue-900,
488
+ a100: $material-color-light-blue-a100,
489
+ a200: $material-color-light-blue-a200,
490
+ a400: $material-color-light-blue-a400,
491
+ a700: $material-color-light-blue-a700
492
+ ),
493
+ $light-blues
494
+ );
495
+
496
+ $light-greens: () !default;
497
+ $light-greens: map-merge(
498
+ (
499
+ 50: $material-color-light-green-050,
500
+ 100: $material-color-light-green-100,
501
+ 200: $material-color-light-green-200,
502
+ 300: $material-color-light-green-300,
503
+ 400: $material-color-light-green-400,
504
+ 500: $material-color-light-green-500,
505
+ 600: $material-color-light-green-600,
506
+ 700: $material-color-light-green-700,
507
+ 800: $material-color-light-green-800,
508
+ 900: $material-color-light-green-900,
509
+ a100: $material-color-light-green-a100,
510
+ a200: $material-color-light-green-a200,
511
+ a400: $material-color-light-green-a400,
512
+ a700: $material-color-light-green-a700
513
+ ),
514
+ $light-greens
515
+ );
516
+
517
+ $limes: () !default;
518
+ $limes: map-merge(
519
+ (
520
+ 50: $material-color-lime-050,
521
+ 100: $material-color-lime-100,
522
+ 200: $material-color-lime-200,
523
+ 300: $material-color-lime-300,
524
+ 400: $material-color-lime-400,
525
+ 500: $material-color-lime-500,
526
+ 600: $material-color-lime-600,
527
+ 700: $material-color-lime-700,
528
+ 800: $material-color-lime-800,
529
+ 900: $material-color-lime-900,
530
+ a100: $material-color-lime-a100,
531
+ a200: $material-color-lime-a200,
532
+ a400: $material-color-lime-a400,
533
+ a700: $material-color-lime-a700
534
+ ),
535
+ $limes
536
+ );
537
+
538
+ $oranges: () !default;
539
+ $oranges: map-merge(
540
+ (
541
+ 50: $material-color-orange-050,
542
+ 100: $material-color-orange-100,
543
+ 200: $material-color-orange-200,
544
+ 300: $material-color-orange-300,
545
+ 400: $material-color-orange-400,
546
+ 500: $material-color-orange-500,
547
+ 600: $material-color-orange-600,
548
+ 700: $material-color-orange-700,
549
+ 800: $material-color-orange-800,
550
+ 900: $material-color-orange-900,
551
+ a100: $material-color-orange-a100,
552
+ a200: $material-color-orange-a200,
553
+ a400: $material-color-orange-a400,
554
+ a700: $material-color-orange-a700
555
+ ),
556
+ $oranges
557
+ );
558
+
559
+ $pinks: () !default;
560
+ $pinks: map-merge(
561
+ (
562
+ 50: $material-color-pink-050,
563
+ 100: $material-color-pink-100,
564
+ 200: $material-color-pink-200,
565
+ 300: $material-color-pink-300,
566
+ 400: $material-color-pink-400,
567
+ 500: $material-color-pink-500,
568
+ 600: $material-color-pink-600,
569
+ 700: $material-color-pink-700,
570
+ 800: $material-color-pink-800,
571
+ 900: $material-color-pink-900,
572
+ a100: $material-color-pink-a100,
573
+ a200: $material-color-pink-a200,
574
+ a400: $material-color-pink-a400,
575
+ a700: $material-color-pink-a700
576
+ ),
577
+ $pinks
578
+ );
579
+
580
+ $purples: () !default;
581
+ $purples: map-merge(
582
+ (
583
+ 50: $material-color-purple-050,
584
+ 100: $material-color-purple-100,
585
+ 200: $material-color-purple-200,
586
+ 300: $material-color-purple-300,
587
+ 400: $material-color-purple-400,
588
+ 500: $material-color-purple-500,
589
+ 600: $material-color-purple-600,
590
+ 700: $material-color-purple-700,
591
+ 800: $material-color-purple-800,
592
+ 900: $material-color-purple-900,
593
+ a100: $material-color-purple-a100,
594
+ a200: $material-color-purple-a200,
595
+ a400: $material-color-purple-a400,
596
+ a700: $material-color-purple-a700
597
+ ),
598
+ $purples
599
+ );
600
+
601
+ $reds: () !default;
602
+ $reds: map-merge(
603
+ (
604
+ 50: $material-color-red-050,
605
+ 100: $material-color-red-100,
606
+ 200: $material-color-red-200,
607
+ 300: $material-color-red-300,
608
+ 400: $material-color-red-400,
609
+ 500: $material-color-red-500,
610
+ 600: $material-color-red-600,
611
+ 700: $material-color-red-700,
612
+ 800: $material-color-red-800,
613
+ 900: $material-color-red-900,
614
+ a100: $material-color-red-a100,
615
+ a200: $material-color-red-a200,
616
+ a400: $material-color-red-a400,
617
+ a700: $material-color-red-a700
618
+ ),
619
+ $reds
620
+ );
621
+
622
+ $teals: () !default;
623
+ $teals: map-merge(
624
+ (
625
+ 50: $material-color-teal-050,
626
+ 100: $material-color-teal-100,
627
+ 200: $material-color-teal-200,
628
+ 300: $material-color-teal-300,
629
+ 400: $material-color-teal-400,
630
+ 500: $material-color-teal-500,
631
+ 600: $material-color-teal-600,
632
+ 700: $material-color-teal-700,
633
+ 800: $material-color-teal-800,
634
+ 900: $material-color-teal-900,
635
+ a100: $material-color-teal-a100,
636
+ a200: $material-color-teal-a200,
637
+ a400: $material-color-teal-a400,
638
+ a700: $material-color-teal-a700
639
+ ),
640
+ $teals
641
+ );
642
+
643
+ $yellows: () !default;
644
+ $yellows: map-merge(
645
+ (
646
+ 50: $material-color-yellow-050,
647
+ 100: $material-color-yellow-100,
648
+ 200: $material-color-yellow-200,
649
+ 300: $material-color-yellow-300,
650
+ 400: $material-color-yellow-400,
651
+ 500: $material-color-yellow-500,
652
+ 600: $material-color-yellow-600,
653
+ 700: $material-color-yellow-700,
654
+ 800: $material-color-yellow-800,
655
+ 900: $material-color-yellow-900,
656
+ a100: $material-color-yellow-a100,
657
+ a200: $material-color-yellow-a200,
658
+ a400: $material-color-yellow-a400,
659
+ a700: $material-color-yellow-a700
660
+ ),
661
+ $yellows
662
+ );
663
+
664
+ $colors: () !default;
665
+ $colors: map-merge(
666
+ (
667
+ 'amber': $material-color-amber-500,
668
+ 'blue': $material-color-blue-500,
669
+ 'blue-grey': $material-color-blue-grey-500,
670
+ 'brown': $material-color-brown-500,
671
+ 'cyan': $material-color-cyan-500,
672
+ 'deep-orange': $material-color-deep-orange-500,
673
+ 'deep-purple': $material-color-deep-purple-500,
674
+ 'green': $material-color-green-500,
675
+ 'grey': $material-color-grey-500,
676
+ 'indigo': $material-color-indigo-500,
677
+ 'light-blue': $material-color-light-blue-500,
678
+ 'light-green': $material-color-light-green-500,
679
+ 'lime': $material-color-lime-500,
680
+ 'orange': $material-color-orange-500,
681
+ 'pink': $material-color-pink-500,
682
+ 'purple': $material-color-purple-500,
683
+ 'red': $material-color-red-500,
684
+ 'teal': $material-color-teal-500,
685
+ 'yellow': $material-color-yellow-500
686
+ ),
687
+ $colors
688
+ );
689
+
277
690
  // Black and white
278
691
  // Based on https://material.google.com/style/color.html#color-text-background-colors
279
692
 
@@ -284,11 +697,6 @@ $black-secondary-opacity: 0.54 !default;
284
697
  $black-hint-opacity: 0.38 !default;
285
698
  $black-divider-opacity: 0.12 !default;
286
699
 
287
- $black-primary-solid: #212121 !default;
288
- $black-secondary-solid: #757575 !default;
289
- $black-hint-solid: #9e9e9e !default;
290
- $black-divider-solid: #e1e1e1 !default;
291
-
292
700
  $black-primary: rgba(red($black), green($black), blue($black), $black-primary-opacity) !default;
293
701
  $black-secondary: rgba(red($black), green($black), blue($black), $black-secondary-opacity) !default;
294
702
  $black-hint: rgba(red($black), green($black), blue($black), $black-hint-opacity) !default;