Skip to content

Commit 4e83b19

Browse files
committed
⚗ Update theme filenames to filename.module.scss
Autocomplete, Avatar, Button, Card, Carousel
1 parent 535ad6c commit 4e83b19

File tree

16 files changed

+756
-5103
lines changed

16 files changed

+756
-5103
lines changed

lib/autocomplete/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Proptypes from 'prop-types';
44
import { themr } from 'react-css-themr';
55
import cx from 'classnames';
66

7-
import defaultTheme from './theme.scss';
7+
import defaultTheme from './theme.module.scss';
88

99
const { findDOMNode: findNode } = ReactDOM;
1010

@@ -270,7 +270,7 @@ class AutoComplete extends Component {
270270
ref={(ref) => {
271271
this.listRef = ref;
272272
}}
273-
className={cx(theme['autocomplete-list'], { enabled: showSuggestions })}
273+
className={cx(theme['autocomplete-list'], showSuggestions ? theme.enabled : '')}
274274
onMouseEnter={() => this.blockOnBlur(true)}
275275
onMouseLeave={() => this.blockOnBlur(false)}
276276
>

lib/autocomplete/theme.scss renamed to lib/autocomplete/theme.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import '../globals/_theme.scss';
2-
@import '../globals/animations.scss';
2+
@import '../globals/animations.module.scss';
33
@import '../globals/common.scss';
44

55
:local(.autocomplete) {

lib/avatar/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { themr } from 'react-css-themr';
44
import classnames from 'classnames';
5-
import defaultTheme from './theme.scss';
5+
import defaultTheme from './theme.module.scss';
66

77
const Avatar = ({
88
children,
File renamed without changes.

lib/button/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import classnames from 'classnames';
44
import { themr } from 'react-css-themr';
55

66
import '../globals/fonts.scss';
7-
import defaultTheme from './theme.scss';
7+
import defaultTheme from './theme.module.scss';
88

99
class Button extends Component {
1010
render() {
@@ -30,7 +30,7 @@ class Button extends Component {
3030
theme[!iconButton && size], // size will not take effect on ICON ONLY BUTTON type
3131
theme[`icon-${iconAlignment}`],
3232
className,
33-
(flat || bordered || borderless) && 'flat',
33+
(flat || bordered || borderless) && theme.flat,
3434
{
3535
[theme[`${type}Bordered`]]: bordered,
3636
[theme[`${type}Borderless`]]: borderless,
File renamed without changes.

lib/card/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { themr } from 'react-css-themr';
44
import classnames from 'classnames';
5-
import defaultTheme from './theme.scss';
5+
import defaultTheme from './theme.module.scss';
66
import '../globals/fonts.scss';
77

88
class Card extends React.Component {
@@ -129,7 +129,7 @@ class Card extends React.Component {
129129
{ this.renderHeader() }
130130
{ this.renderContent() }
131131
{ this.renderFooter() }
132-
<div className={`expandedContent ${expanded ? 'expanded' : 'collapsed'}`}>
132+
<div className={classnames(theme.expandedContent, theme[`${expanded ? 'expanded' : 'collapsed'}`])}>
133133
{(expandedContent !== null) && <HiddenContent />}
134134
</div>
135135
</div>
File renamed without changes.

lib/carousel/carouselItem.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
44
import cx from 'classnames';
55

66
const CarouselItem = ({ theme, active, imageUrl }) => (
7-
<div className={cx(theme['carousel-item'], 'active', { current: active })}>
7+
<div className={cx(theme['carousel-item'], theme.active, { [theme.current]: active })}>
88
{imageUrl ? <img src={imageUrl} alt="carousel-item" /> : this.props.children}
99
</div>
1010
);

lib/carousel/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { themr } from 'react-css-themr';
44
import cx from 'classnames';
55
import { FaAngleLeft, FaAngleRight } from 'react-icons/fa';
66
import CarouselItem from './carouselItem';
7-
import defaultTheme from './theme.scss';
7+
import defaultTheme from './theme.module.scss';
88
import '../globals/fonts.scss';
99

1010
class Carousel extends React.Component {
@@ -43,7 +43,7 @@ class Carousel extends React.Component {
4343
{/* eslint-disable jsx-a11y/no-static-element-interactions */}
4444
{
4545
controls &&
46-
<FaAngleLeft className={cx(theme['left-control'], 'carousel-left-icon')} onClick={() => this.setActiveItem(active - 1)} />
46+
<FaAngleLeft className={cx(theme['left-control'], theme['carousel-left-icon'])} onClick={() => this.setActiveItem(active - 1)} />
4747
}
4848
{data.map((item, index) => (
4949
<CarouselItem
@@ -60,13 +60,13 @@ class Carousel extends React.Component {
6060
<span
6161
key={`carousel-indicator-${index + 1}`}
6262
onClick={() => this.setActiveItem(index)}
63-
className={cx({ active: active === index })}
63+
className={cx({ [theme.active]: active === index })}
6464
/>
6565
))}
6666
</div>
6767
{
6868
controls &&
69-
<FaAngleRight className={cx(theme['right-control'], 'carousel-right-icon')} onClick={() => this.setActiveItem(active + 1)} />
69+
<FaAngleRight className={cx(theme['right-control'], theme['carousel-right-icon'])} onClick={() => this.setActiveItem(active + 1)} />
7070
}
7171
</div>
7272
);

0 commit comments

Comments
 (0)