diff --git a/components/animations/index.js b/components/animations/index.js index 3ab27eca0..8b082b089 100644 --- a/components/animations/index.js +++ b/components/animations/index.js @@ -1,4 +1,4 @@ -export SlideLeft from './slide-left.scss'; -export SlideRight from './slide-right.scss'; -export ZoomIn from './zoom-in.scss'; -export ZoomOut from './zoom-out.scss'; +export SlideLeft from './slide-left.module.scss'; +export SlideRight from './slide-right.module.scss'; +export ZoomIn from './zoom-in.module.scss'; +export ZoomOut from './zoom-out.module.scss'; diff --git a/components/animations/slide-left.scss b/components/animations/slide-left.module.scss similarity index 100% rename from components/animations/slide-left.scss rename to components/animations/slide-left.module.scss diff --git a/components/animations/slide-right.scss b/components/animations/slide-right.module.scss similarity index 100% rename from components/animations/slide-right.scss rename to components/animations/slide-right.module.scss diff --git a/components/animations/zoom-in.scss b/components/animations/zoom-in.module.scss similarity index 100% rename from components/animations/zoom-in.scss rename to components/animations/zoom-in.module.scss diff --git a/components/animations/zoom-out.scss b/components/animations/zoom-out.module.scss similarity index 100% rename from components/animations/zoom-out.scss rename to components/animations/zoom-out.module.scss diff --git a/components/app_bar/index.js b/components/app_bar/index.js index ff38bf7cc..7c8b29f65 100644 --- a/components/app_bar/index.js +++ b/components/app_bar/index.js @@ -2,7 +2,7 @@ import { themr } from 'react-css-themr'; import { APP_BAR } from '../identifiers.js'; import { appBarFactory } from './AppBar.js'; import { IconButton } from '../button'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const AppBar = appBarFactory(IconButton); const ThemedAppBar = themr(APP_BAR, theme)(AppBar); diff --git a/components/app_bar/theme.scss b/components/app_bar/theme.module.scss similarity index 100% rename from components/app_bar/theme.scss rename to components/app_bar/theme.module.scss diff --git a/components/autocomplete/index.js b/components/autocomplete/index.js index fce2d72dc..178be3458 100644 --- a/components/autocomplete/index.js +++ b/components/autocomplete/index.js @@ -3,7 +3,7 @@ import { themr } from 'react-css-themr'; import { autocompleteFactory } from './Autocomplete.js'; import Chip from '../chip'; import Input from '../input'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Autocomplete = autocompleteFactory(Chip, Input); const ThemedAutocomplete = themr(AUTOCOMPLETE, theme)(Autocomplete); diff --git a/components/autocomplete/theme.scss b/components/autocomplete/theme.module.scss similarity index 100% rename from components/autocomplete/theme.scss rename to components/autocomplete/theme.module.scss diff --git a/components/avatar/index.js b/components/avatar/index.js index 02ada447c..0c5d85a81 100644 --- a/components/avatar/index.js +++ b/components/avatar/index.js @@ -2,7 +2,7 @@ import { AVATAR } from '../identifiers.js'; import { themr } from 'react-css-themr'; import { avatarFactory } from './Avatar.js'; import FontIcon from '../font_icon/FontIcon.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Avatar = avatarFactory(FontIcon); const ThemedAvatar = themr(AVATAR, theme)(Avatar); diff --git a/components/avatar/theme.scss b/components/avatar/theme.module.scss similarity index 100% rename from components/avatar/theme.scss rename to components/avatar/theme.module.scss diff --git a/components/button/__test__/index.spec.js b/components/button/__test__/index.spec.js index 8067bb5dc..366da1a59 100644 --- a/components/button/__test__/index.spec.js +++ b/components/button/__test__/index.spec.js @@ -2,7 +2,7 @@ import expect from 'expect'; import React from 'react'; import ReactDOM from 'react-dom'; import TestUtils from 'react-dom/test-utils'; -import theme from '../theme.scss'; +import theme from '../theme.module.scss'; import Button, { Button as RawButton } from '../Button'; const getRenderedClassName = (tree, Component) => { diff --git a/components/button/index.js b/components/button/index.js index 126272d2e..62e27c3ab 100644 --- a/components/button/index.js +++ b/components/button/index.js @@ -5,7 +5,7 @@ import { browseButtonFactory } from './BrowseButton.js'; import { iconButtonFactory } from './IconButton.js'; import FontIcon from '../font_icon/FontIcon.js'; import themedRippleFactory from '../ripple'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Button = buttonFactory(themedRippleFactory({ centered: false }), FontIcon); const IconButton = iconButtonFactory(themedRippleFactory({centered: true}), FontIcon); diff --git a/components/button/theme.scss b/components/button/theme.module.scss similarity index 100% rename from components/button/theme.scss rename to components/button/theme.module.scss diff --git a/components/card/index.js b/components/card/index.js index ef571e9b5..c40683821 100644 --- a/components/card/index.js +++ b/components/card/index.js @@ -6,7 +6,7 @@ import { CardMedia } from './CardMedia.js'; import { CardText } from './CardText.js'; import { cardTitleFactory } from './CardTitle.js'; import Avatar from '../avatar'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const CardTitle = cardTitleFactory(Avatar); const ThemedCard = themr(CARD, theme)(Card); diff --git a/components/card/theme.scss b/components/card/theme.module.scss similarity index 100% rename from components/card/theme.scss rename to components/card/theme.module.scss diff --git a/components/checkbox/index.js b/components/checkbox/index.js index 5f89939a9..dc4c36af7 100644 --- a/components/checkbox/index.js +++ b/components/checkbox/index.js @@ -3,7 +3,7 @@ import { CHECKBOX } from '../identifiers.js'; import themedRippleFactory from '../ripple'; import { checkboxFactory } from './Checkbox.js'; import checkFactory from './Check.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedCheck = checkFactory(themedRippleFactory({ centered: true, spread: 2.6})); const ThemedCheckbox = themr(CHECKBOX, theme)(checkboxFactory(ThemedCheck)); diff --git a/components/checkbox/theme.scss b/components/checkbox/theme.module.scss similarity index 100% rename from components/checkbox/theme.scss rename to components/checkbox/theme.module.scss diff --git a/components/chip/index.js b/components/chip/index.js index 62dd4d6d2..3be1b386a 100644 --- a/components/chip/index.js +++ b/components/chip/index.js @@ -2,7 +2,7 @@ import { CHIP } from '../identifiers.js'; import { themr } from 'react-css-themr'; import { chipFactory } from './Chip.js'; import Avatar from '../avatar'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Chip = chipFactory(Avatar); const ThemedChip = themr(CHIP, theme)(Chip); diff --git a/components/chip/theme.scss b/components/chip/theme.module.scss similarity index 100% rename from components/chip/theme.scss rename to components/chip/theme.module.scss diff --git a/components/date_picker/__test__/index.spec.js b/components/date_picker/__test__/index.spec.js index d44be7dd3..08bb068cf 100644 --- a/components/date_picker/__test__/index.spec.js +++ b/components/date_picker/__test__/index.spec.js @@ -1,5 +1,5 @@ import expect from 'expect'; -import theme from '../theme.scss'; +import theme from '../theme.module.scss'; import { DatePickerDialog } from '../DatePicker'; import utils from '../../utils/testing'; diff --git a/components/date_picker/index.js b/components/date_picker/index.js index c9242d321..01c6a2274 100644 --- a/components/date_picker/index.js +++ b/components/date_picker/index.js @@ -7,7 +7,7 @@ import calendarFactory from './Calendar.js'; import { IconButton } from '../button'; import Input from '../input'; import Dialog from '../dialog'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Calendar = calendarFactory(IconButton); const DatePickerDialog = datePickerDialogFactory(Dialog, Calendar); diff --git a/components/date_picker/theme.scss b/components/date_picker/theme.module.scss similarity index 100% rename from components/date_picker/theme.scss rename to components/date_picker/theme.module.scss diff --git a/components/dialog/index.js b/components/dialog/index.js index 1236aebb7..7d1e0e095 100644 --- a/components/dialog/index.js +++ b/components/dialog/index.js @@ -3,7 +3,7 @@ import { DIALOG } from '../identifiers.js'; import { dialogFactory } from './Dialog.js'; import Overlay from '../overlay'; import Button from '../button'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Dialog = dialogFactory(Overlay, Button); const ThemedDialog = themr(DIALOG, theme)(Dialog); diff --git a/components/dialog/theme.scss b/components/dialog/theme.module.scss similarity index 100% rename from components/dialog/theme.scss rename to components/dialog/theme.module.scss diff --git a/components/drawer/index.js b/components/drawer/index.js index 8196b783c..628557a71 100644 --- a/components/drawer/index.js +++ b/components/drawer/index.js @@ -2,7 +2,7 @@ import { themr } from 'react-css-themr'; import { DRAWER } from '../identifiers.js'; import { Overlay } from '../overlay'; import { drawerFactory } from './Drawer.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Drawer = drawerFactory(Overlay); const ThemedDrawer = themr(DRAWER, theme)(Drawer); diff --git a/components/drawer/theme.scss b/components/drawer/theme.module.scss similarity index 100% rename from components/drawer/theme.scss rename to components/drawer/theme.module.scss diff --git a/components/dropdown/__test__/index.spec.js b/components/dropdown/__test__/index.spec.js index 538473fb3..e4f75b488 100644 --- a/components/dropdown/__test__/index.spec.js +++ b/components/dropdown/__test__/index.spec.js @@ -6,7 +6,7 @@ import { Simulate } from 'react-dom/test-utils'; import sinon from 'sinon'; -import theme from '../theme.scss'; +import theme from '../theme.module.scss'; import Dropdown from '../Dropdown'; diff --git a/components/dropdown/index.js b/components/dropdown/index.js index 056478aa5..18b783229 100644 --- a/components/dropdown/index.js +++ b/components/dropdown/index.js @@ -2,7 +2,7 @@ import { themr } from 'react-css-themr'; import { DROPDOWN } from '../identifiers.js'; import { dropdownFactory } from './Dropdown.js'; import { Input } from '../input'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Dropdown = dropdownFactory(Input); const ThemedDropdown = themr(DROPDOWN, theme)(Dropdown); diff --git a/components/dropdown/theme.scss b/components/dropdown/theme.module.scss similarity index 100% rename from components/dropdown/theme.scss rename to components/dropdown/theme.module.scss diff --git a/components/input/index.js b/components/input/index.js index 2f4fe1d95..fb880d49e 100644 --- a/components/input/index.js +++ b/components/input/index.js @@ -2,7 +2,7 @@ import { INPUT } from '../identifiers.js'; import { themr } from 'react-css-themr'; import { inputFactory } from './Input.js'; import FontIcon from '../font_icon/FontIcon.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const Input = inputFactory(FontIcon); const ThemedInput = themr(INPUT, theme)(Input); diff --git a/components/input/theme.scss b/components/input/theme.module.scss similarity index 100% rename from components/input/theme.scss rename to components/input/theme.module.scss diff --git a/components/layout/index.js b/components/layout/index.js index d44ec77d3..e0f719341 100644 --- a/components/layout/index.js +++ b/components/layout/index.js @@ -4,7 +4,7 @@ import { Layout } from './Layout.js'; import { Panel } from './Panel.js'; import { NavDrawer } from './NavDrawer.js'; import { Sidebar } from './Sidebar.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedLayout = themr(LAYOUT, theme)(Layout); const ThemedPanel = themr(LAYOUT, theme)(Panel); diff --git a/components/layout/theme.scss b/components/layout/theme.module.scss similarity index 100% rename from components/layout/theme.scss rename to components/layout/theme.module.scss diff --git a/components/link/index.js b/components/link/index.js index 3dcfcf1b5..357d52a16 100644 --- a/components/link/index.js +++ b/components/link/index.js @@ -1,7 +1,7 @@ import { themr } from 'react-css-themr'; import { LINK } from '../identifiers.js'; import { Link } from './Link.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedLink = themr(LINK, theme)(Link); diff --git a/components/link/theme.scss b/components/link/theme.module.scss similarity index 100% rename from components/link/theme.scss rename to components/link/theme.module.scss diff --git a/components/list/index.js b/components/list/index.js index 06edbf81a..0c0020e60 100644 --- a/components/list/index.js +++ b/components/list/index.js @@ -13,7 +13,7 @@ import { listItemActionsFactory } from './ListItemActions.js'; import { listItemContentFactory } from './ListItemContent.js'; import { listItemLayoutFactory } from './ListItemLayout.js'; import themedRippleFactory from '../ripple'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const applyTheme = (Component) => themr(LIST, theme)(Component); const ripple = themedRippleFactory({ centered: false, listItemIgnore: true }); diff --git a/components/list/theme.scss b/components/list/theme.module.scss similarity index 100% rename from components/list/theme.scss rename to components/list/theme.module.scss diff --git a/components/menu/index.js b/components/menu/index.js index e5a52a3cb..27c5b10c3 100644 --- a/components/menu/index.js +++ b/components/menu/index.js @@ -6,7 +6,7 @@ import { menuItemFactory } from './MenuItem.js'; import { menuFactory } from './Menu.js'; import { iconMenuFactory } from './IconMenu.js'; import themedRippleFactory from '../ripple'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const applyTheme = (Component) => themr(MENU, theme)(Component); const ThemedMenuDivider = applyTheme(MenuDivider); diff --git a/components/menu/theme.scss b/components/menu/theme.module.scss similarity index 100% rename from components/menu/theme.scss rename to components/menu/theme.module.scss diff --git a/components/navigation/index.js b/components/navigation/index.js index d02ab54d0..85e908e38 100644 --- a/components/navigation/index.js +++ b/components/navigation/index.js @@ -3,7 +3,7 @@ import { NAVIGATION } from '../identifiers.js'; import { navigationFactory } from './Navigation.js'; import { Button } from '../button'; import { Link } from '../link'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedNavigation = themr(NAVIGATION, theme)(navigationFactory(Button, Link)); export default ThemedNavigation; diff --git a/components/navigation/theme.scss b/components/navigation/theme.module.scss similarity index 100% rename from components/navigation/theme.scss rename to components/navigation/theme.module.scss diff --git a/components/overlay/index.js b/components/overlay/index.js index 818edb280..51225e71a 100644 --- a/components/overlay/index.js +++ b/components/overlay/index.js @@ -1,7 +1,7 @@ import { themr } from 'react-css-themr'; import { OVERLAY } from '../identifiers.js'; import { Overlay } from './Overlay.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedOverlay = themr(OVERLAY, theme)(Overlay); export default ThemedOverlay; diff --git a/components/overlay/theme.scss b/components/overlay/theme.module.scss similarity index 100% rename from components/overlay/theme.scss rename to components/overlay/theme.module.scss diff --git a/components/progress_bar/__test__/index.spec.js b/components/progress_bar/__test__/index.spec.js index 1fa0c5c01..22d7a8fa4 100644 --- a/components/progress_bar/__test__/index.spec.js +++ b/components/progress_bar/__test__/index.spec.js @@ -2,7 +2,7 @@ import React from 'react'; import expect from 'expect'; import TestUtils from 'react-dom/test-utils'; import ProgressBar, { ProgressBar as RawProgressBar } from '../ProgressBar'; -import theme from '../theme.scss'; +import theme from '../theme.module.scss'; import utils from '../../utils/testing'; describe('ProgressBar', function () { diff --git a/components/progress_bar/index.js b/components/progress_bar/index.js index 6c4a36d1d..8fdcefad7 100644 --- a/components/progress_bar/index.js +++ b/components/progress_bar/index.js @@ -1,7 +1,7 @@ import { themr } from 'react-css-themr'; import { PROGRESS_BAR } from '../identifiers.js'; import { ProgressBar } from './ProgressBar.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedProgressBar = themr(PROGRESS_BAR, theme)(ProgressBar); diff --git a/components/progress_bar/theme.scss b/components/progress_bar/theme.module.scss similarity index 100% rename from components/progress_bar/theme.scss rename to components/progress_bar/theme.module.scss diff --git a/components/radio/index.js b/components/radio/index.js index 62167cce4..4db640e63 100644 --- a/components/radio/index.js +++ b/components/radio/index.js @@ -4,7 +4,7 @@ import themedRippleFactory from '../ripple'; import radioFactory from './Radio.js'; import { radioButtonFactory } from './RadioButton.js'; import { radioGroupFactory } from './RadioGroup.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedRadio = radioFactory(themedRippleFactory({ centered: true, spread: 2.6})); const ThemedRadioButton = themr(RADIO, theme)(radioButtonFactory(ThemedRadio)); diff --git a/components/radio/theme.scss b/components/radio/theme.module.scss similarity index 100% rename from components/radio/theme.scss rename to components/radio/theme.module.scss diff --git a/components/ripple/index.js b/components/ripple/index.js index 634eeb545..443bd9e9d 100644 --- a/components/ripple/index.js +++ b/components/ripple/index.js @@ -1,5 +1,5 @@ import rippleFactory from './Ripple.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; export const Ripple = (options) => rippleFactory({ ...options, theme }); export default Ripple; diff --git a/components/ripple/theme.scss b/components/ripple/theme.module.scss similarity index 100% rename from components/ripple/theme.scss rename to components/ripple/theme.module.scss diff --git a/components/slider/__tests__/index.spec.js b/components/slider/__tests__/index.spec.js index cf4d27490..182e909ff 100644 --- a/components/slider/__tests__/index.spec.js +++ b/components/slider/__tests__/index.spec.js @@ -6,7 +6,7 @@ import { ProgressBar } from '../../progress_bar/ProgressBar.js'; import Input, { Input as RawInput } from '../../input/Input.js'; import Slider, { Slider as RawSlider } from '../Slider.js'; import utils from '../../utils/testing'; -import theme from '../theme.scss'; +import theme from '../theme.module.scss'; describe('Slider', function () { let slider, progress, input, onChange; diff --git a/components/slider/index.js b/components/slider/index.js index 629a34570..364aafe9f 100644 --- a/components/slider/index.js +++ b/components/slider/index.js @@ -3,7 +3,7 @@ import { SLIDER } from '../identifiers.js'; import { ProgressBar } from '../progress_bar'; import { Input} from '../input'; import { sliderFactory } from './Slider.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedSlider = themr(SLIDER, theme)(sliderFactory(ProgressBar, Input)); export default ThemedSlider; diff --git a/components/slider/theme.scss b/components/slider/theme.module.scss similarity index 100% rename from components/slider/theme.scss rename to components/slider/theme.module.scss diff --git a/components/snackbar/index.js b/components/snackbar/index.js index 5825088c3..0b4fe28ea 100644 --- a/components/snackbar/index.js +++ b/components/snackbar/index.js @@ -3,7 +3,7 @@ import { SNACKBAR } from '../identifiers.js'; import { snackbarFactory } from './Snackbar.js'; import { Overlay } from '../overlay'; import { Button } from '../button'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const ThemedSnackbar = themr(SNACKBAR, theme)(snackbarFactory(Overlay, Button)); diff --git a/components/snackbar/theme.scss b/components/snackbar/theme.module.scss similarity index 100% rename from components/snackbar/theme.scss rename to components/snackbar/theme.module.scss diff --git a/components/switch/index.js b/components/switch/index.js index 28c3ec386..a104e6513 100644 --- a/components/switch/index.js +++ b/components/switch/index.js @@ -3,7 +3,7 @@ import { switchFactory } from './Switch.js'; import { SWITCH } from '../identifiers.js'; import thumbFactory from './Thumb.js'; import themedRippleFactory from '../ripple'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const applyTheme = (Component) => themr(SWITCH, theme)(Component); const ripple = themedRippleFactory({ centered: true, spread: 2.6 }); diff --git a/components/switch/theme.scss b/components/switch/theme.module.scss similarity index 100% rename from components/switch/theme.scss rename to components/switch/theme.module.scss diff --git a/components/table/index.js b/components/table/index.js index 77e1c7751..099040d45 100644 --- a/components/table/index.js +++ b/components/table/index.js @@ -4,7 +4,7 @@ import { Checkbox } from '../checkbox'; import { tableFactory } from './Table.js'; import tableHeadFactory from './TableHead.js'; import tableRowFactory from './TableRow.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const applyTheme = (Component) => themr(TABLE, theme)(Component); const ThemedTableHead = applyTheme(tableHeadFactory(Checkbox)); diff --git a/components/table/theme.scss b/components/table/theme.module.scss similarity index 100% rename from components/table/theme.scss rename to components/table/theme.module.scss diff --git a/components/tabs/__tests__/index.spec.js b/components/tabs/__tests__/index.spec.js index a67f2cbf7..ba732c04f 100644 --- a/components/tabs/__tests__/index.spec.js +++ b/components/tabs/__tests__/index.spec.js @@ -8,7 +8,7 @@ import ReactDOM from 'react-dom'; import Tabs, { Tabs as RawTabs } from '../Tabs'; import Tab from '../Tab'; import TabContent from '../TabContent'; -import theme from '../theme.scss'; +import theme from '../theme.module.scss'; const getRenderedClassName = (tree, TargetComponent) => { const rendered = ReactTestUtils.findRenderedComponentWithType(tree, TargetComponent); diff --git a/components/tabs/index.js b/components/tabs/index.js index 728020542..44df24abd 100644 --- a/components/tabs/index.js +++ b/components/tabs/index.js @@ -4,7 +4,7 @@ import { tabsFactory } from './Tabs.js'; import { TabContent } from './TabContent.js'; import { Tab } from './Tab.js'; import FontIcon from '../font_icon/FontIcon.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const applyTheme = (Component) => themr(TABS, theme)(Component); const ThemedTabContent = applyTheme(TabContent); diff --git a/components/tabs/theme.scss b/components/tabs/theme.module.scss similarity index 100% rename from components/tabs/theme.scss rename to components/tabs/theme.module.scss diff --git a/components/time_picker/index.js b/components/time_picker/index.js index c9ec8b8f7..8a5051c71 100644 --- a/components/time_picker/index.js +++ b/components/time_picker/index.js @@ -4,7 +4,7 @@ import { timePickerFactory } from './TimePicker.js'; import timePickerDialogFactory from './TimePickerDialog.js'; import Dialog from '../dialog'; import Input from '../input'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const TimePickerDialog = timePickerDialogFactory(Dialog); const ThemedTimePicker = themr(TIME_PICKER, theme)(timePickerFactory(TimePickerDialog, Input)); diff --git a/components/time_picker/theme.scss b/components/time_picker/theme.module.scss similarity index 100% rename from components/time_picker/theme.scss rename to components/time_picker/theme.module.scss diff --git a/components/tooltip/index.js b/components/tooltip/index.js index 9612facdd..e93cda786 100644 --- a/components/tooltip/index.js +++ b/components/tooltip/index.js @@ -1,5 +1,5 @@ import tooltipFactory from './Tooltip.js'; -import theme from './theme.scss'; +import theme from './theme.module.scss'; const themedTooltipFactory = (options) => tooltipFactory({ ...options, theme }); export default tooltipFactory({ theme }); diff --git a/components/tooltip/theme.scss b/components/tooltip/theme.module.scss similarity index 100% rename from components/tooltip/theme.scss rename to components/tooltip/theme.module.scss diff --git a/docs/app/components/layout/main/components/navigation.js b/docs/app/components/layout/main/components/navigation.js index c9611ab07..f2ed86d05 100644 --- a/docs/app/components/layout/main/components/navigation.js +++ b/docs/app/components/layout/main/components/navigation.js @@ -4,7 +4,7 @@ import { List, ListItem } from 'react-toolbox'; import classnames from 'classnames'; import Carbon from '../../../Carbon'; import components from '../modules/components'; -import style from './navigation.scss'; +import style from './navigation.module.scss'; const MainNavigation = ({ className }, { router }) => { const drawerItems = Object.keys(components).map((key) => { diff --git a/docs/app/components/layout/main/components/playground.js b/docs/app/components/layout/main/components/playground.js index 627cdda9e..09a7a7bb3 100644 --- a/docs/app/components/layout/main/components/playground.js +++ b/docs/app/components/layout/main/components/playground.js @@ -3,7 +3,7 @@ import React from 'react'; import Editor from '../../../editor'; import Preview from '../../../preview'; import codeText from '../modules/examples/example.txt'; -import style from './playground.scss'; +import style from './playground.module.scss'; class Playground extends React.Component { static propTypes = { diff --git a/docs/app/components/layout/main/index.js b/docs/app/components/layout/main/index.js index 206116e9a..ccb025c14 100644 --- a/docs/app/components/layout/main/index.js +++ b/docs/app/components/layout/main/index.js @@ -8,7 +8,7 @@ import Playground from './components/playground.js'; import MainNavigation from './components/navigation.js'; import BaseDocs from './modules/components.md'; import components from './modules/components.js'; -import buttonTheme from './button-theme.scss'; +import buttonTheme from './button-theme.module.scss'; import style from './style'; const LoadExampleButton = (props) => ( diff --git a/docs/app/theme/theme.js b/docs/app/theme/theme.js index 68c3ea1c6..fc607677e 100644 --- a/docs/app/theme/theme.js +++ b/docs/app/theme/theme.js @@ -1,33 +1,33 @@ import 'react-toolbox/commons'; -import ToolboxAppBar from 'react-toolbox/app_bar/theme.scss'; -import ToolboxAutocomplete from 'react-toolbox/autocomplete/theme.scss'; -import ToolboxAvatar from 'react-toolbox/avatar/theme.scss'; -import ToolboxButton from 'react-toolbox/button/theme.scss'; -import ToolboxCard from 'react-toolbox/card/theme.scss'; -import ToolboxCheckbox from 'react-toolbox/checkbox/theme.scss'; -import ToolboxChip from 'react-toolbox/chip/theme.scss'; -import ToolboxDatePicker from 'react-toolbox/date_picker/theme.scss'; -import ToolboxDialog from 'react-toolbox/dialog/theme.scss'; -import ToolboxDrawer from 'react-toolbox/drawer/theme.scss'; -import ToolboxDropdown from 'react-toolbox/dropdown/theme.scss'; -import ToolboxInput from 'react-toolbox/input/theme.scss'; -import ToolboxLayout from 'react-toolbox/layout/theme.scss'; -import ToolboxLink from 'react-toolbox/link/theme.scss'; -import ToolboxList from 'react-toolbox/list/theme.scss'; -import ToolboxMenu from 'react-toolbox/menu/theme.scss'; -import ToolboxNavigation from 'react-toolbox/navigation/theme.scss'; -import ToolboxOverlay from 'react-toolbox/overlay/theme.scss'; -import ToolboxProgress from 'react-toolbox/progress_bar/theme.scss'; -import ToolboxRadio from 'react-toolbox/radio/theme.scss'; -import ToolboxRipple from 'react-toolbox/ripple/theme.scss'; -import ToolboxSlider from 'react-toolbox/slider/theme.scss'; -import ToolboxSnackbar from 'react-toolbox/snackbar/theme.scss'; -import ToolboxSwitch from 'react-toolbox/switch/theme.scss'; -import ToolboxTable from 'react-toolbox/table/theme.scss'; -import ToolboxTabs from 'react-toolbox/tabs/theme.scss'; -import ToolboxTimePicker from 'react-toolbox/time_picker/theme.scss'; -import ToolboxTooltip from 'react-toolbox/tooltip/theme.scss'; +import ToolboxAppBar from 'react-toolbox/app_bar/theme.module.scss'; +import ToolboxAutocomplete from 'react-toolbox/autocomplete/theme.module.scss'; +import ToolboxAvatar from 'react-toolbox/avatar/theme.module.scss'; +import ToolboxButton from 'react-toolbox/button/theme.module.scss'; +import ToolboxCard from 'react-toolbox/card/theme.module.scss'; +import ToolboxCheckbox from 'react-toolbox/checkbox/theme.module.scss'; +import ToolboxChip from 'react-toolbox/chip/theme.module.scss'; +import ToolboxDatePicker from 'react-toolbox/date_picker/theme.module.scss'; +import ToolboxDialog from 'react-toolbox/dialog/theme.module.scss'; +import ToolboxDrawer from 'react-toolbox/drawer/theme.module.scss'; +import ToolboxDropdown from 'react-toolbox/dropdown/theme.module.scss'; +import ToolboxInput from 'react-toolbox/input/theme.module.scss'; +import ToolboxLayout from 'react-toolbox/layout/theme.module.scss'; +import ToolboxLink from 'react-toolbox/link/theme.module.scss'; +import ToolboxList from 'react-toolbox/list/theme.module.scss'; +import ToolboxMenu from 'react-toolbox/menu/theme.module.scss'; +import ToolboxNavigation from 'react-toolbox/navigation/theme.module.scss'; +import ToolboxOverlay from 'react-toolbox/overlay/theme.module.scss'; +import ToolboxProgress from 'react-toolbox/progress_bar/theme.module.scss'; +import ToolboxRadio from 'react-toolbox/radio/theme.module.scss'; +import ToolboxRipple from 'react-toolbox/ripple/theme.module.scss'; +import ToolboxSlider from 'react-toolbox/slider/theme.module.scss'; +import ToolboxSnackbar from 'react-toolbox/snackbar/theme.module.scss'; +import ToolboxSwitch from 'react-toolbox/switch/theme.module.scss'; +import ToolboxTable from 'react-toolbox/table/theme.module.scss'; +import ToolboxTabs from 'react-toolbox/tabs/theme.module.scss'; +import ToolboxTimePicker from 'react-toolbox/time_picker/theme.module.scss'; +import ToolboxTooltip from 'react-toolbox/tooltip/theme.module.scss'; export default { ToolboxAppBar, diff --git a/package.json b/package.json index db3484377..5dca42b94 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "@bionikspoon/react-toolbox", + "name": "react-toolbox", "description": "A set of React components implementing Google's Material Design specification with the power of CSS Modules.", "homepage": "http://www.react-toolbox.io/", - "version": "3.0.1", + "version": "3.0.3-mohiohio", "main": "./lib", "author": { "name": "React Toolbox Team", @@ -98,9 +98,6 @@ "webpack-dev-middleware": "^1.9.0", "webpack-hot-middleware": "^2.13.0" }, - "engines": { - "yarn": "1.13.x" - }, "files": [ "*" ],