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.
- checksums.yaml +4 -4
- data/Rakefile +11 -10
- data/assets/javascripts/material-sprockets.js +1 -5
- data/assets/javascripts/material.js +155 -109
- data/assets/javascripts/material.min.js +4 -5
- data/assets/javascripts/material/addons/pickadate.js +0 -1
- data/assets/javascripts/material/components/expansion-panel.js +4 -5
- data/assets/javascripts/material/components/floating-label.js +10 -10
- data/assets/javascripts/material/components/nav-drawer.js +94 -68
- data/assets/javascripts/material/components/selection-control-focus.js +4 -5
- data/assets/javascripts/material/components/tab-switch.js +22 -11
- data/assets/javascripts/material/components/util.js +4 -14
- data/assets/stylesheets/material/{_colours.scss → _colors.scss} +414 -6
- data/assets/stylesheets/material/_functions.scss +17 -5
- data/assets/stylesheets/material/base/_base.scss +24 -0
- data/assets/stylesheets/material/bootstrap/_alert.scss +2 -2
- data/assets/stylesheets/material/bootstrap/_badge.scss +4 -4
- data/assets/stylesheets/material/bootstrap/_carousel.scss +36 -0
- data/assets/stylesheets/material/bootstrap/_close.scss +1 -1
- data/assets/stylesheets/material/bootstrap/_form.scss +26 -25
- data/assets/stylesheets/material/bootstrap/_pagination.scss +1 -1
- data/assets/stylesheets/material/material.scss +1 -1
- data/assets/stylesheets/material/material/_button-flat.scss +1 -1
- data/assets/stylesheets/material/material/_button-float.scss +22 -0
- data/assets/stylesheets/material/material/_button-group.scss +2 -2
- data/assets/stylesheets/material/material/_button.scss +6 -6
- data/assets/stylesheets/material/material/_card.scss +4 -4
- data/assets/stylesheets/material/material/_chip.scss +2 -2
- data/assets/stylesheets/material/material/_data-table.scss +62 -35
- data/assets/stylesheets/material/material/_dialog.scss +1 -1
- data/assets/stylesheets/material/material/_expansion-panel.scss +6 -6
- data/assets/stylesheets/material/material/_menu.scss +14 -0
- data/assets/stylesheets/material/material/_navdrawer.scss +99 -90
- data/assets/stylesheets/material/material/_picker.scss +69 -10
- data/assets/stylesheets/material/material/_progress-circular.scss +3 -3
- data/assets/stylesheets/material/material/_progress.scss +7 -7
- data/assets/stylesheets/material/material/_tab.scss +4 -0
- data/assets/stylesheets/material/material/_text-field-box.scss +19 -19
- data/assets/stylesheets/material/material/_text-field-floating-label.scss +8 -8
- data/assets/stylesheets/material/material/_text-field-input-group.scss +3 -3
- data/assets/stylesheets/material/material/_text-field.scss +3 -3
- data/assets/stylesheets/material/material/_toolbar.scss +48 -65
- data/assets/stylesheets/material/mixins/_breakpoint.scss +40 -22
- data/assets/stylesheets/material/mixins/_grid-framework.scss +6 -2
- data/assets/stylesheets/material/mixins/_grid.scss +10 -19
- data/assets/stylesheets/material/utilities/_background.scss +1 -1
- data/assets/stylesheets/material/utilities/_border.scss +1 -2
- data/assets/stylesheets/material/utilities/_display.scss +24 -16
- data/assets/stylesheets/material/utilities/_flex.scss +4 -0
- data/assets/stylesheets/material/utilities/_text.scss +1 -1
- data/assets/stylesheets/material/variables/_elevation-shadow.scss +0 -6
- data/assets/stylesheets/material/variables/_grid.scss +10 -19
- data/assets/stylesheets/material/variables/_palette.scss +26 -25
- data/assets/stylesheets/material/variables/_spacer.scss +24 -21
- data/assets/stylesheets/material/variables/_typography.scss +0 -1
- data/assets/stylesheets/material/variables/_variable-bootstrap.scss +7 -9
- data/assets/stylesheets/material/variables/_variable-material.scss +34 -29
- data/lib/material-sass/version.rb +1 -1
- metadata +5 -5
@@ -36,6 +36,7 @@ $btn-padding-y-sm: (($btn-height-sm - $btn-font-size-sm * $btn-line-h
|
|
36
36
|
// Button: floating action button
|
37
37
|
// Based on https://material.google.com/components/buttons-floating-action-button.html#buttons-floating-action-button-floating-action-button
|
38
38
|
|
39
|
+
$btn-float-dropdown-inner-spacer-y: 1rem !default;
|
39
40
|
$btn-float-elevation-shadow: $elevation-shadow-6dp !default;
|
40
41
|
$btn-float-elevation-shadow-active: $elevation-shadow-12dp !default;
|
41
42
|
$btn-float-size: 3.5rem !default;
|
@@ -45,7 +46,6 @@ $btn-float-size-sm: 2.5rem !default;
|
|
45
46
|
// Based on https://material.io/guidelines/components/buttons.html#buttons-toggle-buttons
|
46
47
|
|
47
48
|
$btn-group-bg: $white-primary !default;
|
48
|
-
$btn-group-divider-bg: $border-color !default;
|
49
49
|
$btn-group-inner-spacer-x: 1px !default;
|
50
50
|
$btn-group-inner-spacer-y: 1px !default;
|
51
51
|
$btn-group-toggle-opacity: 0.7 !default;
|
@@ -81,7 +81,7 @@ $chip-elevation-shadow-hover: $elevation-shadow-2dp !default;
|
|
81
81
|
$chip-font-size: 0.875rem !default;
|
82
82
|
$chip-font-weight: $font-weight-regular !default;
|
83
83
|
$chip-height: 2rem !default;
|
84
|
-
$chip-icon-bg:
|
84
|
+
$chip-icon-bg: theme-color(secondary) !default;
|
85
85
|
$chip-icon-font-size: 1rem !default;
|
86
86
|
$chip-inner-spacer-x: 0.25rem !default;
|
87
87
|
$chip-line-height: 1 !default;
|
@@ -91,6 +91,8 @@ $chip-padding-x: 0.75rem !default;
|
|
91
91
|
// Based on https://material.google.com/components/data-tables.html#data-tables-structure
|
92
92
|
|
93
93
|
$table-bg: $white !default;
|
94
|
+
$table-bg-active: $material-color-grey-200 !default;
|
95
|
+
$table-bg-active-hover: $material-color-grey-300 !default;
|
94
96
|
$table-bg-accent: $material-color-grey-100 !default;
|
95
97
|
$table-bg-hover: $material-color-grey-200 !default;
|
96
98
|
$table-border-color: $border-color-solid !default;
|
@@ -100,6 +102,7 @@ $table-cell-padding-x-alt: 1.5rem !default;
|
|
100
102
|
$table-elevation-shadow: $elevation-shadow-2dp !default;
|
101
103
|
$table-line-height: $line-height-base !default;
|
102
104
|
$table-margin-y: $spacer !default;
|
105
|
+
$table-striped-order: odd !default;
|
103
106
|
|
104
107
|
$table-dark-bg: $dark-theme-4 !default;
|
105
108
|
$table-dark-bg-accent: $dark-theme-3 !default;
|
@@ -229,7 +232,7 @@ $navdrawer-nav-icon-color: $black-secondary !default;
|
|
229
232
|
$navdrawer-nav-icon-width: 3.5rem !default;
|
230
233
|
$navdrawer-nav-link-bg-hover: $material-color-grey-100 !default;
|
231
234
|
$navdrawer-nav-link-color: $black-primary !default;
|
232
|
-
$navdrawer-nav-link-color-active:
|
235
|
+
$navdrawer-nav-link-color-active: theme-color(primary) !default;
|
233
236
|
$navdrawer-nav-link-color-disabled: $black-hint !default;
|
234
237
|
$navdrawer-nav-link-font-size: 0.875rem !default;
|
235
238
|
$navdrawer-nav-link-font-weight: $font-weight-medium !default;
|
@@ -243,24 +246,27 @@ $navdrawer-width: 17.5rem !default;
|
|
243
246
|
// Picker
|
244
247
|
// Based on https://material.google.com/components/pickers.html#pickers-date-pickers
|
245
248
|
|
246
|
-
$picker-border-radius:
|
247
|
-
$picker-cell-size:
|
248
|
-
$picker-content-bg:
|
249
|
-
$picker-day-bg-selected:
|
250
|
-
$picker-day-color-disabled:
|
251
|
-
$picker-day-color-today:
|
252
|
-
$picker-elevation-shadow:
|
253
|
-
$picker-header-bg:
|
254
|
-
$picker-header-padding-x:
|
255
|
-
$picker-header-padding-y:
|
256
|
-
$picker-holder-bg:
|
257
|
-
$picker-inner-spacer-x:
|
258
|
-
$picker-inner-spacer-y:
|
259
|
-
$picker-margin-x:
|
260
|
-
$picker-margin-y:
|
261
|
-
$picker-nav-next-icon:
|
262
|
-
$picker-nav-prev-icon:
|
263
|
-
$picker-
|
249
|
+
$picker-border-radius: $border-radius !default;
|
250
|
+
$picker-cell-size: 2.5rem !default;
|
251
|
+
$picker-content-bg: $dialog-content-bg !default;
|
252
|
+
$picker-day-bg-selected: theme-color(primary) !default;
|
253
|
+
$picker-day-color-disabled: $black-hint !default;
|
254
|
+
$picker-day-color-today: theme-color(primary) !default;
|
255
|
+
$picker-elevation-shadow: $dialog-elevation-shadow !default;
|
256
|
+
$picker-header-bg: theme-color(primary) !default;
|
257
|
+
$picker-header-padding-x: 1.5rem !default;
|
258
|
+
$picker-header-padding-y: 1rem !default;
|
259
|
+
$picker-holder-bg: $dialog-backdrop-bg !default;
|
260
|
+
$picker-inner-spacer-x: 0.5rem !default;
|
261
|
+
$picker-inner-spacer-y: 0.5rem !default;
|
262
|
+
$picker-margin-x: $dialog-margin-x !default;
|
263
|
+
$picker-margin-y: $dialog-margin-y !default;
|
264
|
+
$picker-nav-next-icon: 'keyboard_arrow_right' !default;
|
265
|
+
$picker-nav-prev-icon: 'keyboard_arrow_left' !default;
|
266
|
+
$picker-select-bg: $black-divider !default;
|
267
|
+
$picker-select-border-radius: $border-radius !default;
|
268
|
+
$picker-select-opacity: 0.7 !default;
|
269
|
+
$picker-weekday-color: $black-hint !default;
|
264
270
|
|
265
271
|
// Progress (Bootstrap progress bar)
|
266
272
|
// Based on https://material.google.com/components/progress-activity.html#progress-activity-types-of-indicators
|
@@ -282,7 +288,7 @@ $selection-control-checkbox-icon: 'check_box_outline_blank' !defau
|
|
282
288
|
$selection-control-checkbox-icon-checked: 'check_box' !default;
|
283
289
|
$selection-control-checkbox-icon-indeterminate: 'indeterminate_check_box' !default;
|
284
290
|
$selection-control-color: $black-secondary !default;
|
285
|
-
$selection-control-color-active:
|
291
|
+
$selection-control-color-active: theme-color(secondary) !default;
|
286
292
|
$selection-control-color-disabled: rgba(0, 0, 0, 0.26) !default;
|
287
293
|
$selection-control-indicator-size: $material-icon-size !default;
|
288
294
|
$selection-control-radial-opacity: $black-divider-opacity !default;
|
@@ -305,7 +311,7 @@ $stepper-bg: $white !default;
|
|
305
311
|
$stepper-border-color: $material-color-grey-400 !default;
|
306
312
|
$stepper-border-width: $border-width !default;
|
307
313
|
$stepper-icon-bg: $black-hint !default;
|
308
|
-
$stepper-icon-bg-active:
|
314
|
+
$stepper-icon-bg-active: theme-color(primary) !default;
|
309
315
|
$stepper-icon-color: $white-primary !default;
|
310
316
|
$stepper-icon-font-size: 0.75rem !default;
|
311
317
|
$stepper-icon-font-weight: $font-weight-regular !default;
|
@@ -325,12 +331,12 @@ $nav-tab-bg-hover: $black-divider !default;
|
|
325
331
|
$nav-tab-border-color: $border-color !default;
|
326
332
|
$nav-tab-border-width: $border-width !default;
|
327
333
|
$nav-tab-color: $black-primary !default;
|
328
|
-
$nav-tab-color-active:
|
334
|
+
$nav-tab-color-active: theme-color(secondary) !default;
|
329
335
|
$nav-tab-color-disabled: $black-hint !default;
|
330
336
|
$nav-tab-font-size: 0.875rem !default;
|
331
337
|
$nav-tab-font-weight: $font-weight-medium !default;
|
332
338
|
$nav-tab-height: 3rem !default;
|
333
|
-
$nav-tab-indicator-bg:
|
339
|
+
$nav-tab-indicator-bg: theme-color(secondary) !default;
|
334
340
|
$nav-tab-indicator-height: 0.125rem !default;
|
335
341
|
$nav-tab-line-height: 1 !default;
|
336
342
|
$nav-tab-link-opacity: 0.7 !default;
|
@@ -341,7 +347,7 @@ $nav-tab-link-padding-y: (($nav-tab-height - $nav-tab-font-size * $nav-tab-lin
|
|
341
347
|
// Based on https://material.io/guidelines/components/text-fields.html#text-fields-states
|
342
348
|
|
343
349
|
$textfield-border-color: rgba(0, 0, 0, 0.42) !default;
|
344
|
-
$textfield-border-color-focus:
|
350
|
+
$textfield-border-color-focus: theme-color(primary) !default;
|
345
351
|
$textfield-border-color-hover: rgba(0, 0, 0, 0.87) !default;
|
346
352
|
$textfield-border-width: $border-width !default;
|
347
353
|
$textfield-border-width-focus: ($textfield-border-width * 2) !default;
|
@@ -392,7 +398,7 @@ $textfield-box-padding-y-sm: (($textfield-box-height-sm - $textfield-font-size
|
|
392
398
|
// Based on https://material.google.com/components/text-fields.html#text-fields-labels
|
393
399
|
|
394
400
|
$floating-label-color: $textfield-hint-color !default;
|
395
|
-
$floating-label-color-focus:
|
401
|
+
$floating-label-color-focus: theme-color(primary) !default;
|
396
402
|
$floating-label-font-size-focus: 0.75rem !default;
|
397
403
|
|
398
404
|
// Toolbar (Bootstrap navbar)
|
@@ -407,7 +413,6 @@ $toolbar-element-opacity: 0.7 !default;
|
|
407
413
|
$toolbar-elevation-shadow: $elevation-shadow-4dp !default;
|
408
414
|
$toolbar-height: 3.5rem !default;
|
409
415
|
$toolbar-inner-spacer-x: 1rem !default;
|
410
|
-
$toolbar-inner-spacer-y: 1rem !default;
|
411
416
|
$toolbar-link-font-size: 1rem !default;
|
412
417
|
$toolbar-link-height: $toolbar-element-height !default;
|
413
418
|
$toolbar-link-line-height: 1 !default;
|
@@ -416,7 +421,7 @@ $toolbar-link-padding-y: (($toolbar-link-height - $toolbar-link-font-size
|
|
416
421
|
$toolbar-padding-x: 1rem !default;
|
417
422
|
$toolbar-padding-y: (($toolbar-height - $toolbar-element-height) / 2) !default;
|
418
423
|
$toolbar-toggler-icon: 'menu' !default;
|
419
|
-
$toolbar-waterfall-bg:
|
424
|
+
$toolbar-waterfall-bg: theme-color(primary) !default;
|
420
425
|
|
421
426
|
$toolbar-dark-color: $white-primary !default;
|
422
427
|
$toolbar-dark-color-lighter: $white-hint !default;
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: material-sass
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.0
|
4
|
+
version: 4.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- mkhairi
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-02-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sass
|
@@ -90,7 +90,7 @@ files:
|
|
90
90
|
- assets/javascripts/material/components/util.js
|
91
91
|
- assets/stylesheets/material.min.css
|
92
92
|
- assets/stylesheets/material.scss
|
93
|
-
- assets/stylesheets/material/
|
93
|
+
- assets/stylesheets/material/_colors.scss
|
94
94
|
- assets/stylesheets/material/_functions.scss
|
95
95
|
- assets/stylesheets/material/_mixins.scss
|
96
96
|
- assets/stylesheets/material/_print.scss
|
@@ -203,9 +203,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
203
203
|
version: '0'
|
204
204
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
|
-
- - "
|
206
|
+
- - ">="
|
207
207
|
- !ruby/object:Gem::Version
|
208
|
-
version:
|
208
|
+
version: '0'
|
209
209
|
requirements: []
|
210
210
|
rubyforge_project:
|
211
211
|
rubygems_version: 2.7.3
|