Skip to content

Commit 7db9cc8

Browse files
committed
remove color mixin
1 parent 9196129 commit 7db9cc8

13 files changed

+231
-231
lines changed

addon/components/paper-button.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { reads } from '@ember/object/computed';
66

77
import Component from '@ember/component';
88
import FocusableMixin from 'ember-paper/mixins/focusable-mixin';
9-
import ColorMixin from 'ember-paper/mixins/color-mixin';
109
import ProxiableMixin from 'ember-paper/mixins/proxiable-mixin';
1110
import { invokeAction } from 'ember-paper/utils/invoke-action';
1211

@@ -17,9 +16,15 @@ import { invokeAction } from 'ember-paper/utils/invoke-action';
1716
* @uses ColorMixin
1817
* @uses ProxiableMixin
1918
*/
20-
export default Component.extend(FocusableMixin, ColorMixin, ProxiableMixin, {
19+
export default Component.extend(FocusableMixin, ProxiableMixin, {
2120
tagName: 'button',
22-
classNames: ['md-default-theme', 'md-button'],
21+
classNames: [
22+
'md-default-theme',
23+
'md-button',
24+
'warn:md-warn',
25+
'accent:md-accent',
26+
'primary:md-primary',
27+
],
2328
raised: false,
2429
iconButton: false,
2530

addon/components/paper-checkbox.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { not, and } from '@ember/object/computed';
99
import Component from '@ember/component';
1010
import { assert } from '@ember/debug';
1111
import FocusableMixin from 'ember-paper/mixins/focusable-mixin';
12-
import ColorMixin from 'ember-paper/mixins/color-mixin';
1312
import ProxiableMixin from 'ember-paper/mixins/proxiable-mixin';
1413
import { invokeAction } from 'ember-paper/utils/invoke-action';
1514
/**
@@ -19,10 +18,16 @@ import { invokeAction } from 'ember-paper/utils/invoke-action';
1918
* @uses ColorMixin
2019
* @uses ProxiableMixin
2120
*/
22-
export default Component.extend(FocusableMixin, ColorMixin, ProxiableMixin, {
21+
export default Component.extend(FocusableMixin, ProxiableMixin, {
2322
tagName: 'md-checkbox',
2423
classNames: ['md-checkbox', 'md-default-theme'],
25-
classNameBindings: ['isChecked:md-checked', 'indeterminate:md-indeterminate'],
24+
classNameBindings: [
25+
'isChecked:md-checked',
26+
'indeterminate:md-indeterminate',
27+
'warn:md-warn',
28+
'accent:md-accent',
29+
'primary:md-primary',
30+
],
2631

2732
attributeBindings: [
2833
'role:role',

addon/components/paper-icon.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable ember/no-classic-components, ember/no-get-with-default, ember/no-mixins, ember/require-tagless-components */
1+
/* eslint-disable ember/no-classic-components, ember/no-get-with-default, ember/require-tagless-components */
22
/**
33
* @module ember-paper
44
*/
@@ -8,17 +8,20 @@ import { computed } from '@ember/object';
88
import { reads } from '@ember/object/computed';
99
import { htmlSafe } from '@ember/string';
1010

11-
import ColorMixin from 'ember-paper/mixins/color-mixin';
12-
1311
/**
1412
* @class PaperIcon
1513
* @extends Ember.Component
1614
* @uses ColorMixin
1715
*/
18-
let PaperIconComponent = Component.extend(ColorMixin, {
16+
let PaperIconComponent = Component.extend({
1917
tagName: 'md-icon',
2018
classNames: ['paper-icon', 'md-font', 'material-icons', 'md-default-theme'],
21-
classNameBindings: ['spinClass'],
19+
classNameBindings: [
20+
'spinClass',
21+
'warn:md-warn',
22+
'accent:md-accent',
23+
'primary:md-primary',
24+
],
2225
attributeBindings: [
2326
'aria-hidden',
2427
'aria-label',

0 commit comments

Comments
 (0)