diff --git a/.bumpedrc b/.bumpedrc index 023de648..895c2157 100644 --- a/.bumpedrc +++ b/.bumpedrc @@ -3,9 +3,7 @@ files: [ ] plugins: - prerelease: - 'Linting config files': plugin: 'bumped-finepack' @@ -18,7 +16,6 @@ plugins: command: 'npm run prepublish' postrelease: - 'Commiting new version': plugin: 'bumped-terminal' command: 'git add package.json && git commit package.json -m "$newVersion release" && git push origin master' diff --git a/components/_globals.scss b/components/_globals.scss index 24d9906b..19188108 100644 --- a/components/_globals.scss +++ b/components/_globals.scss @@ -54,30 +54,28 @@ $z-index-normal: 1 !default; $z-index-low: -100 !default; $z-index-lower: -200 !default; - //-- Breakpoints // height of app bar // https://www.google.com/design/spec/layout/metrics-keylines.html#metrics-keylines-keylines-spacing -$standard-increment-mobile: (5.6 * $unit) !default; -$standard-increment-desktop: (6.4 * $unit) !default; +$standard-increment-mobile: (5.6 * $unit) !default; +$standard-increment-desktop: (6.4 * $unit) !default; // https://www.google.com/design/spec/layout/metrics-keylines.html#metrics-keylines-baseline-grids -$baseline-grid: (0.8 * $unit) !default; -$layout-gutter-width-sm: ($baseline-grid * 2) !default; -$layout-gutter-width: ($baseline-grid * 3) !default; - +$baseline-grid: (0.8 * $unit) !default; +$layout-gutter-width-sm: ($baseline-grid * 2) !default; +$layout-gutter-width: ($baseline-grid * 3) !default; // https://www.google.com/design/spec/layout/responsive-ui.html#responsive-ui-breakpoints // 4 columns -$layout-breakpoint-xxs: 480px !default; +$layout-breakpoint-xxs: 480px !default; // 8 columns -$layout-breakpoint-xs: 600px !default; +$layout-breakpoint-xs: 600px !default; // 12 columns -$layout-breakpoint-sm-tablet: 720px !default; -$layout-breakpoint-sm: 840px !default; -$layout-breakpoint-md: 960px !default; -$layout-breakpoint-lg-tablet: 1024px !default; -$layout-breakpoint-lg: 1280px !default; -$layout-breakpoint-xl: 1440px !default; -$layout-breakpoint-xxl: 1600px !default; -$layout-breakpoint-xxxl: 1920px !default; +$layout-breakpoint-sm-tablet: 720px !default; +$layout-breakpoint-sm: 840px !default; +$layout-breakpoint-md: 960px !default; +$layout-breakpoint-lg-tablet: 1024px !default; +$layout-breakpoint-lg: 1280px !default; +$layout-breakpoint-xl: 1440px !default; +$layout-breakpoint-xxl: 1600px !default; +$layout-breakpoint-xxxl: 1920px !default; diff --git a/components/app_bar/AppBar.jsx b/components/app_bar/AppBar.js similarity index 100% rename from components/app_bar/AppBar.jsx rename to components/app_bar/AppBar.js diff --git a/components/app_bar/style.scss b/components/app_bar/style.scss index 6b17471a..762232af 100644 --- a/components/app_bar/style.scss +++ b/components/app_bar/style.scss @@ -19,7 +19,7 @@ top: 0; right: 0; left: 0; - z-index: $z-index-high; + z-index: $z-index-highest; } a { diff --git a/components/autocomplete/Autocomplete.jsx b/components/autocomplete/Autocomplete.js similarity index 100% rename from components/autocomplete/Autocomplete.jsx rename to components/autocomplete/Autocomplete.js diff --git a/components/avatar/Avatar.jsx b/components/avatar/Avatar.js similarity index 100% rename from components/avatar/Avatar.jsx rename to components/avatar/Avatar.js diff --git a/components/button/Button.jsx b/components/button/Button.js similarity index 100% rename from components/button/Button.jsx rename to components/button/Button.js diff --git a/components/button/IconButton.jsx b/components/button/IconButton.js similarity index 100% rename from components/button/IconButton.jsx rename to components/button/IconButton.js diff --git a/components/button/__test__/index.spec.jsx b/components/button/__test__/index.spec.js similarity index 100% rename from components/button/__test__/index.spec.jsx rename to components/button/__test__/index.spec.js diff --git a/components/card/Card.jsx b/components/card/Card.js similarity index 100% rename from components/card/Card.jsx rename to components/card/Card.js diff --git a/components/card/CardActions.jsx b/components/card/CardActions.js similarity index 100% rename from components/card/CardActions.jsx rename to components/card/CardActions.js diff --git a/components/card/CardMedia.jsx b/components/card/CardMedia.js similarity index 100% rename from components/card/CardMedia.jsx rename to components/card/CardMedia.js diff --git a/components/card/CardText.jsx b/components/card/CardText.js similarity index 100% rename from components/card/CardText.jsx rename to components/card/CardText.js diff --git a/components/card/CardTitle.jsx b/components/card/CardTitle.js similarity index 100% rename from components/card/CardTitle.jsx rename to components/card/CardTitle.js diff --git a/components/checkbox/Check.jsx b/components/checkbox/Check.js similarity index 100% rename from components/checkbox/Check.jsx rename to components/checkbox/Check.js diff --git a/components/checkbox/Checkbox.jsx b/components/checkbox/Checkbox.js similarity index 100% rename from components/checkbox/Checkbox.jsx rename to components/checkbox/Checkbox.js diff --git a/components/chip/Chip.jsx b/components/chip/Chip.js similarity index 100% rename from components/chip/Chip.jsx rename to components/chip/Chip.js diff --git a/components/date_picker/Calendar.jsx b/components/date_picker/Calendar.js similarity index 100% rename from components/date_picker/Calendar.jsx rename to components/date_picker/Calendar.js diff --git a/components/date_picker/CalendarDay.jsx b/components/date_picker/CalendarDay.js similarity index 100% rename from components/date_picker/CalendarDay.jsx rename to components/date_picker/CalendarDay.js diff --git a/components/date_picker/CalendarMonth.jsx b/components/date_picker/CalendarMonth.js similarity index 100% rename from components/date_picker/CalendarMonth.jsx rename to components/date_picker/CalendarMonth.js diff --git a/components/date_picker/DatePicker.jsx b/components/date_picker/DatePicker.js similarity index 100% rename from components/date_picker/DatePicker.jsx rename to components/date_picker/DatePicker.js diff --git a/components/date_picker/DatePickerDialog.jsx b/components/date_picker/DatePickerDialog.js similarity index 100% rename from components/date_picker/DatePickerDialog.jsx rename to components/date_picker/DatePickerDialog.js diff --git a/components/dialog/Dialog.jsx b/components/dialog/Dialog.js similarity index 100% rename from components/dialog/Dialog.jsx rename to components/dialog/Dialog.js diff --git a/components/drawer/Drawer.jsx b/components/drawer/Drawer.js similarity index 100% rename from components/drawer/Drawer.jsx rename to components/drawer/Drawer.js diff --git a/components/dropdown/Dropdown.jsx b/components/dropdown/Dropdown.js similarity index 100% rename from components/dropdown/Dropdown.jsx rename to components/dropdown/Dropdown.js diff --git a/components/font_icon/FontIcon.jsx b/components/font_icon/FontIcon.js similarity index 100% rename from components/font_icon/FontIcon.jsx rename to components/font_icon/FontIcon.js diff --git a/components/form/Form.jsx b/components/form/Form.js similarity index 100% rename from components/form/Form.jsx rename to components/form/Form.js diff --git a/components/input/Input.jsx b/components/input/Input.js similarity index 100% rename from components/input/Input.jsx rename to components/input/Input.js diff --git a/components/layout/Layout.jsx b/components/layout/Layout.js similarity index 100% rename from components/layout/Layout.jsx rename to components/layout/Layout.js diff --git a/components/layout/NavDrawer.jsx b/components/layout/NavDrawer.js similarity index 100% rename from components/layout/NavDrawer.jsx rename to components/layout/NavDrawer.js diff --git a/components/layout/Panel.jsx b/components/layout/Panel.js similarity index 100% rename from components/layout/Panel.jsx rename to components/layout/Panel.js diff --git a/components/layout/Sidebar.jsx b/components/layout/Sidebar.js similarity index 100% rename from components/layout/Sidebar.jsx rename to components/layout/Sidebar.js diff --git a/components/link/Link.jsx b/components/link/Link.js similarity index 100% rename from components/link/Link.jsx rename to components/link/Link.js diff --git a/components/list/List.jsx b/components/list/List.js similarity index 100% rename from components/list/List.jsx rename to components/list/List.js diff --git a/components/list/ListCheckbox.jsx b/components/list/ListCheckbox.js similarity index 100% rename from components/list/ListCheckbox.jsx rename to components/list/ListCheckbox.js diff --git a/components/list/ListDivider.jsx b/components/list/ListDivider.js similarity index 100% rename from components/list/ListDivider.jsx rename to components/list/ListDivider.js diff --git a/components/list/ListItem.jsx b/components/list/ListItem.js similarity index 100% rename from components/list/ListItem.jsx rename to components/list/ListItem.js diff --git a/components/list/ListItemAction.jsx b/components/list/ListItemAction.js similarity index 100% rename from components/list/ListItemAction.jsx rename to components/list/ListItemAction.js diff --git a/components/list/ListItemActions.jsx b/components/list/ListItemActions.js similarity index 100% rename from components/list/ListItemActions.jsx rename to components/list/ListItemActions.js diff --git a/components/list/ListItemContent.jsx b/components/list/ListItemContent.js similarity index 100% rename from components/list/ListItemContent.jsx rename to components/list/ListItemContent.js diff --git a/components/list/ListItemLayout.jsx b/components/list/ListItemLayout.js similarity index 100% rename from components/list/ListItemLayout.jsx rename to components/list/ListItemLayout.js diff --git a/components/list/ListItemText.jsx b/components/list/ListItemText.js similarity index 100% rename from components/list/ListItemText.jsx rename to components/list/ListItemText.js diff --git a/components/list/ListSubHeader.jsx b/components/list/ListSubHeader.js similarity index 100% rename from components/list/ListSubHeader.jsx rename to components/list/ListSubHeader.js diff --git a/components/menu/IconMenu.jsx b/components/menu/IconMenu.js similarity index 100% rename from components/menu/IconMenu.jsx rename to components/menu/IconMenu.js diff --git a/components/menu/Menu.jsx b/components/menu/Menu.js similarity index 100% rename from components/menu/Menu.jsx rename to components/menu/Menu.js diff --git a/components/menu/MenuDivider.jsx b/components/menu/MenuDivider.js similarity index 100% rename from components/menu/MenuDivider.jsx rename to components/menu/MenuDivider.js diff --git a/components/menu/MenuItem.jsx b/components/menu/MenuItem.js similarity index 100% rename from components/menu/MenuItem.jsx rename to components/menu/MenuItem.js diff --git a/components/navigation/Navigation.jsx b/components/navigation/Navigation.js similarity index 100% rename from components/navigation/Navigation.jsx rename to components/navigation/Navigation.js diff --git a/components/overlay/Overlay.jsx b/components/overlay/Overlay.js similarity index 100% rename from components/overlay/Overlay.jsx rename to components/overlay/Overlay.js diff --git a/components/progress_bar/ProgressBar.jsx b/components/progress_bar/ProgressBar.js similarity index 100% rename from components/progress_bar/ProgressBar.jsx rename to components/progress_bar/ProgressBar.js diff --git a/components/progress_bar/__test__/index.spec.jsx b/components/progress_bar/__test__/index.spec.js similarity index 100% rename from components/progress_bar/__test__/index.spec.jsx rename to components/progress_bar/__test__/index.spec.js diff --git a/components/radio/Radio.jsx b/components/radio/Radio.js similarity index 100% rename from components/radio/Radio.jsx rename to components/radio/Radio.js diff --git a/components/radio/RadioButton.jsx b/components/radio/RadioButton.js similarity index 100% rename from components/radio/RadioButton.jsx rename to components/radio/RadioButton.js diff --git a/components/radio/RadioGroup.jsx b/components/radio/RadioGroup.js similarity index 100% rename from components/radio/RadioGroup.jsx rename to components/radio/RadioGroup.js diff --git a/components/ripple/Ripple.jsx b/components/ripple/Ripple.js similarity index 100% rename from components/ripple/Ripple.jsx rename to components/ripple/Ripple.js diff --git a/components/slider/Slider.jsx b/components/slider/Slider.js similarity index 100% rename from components/slider/Slider.jsx rename to components/slider/Slider.js diff --git a/components/slider/__tests__/index.spec.jsx b/components/slider/__tests__/index.spec.js similarity index 100% rename from components/slider/__tests__/index.spec.jsx rename to components/slider/__tests__/index.spec.js diff --git a/components/snackbar/Snackbar.jsx b/components/snackbar/Snackbar.js similarity index 100% rename from components/snackbar/Snackbar.jsx rename to components/snackbar/Snackbar.js diff --git a/components/switch/Switch.jsx b/components/switch/Switch.js similarity index 100% rename from components/switch/Switch.jsx rename to components/switch/Switch.js diff --git a/components/switch/Thumb.jsx b/components/switch/Thumb.js similarity index 100% rename from components/switch/Thumb.jsx rename to components/switch/Thumb.js diff --git a/components/table/Table.jsx b/components/table/Table.js similarity index 100% rename from components/table/Table.jsx rename to components/table/Table.js diff --git a/components/table/TableHead.jsx b/components/table/TableHead.js similarity index 100% rename from components/table/TableHead.jsx rename to components/table/TableHead.js diff --git a/components/table/TableRow.jsx b/components/table/TableRow.js similarity index 100% rename from components/table/TableRow.jsx rename to components/table/TableRow.js diff --git a/components/tabs/Tab.jsx b/components/tabs/Tab.js similarity index 100% rename from components/tabs/Tab.jsx rename to components/tabs/Tab.js diff --git a/components/tabs/TabContent.jsx b/components/tabs/TabContent.js similarity index 100% rename from components/tabs/TabContent.jsx rename to components/tabs/TabContent.js diff --git a/components/tabs/Tabs.jsx b/components/tabs/Tabs.js similarity index 100% rename from components/tabs/Tabs.jsx rename to components/tabs/Tabs.js diff --git a/components/tabs/__tests__/index.spec.jsx b/components/tabs/__tests__/index.spec.js similarity index 100% rename from components/tabs/__tests__/index.spec.jsx rename to components/tabs/__tests__/index.spec.js diff --git a/components/time_picker/Clock.jsx b/components/time_picker/Clock.js similarity index 100% rename from components/time_picker/Clock.jsx rename to components/time_picker/Clock.js diff --git a/components/time_picker/ClockFace.jsx b/components/time_picker/ClockFace.js similarity index 100% rename from components/time_picker/ClockFace.jsx rename to components/time_picker/ClockFace.js diff --git a/components/time_picker/ClockHand.jsx b/components/time_picker/ClockHand.js similarity index 100% rename from components/time_picker/ClockHand.jsx rename to components/time_picker/ClockHand.js diff --git a/components/time_picker/ClockHours.jsx b/components/time_picker/ClockHours.js similarity index 100% rename from components/time_picker/ClockHours.jsx rename to components/time_picker/ClockHours.js diff --git a/components/time_picker/ClockMinutes.jsx b/components/time_picker/ClockMinutes.js similarity index 100% rename from components/time_picker/ClockMinutes.jsx rename to components/time_picker/ClockMinutes.js diff --git a/components/time_picker/TimePicker.jsx b/components/time_picker/TimePicker.js similarity index 100% rename from components/time_picker/TimePicker.jsx rename to components/time_picker/TimePicker.js diff --git a/components/time_picker/TimePickerDialog.jsx b/components/time_picker/TimePickerDialog.js similarity index 100% rename from components/time_picker/TimePickerDialog.jsx rename to components/time_picker/TimePickerDialog.js diff --git a/components/tooltip/Tooltip.jsx b/components/tooltip/Tooltip.js similarity index 100% rename from components/tooltip/Tooltip.jsx rename to components/tooltip/Tooltip.js diff --git a/docs/app/components/appbar/index.jsx b/docs/app/components/appbar/index.js similarity index 100% rename from docs/app/components/appbar/index.jsx rename to docs/app/components/appbar/index.js diff --git a/docs/app/components/editor/index.jsx b/docs/app/components/editor/index.js similarity index 100% rename from docs/app/components/editor/index.jsx rename to docs/app/components/editor/index.js diff --git a/docs/app/components/layout/home/index.jsx b/docs/app/components/layout/home/index.js similarity index 100% rename from docs/app/components/layout/home/index.jsx rename to docs/app/components/layout/home/index.js diff --git a/docs/app/components/layout/install/index.jsx b/docs/app/components/layout/install/index.js similarity index 100% rename from docs/app/components/layout/install/index.jsx rename to docs/app/components/layout/install/index.js diff --git a/docs/app/components/layout/main/components/navigation.jsx b/docs/app/components/layout/main/components/navigation.js similarity index 100% rename from docs/app/components/layout/main/components/navigation.jsx rename to docs/app/components/layout/main/components/navigation.js diff --git a/docs/app/components/layout/main/components/playground.jsx b/docs/app/components/layout/main/components/playground.js similarity index 100% rename from docs/app/components/layout/main/components/playground.jsx rename to docs/app/components/layout/main/components/playground.js diff --git a/docs/app/components/layout/main/index.jsx b/docs/app/components/layout/main/index.js similarity index 95% rename from docs/app/components/layout/main/index.jsx rename to docs/app/components/layout/main/index.js index 66d9b2fb..7f81cdf1 100644 --- a/docs/app/components/layout/main/index.jsx +++ b/docs/app/components/layout/main/index.js @@ -3,8 +3,8 @@ import ReactDOM from 'react-dom'; import { Button } from 'react-toolbox'; import Appbar from '../../../components/appbar'; import Markdown from '../../../components/markdown'; -import Playground from './components/playground'; -import MainNavigation from './components/navigation'; +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 style from './style'; diff --git a/docs/app/components/layout/main/style.scss b/docs/app/components/layout/main/style.scss index c8506d43..764d0e50 100644 --- a/docs/app/components/layout/main/style.scss +++ b/docs/app/components/layout/main/style.scss @@ -15,7 +15,7 @@ hr { position: fixed; top: $appbar-height - ($button-floating-height / 2); right: $button-floating-height / 2; - z-index: $z-index-higher; + z-index: $z-index-highest; } .documentation { diff --git a/docs/app/components/logo/index.jsx b/docs/app/components/logo/index.js similarity index 100% rename from docs/app/components/logo/index.jsx rename to docs/app/components/logo/index.js diff --git a/docs/app/components/markdown/index.jsx b/docs/app/components/markdown/index.js similarity index 100% rename from docs/app/components/markdown/index.jsx rename to docs/app/components/markdown/index.js diff --git a/docs/app/components/navigation/index.jsx b/docs/app/components/navigation/index.js similarity index 100% rename from docs/app/components/navigation/index.jsx rename to docs/app/components/navigation/index.js diff --git a/docs/app/components/preview/index.jsx b/docs/app/components/preview/index.js similarity index 100% rename from docs/app/components/preview/index.jsx rename to docs/app/components/preview/index.js diff --git a/docs/app/index.jsx b/docs/app/index.js similarity index 100% rename from docs/app/index.jsx rename to docs/app/index.js diff --git a/docs/webpack.config.development.js b/docs/webpack.config.development.js index b9d72831..906bf0bc 100644 --- a/docs/webpack.config.development.js +++ b/docs/webpack.config.development.js @@ -9,7 +9,7 @@ module.exports = { devtool: 'inline-source-map', entry: [ 'webpack-hot-middleware/client', - './app/index.jsx' + './app/index.js' ], output: { path: path.join(__dirname, 'build'), @@ -17,7 +17,7 @@ module.exports = { publicPath: '/' }, resolve: { - extensions: ['', '.jsx', '.scss', '.js', '.json', '.md'], + extensions: ['', '.scss', '.js', '.json', '.md'], packageMains: ['browser', 'web', 'browserify', 'main', 'style'], alias: { 'react-toolbox': path.resolve(__dirname + './../components') @@ -32,7 +32,7 @@ module.exports = { module: { loaders: [ { - test: /\.(js|jsx)$/, + test: /\.js$/, exclude: /(node_modules)/, loader: 'babel' }, { diff --git a/docs/webpack.config.production.js b/docs/webpack.config.production.js index 0253d450..5f0442c3 100644 --- a/docs/webpack.config.production.js +++ b/docs/webpack.config.production.js @@ -7,13 +7,13 @@ const TransferWebpackPlugin = require('transfer-webpack-plugin'); module.exports = { context: __dirname, - entry: ['./app/index.jsx'], + entry: ['./app/index.js'], output: { path: path.join(__dirname, 'build'), filename: 'docs.js' }, resolve: { - extensions: ['', '.jsx', '.scss', '.js', '.json', '.md'], + extensions: ['', '.scss', '.js', '.json', '.md'], packageMains: ['browser', 'web', 'browserify', 'main', 'style'], alias: { 'react-toolbox': path.resolve(__dirname + './../components') @@ -28,7 +28,7 @@ module.exports = { module: { loaders: [ { - test: /\.(js|jsx)$/, + test: /\.js$/, exclude: /(node_modules)/, loader: 'babel' }, { diff --git a/package.json b/package.json index c1040738..d5327912 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "build": "cross-env NODE_ENV=production npm run babel && npm run sass", "clean": "rimraf ./lib", "lint": "npm run lint:js && npm run lint:scss", - "lint:js": "eslint ./ --ext .js,.jsx", + "lint:js": "eslint ./ --ext .js", "lint:scss": "sass-lint ./components/**/*.scss -v -i ./components/slider/style.scss", "patch": "bumped release patch", "prebuild": "npm run clean", diff --git a/spec/components/autocomplete.jsx b/spec/components/autocomplete.js similarity index 100% rename from spec/components/autocomplete.jsx rename to spec/components/autocomplete.js diff --git a/spec/components/avatar.jsx b/spec/components/avatar.js similarity index 100% rename from spec/components/avatar.jsx rename to spec/components/avatar.js diff --git a/spec/components/button.jsx b/spec/components/button.js similarity index 100% rename from spec/components/button.jsx rename to spec/components/button.js diff --git a/spec/components/card.jsx b/spec/components/card.js similarity index 100% rename from spec/components/card.jsx rename to spec/components/card.js diff --git a/spec/components/checkbox.jsx b/spec/components/checkbox.js similarity index 100% rename from spec/components/checkbox.jsx rename to spec/components/checkbox.js diff --git a/spec/components/chip.jsx b/spec/components/chip.js similarity index 100% rename from spec/components/chip.jsx rename to spec/components/chip.js diff --git a/spec/components/dialog.jsx b/spec/components/dialog.js similarity index 100% rename from spec/components/dialog.jsx rename to spec/components/dialog.js diff --git a/spec/components/drawer.jsx b/spec/components/drawer.js similarity index 100% rename from spec/components/drawer.jsx rename to spec/components/drawer.js diff --git a/spec/components/dropdown.jsx b/spec/components/dropdown.js similarity index 100% rename from spec/components/dropdown.jsx rename to spec/components/dropdown.js diff --git a/spec/components/font_icon.jsx b/spec/components/font_icon.js similarity index 100% rename from spec/components/font_icon.jsx rename to spec/components/font_icon.js diff --git a/spec/components/form.jsx b/spec/components/form.js similarity index 100% rename from spec/components/form.jsx rename to spec/components/form.js diff --git a/spec/components/github_icon.jsx b/spec/components/github_icon.js similarity index 100% rename from spec/components/github_icon.jsx rename to spec/components/github_icon.js diff --git a/spec/components/icon_menu.jsx b/spec/components/icon_menu.js similarity index 100% rename from spec/components/icon_menu.jsx rename to spec/components/icon_menu.js diff --git a/spec/components/input.jsx b/spec/components/input.js similarity index 100% rename from spec/components/input.jsx rename to spec/components/input.js diff --git a/spec/components/layout.jsx b/spec/components/layout.js similarity index 100% rename from spec/components/layout.jsx rename to spec/components/layout.js diff --git a/spec/components/link.jsx b/spec/components/link.js similarity index 100% rename from spec/components/link.jsx rename to spec/components/link.js diff --git a/spec/components/list.jsx b/spec/components/list.js similarity index 100% rename from spec/components/list.jsx rename to spec/components/list.js diff --git a/spec/components/menu.jsx b/spec/components/menu.js similarity index 100% rename from spec/components/menu.jsx rename to spec/components/menu.js diff --git a/spec/components/navigation.jsx b/spec/components/navigation.js similarity index 100% rename from spec/components/navigation.jsx rename to spec/components/navigation.js diff --git a/spec/components/pickers.jsx b/spec/components/pickers.js similarity index 100% rename from spec/components/pickers.jsx rename to spec/components/pickers.js diff --git a/spec/components/progress.jsx b/spec/components/progress.js similarity index 100% rename from spec/components/progress.jsx rename to spec/components/progress.js diff --git a/spec/components/radio.jsx b/spec/components/radio.js similarity index 100% rename from spec/components/radio.jsx rename to spec/components/radio.js diff --git a/spec/components/slider.jsx b/spec/components/slider.js similarity index 100% rename from spec/components/slider.jsx rename to spec/components/slider.js diff --git a/spec/components/snackbar.jsx b/spec/components/snackbar.js similarity index 100% rename from spec/components/snackbar.jsx rename to spec/components/snackbar.js diff --git a/spec/components/switch.jsx b/spec/components/switch.js similarity index 100% rename from spec/components/switch.jsx rename to spec/components/switch.js diff --git a/spec/components/table.jsx b/spec/components/table.js similarity index 100% rename from spec/components/table.jsx rename to spec/components/table.js diff --git a/spec/components/tabs.jsx b/spec/components/tabs.js similarity index 100% rename from spec/components/tabs.jsx rename to spec/components/tabs.js diff --git a/spec/components/tooltip.jsx b/spec/components/tooltip.js similarity index 100% rename from spec/components/tooltip.jsx rename to spec/components/tooltip.js diff --git a/spec/index.jsx b/spec/index.js similarity index 100% rename from spec/index.jsx rename to spec/index.js diff --git a/spec/root.jsx b/spec/root.js similarity index 100% rename from spec/root.jsx rename to spec/root.js diff --git a/spec/style.scss b/spec/style.scss index 558ee650..6f77fc9f 100644 --- a/spec/style.scss +++ b/spec/style.scss @@ -23,7 +23,7 @@ $offset: 1.8 * $unit; margin: ($offset / 4) 0; opacity: .6; } - [data-react-toolbox='card'] { + [data-react-toolbox="card"] { display: inline-block; margin: $offset $offset 0 0; } @@ -38,6 +38,7 @@ $offset: 1.8 * $unit; } .appbar { + z-index: 999999 !important; display: flex; > h1 { flex-grow: 1; diff --git a/tests.webpack.js b/tests.webpack.js index b1e86b88..f837e2e0 100644 --- a/tests.webpack.js +++ b/tests.webpack.js @@ -1,2 +1,2 @@ -const context = require.context('./components', true, /(.spec\.cjsx?|.spec\.jsx?)$/); +const context = require.context('./components', true, /.spec\.js$/); context.keys().forEach(context); diff --git a/tools/buildReadme.js b/tools/buildReadme.js index 72afeb14..61934a20 100755 --- a/tools/buildReadme.js +++ b/tools/buildReadme.js @@ -14,7 +14,7 @@ const getComponentName = (filepath) => { return name; }; -const componentGlob = Path.join(process.argv[2], '/*.jsx'); +const componentGlob = Path.join(process.argv[2], '/*.js'); new Promise((resolve, reject) => { Glob(componentGlob, (err, files) => { diff --git a/webpack.config.development.js b/webpack.config.development.js index ed1a5ef1..90127281 100644 --- a/webpack.config.development.js +++ b/webpack.config.development.js @@ -9,7 +9,7 @@ module.exports = { devtool: 'inline-source-map', entry: [ 'webpack-hot-middleware/client', - './spec/index.jsx' + './spec/index.js' ], output: { path: path.join(__dirname, 'build'), @@ -17,13 +17,13 @@ module.exports = { publicPath: '/build/' }, resolve: { - extensions: ['', '.jsx', '.scss', '.js', '.json'], + extensions: ['', '.scss', '.js', '.json'], packageMains: ['browser', 'web', 'browserify', 'main', 'style'] }, module: { loaders: [ { - test: /\.(js|jsx)$/, + test: /\.js$/, loader: 'babel', exclude: /(node_modules)/ }, { diff --git a/webpack.config.test.js b/webpack.config.test.js index 957e3448..50c47363 100644 --- a/webpack.config.test.js +++ b/webpack.config.test.js @@ -5,7 +5,7 @@ module.exports = { module: { loaders: [ { - test: /\.(js|jsx)$/, + test: /\.js$/, exclude: /(node_modules)/, loader: 'babel' }, { @@ -15,7 +15,7 @@ module.exports = { ] }, resolve: { - extensions: ['', '.jsx', '.scss', '.js', '.json'], + extensions: ['', '.scss', '.js', '.json'], packageMains: ['browser', 'web', 'browserify', 'main', 'style'] }, watch: true,