Skip to content

Commit f0211f4

Browse files
authored
Merge pull request #1293 from adopted-ember-addons/chore/remove-color-mixin
chore: remove color mixin.
2 parents 717a72c + 30b9f5d commit f0211f4

13 files changed

+238
-250
lines changed

addon/components/paper-button.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@ 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

1312
/**
1413
* @class PaperButton
1514
* @extends Ember.Component
1615
* @uses FocusableMixin
17-
* @uses ColorMixin
1816
* @uses ProxiableMixin
1917
*/
20-
export default Component.extend(FocusableMixin, ColorMixin, ProxiableMixin, {
18+
export default Component.extend(FocusableMixin, ProxiableMixin, {
2119
tagName: 'button',
2220
classNames: ['md-default-theme', 'md-button'],
2321
raised: false,
@@ -38,6 +36,9 @@ export default Component.extend(FocusableMixin, ColorMixin, ProxiableMixin, {
3836
'iconButton:md-icon-button',
3937
'fab:md-fab',
4038
'mini:md-mini',
39+
'warn:md-warn',
40+
'accent:md-accent',
41+
'primary:md-primary',
4142
],
4243

4344
init() {

addon/components/paper-checkbox.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,24 @@ 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
/**
1615
* @class PaperCheckbox
1716
* @extends Ember.Component
1817
* @uses FocusableMixin
19-
* @uses ColorMixin
2018
* @uses ProxiableMixin
2119
*/
22-
export default Component.extend(FocusableMixin, ColorMixin, ProxiableMixin, {
20+
export default Component.extend(FocusableMixin, ProxiableMixin, {
2321
tagName: 'md-checkbox',
2422
classNames: ['md-checkbox', 'md-default-theme'],
25-
classNameBindings: ['isChecked:md-checked', 'indeterminate:md-indeterminate'],
23+
classNameBindings: [
24+
'isChecked:md-checked',
25+
'indeterminate:md-indeterminate',
26+
'warn:md-warn',
27+
'accent:md-accent',
28+
'primary:md-primary',
29+
],
2630

2731
attributeBindings: [
2832
'role:role',

addon/components/paper-icon.js

Lines changed: 8 additions & 6 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,19 @@ import { computed } from '@ember/object';
88
import { reads } from '@ember/object/computed';
99
import { htmlSafe } from '@ember/template';
1010

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

0 commit comments

Comments
 (0)