diff --git a/.size-snapshot.json b/.size-snapshot.json index 5acc741b..1ca73141 100644 --- a/.size-snapshot.json +++ b/.size-snapshot.json @@ -1,8 +1,8 @@ { "dist/index.js": { - "bundled": 72221, - "minified": 45551, - "gzipped": 8795 + "bundled": 73287, + "minified": 45857, + "gzipped": 8819 }, "dist/index.es.js": { "bundled": 71172, @@ -24,16 +24,16 @@ "gzipped": 8795 }, "es/index.js": { - "bundled": 71172, - "minified": 44647, - "gzipped": 8559, + "bundled": 72211, + "minified": 44928, + "gzipped": 8581, "treeshaked": { "rollup": { - "code": 34514, + "code": 34782, "import_statements": 72 }, "webpack": { - "code": 36947 + "code": 37221 } } } diff --git a/.storybook/config.ts b/.storybook/config.ts index c5ed463c..bc77d206 100644 --- a/.storybook/config.ts +++ b/.storybook/config.ts @@ -1,4 +1,3 @@ -import { withInfo } from "@storybook/addon-info"; import { withKnobs } from "@storybook/addon-knobs"; import { setOptions } from "@storybook/addon-options"; import { @@ -7,15 +6,16 @@ import { } from "@storybook/addon-viewport"; import { addDecorator, configure } from "@storybook/react"; -import "../src/index.module.sass"; +import "./storybook.sass"; // addon-info is currently broken with prop types -addDecorator( - withInfo({ - // propTables: false, - source: false, - }), -); +// import { withInfo } from "@storybook/addon-info"; +// addDecorator( +// withInfo({ +// // propTables: false, +// source: false, +// }), +// ); setOptions({ name: "👟 rbx - Bulma UI", diff --git a/.storybook/storybook.sass b/.storybook/storybook.sass new file mode 100644 index 00000000..cf873efb --- /dev/null +++ b/.storybook/storybook.sass @@ -0,0 +1,2 @@ +@import "~bulma/bulma.sass" +@import "../src/index.sass" diff --git a/README.md b/README.md index 8dbc889d..cb1db3ab 100644 --- a/README.md +++ b/README.md @@ -21,25 +21,11 @@ Follow the instructions below for adding `sass` support to your webpack configur ```tsx import React from "react"; -/** - * You can import directly from rbx - * (you will need to include the css file dist/rbx.min.css) - */ import { Columns } from "rbx"; - /** - * You can also include the js that also bundles the css - * (does not work with server-side rendering) + * Alternatively, you can import only the components you need */ -import { Columns } from "rbx/lib/columns"; - -/** - * [RECOMENDED] Or import only the components you will use - * (this will reduce your total bundle size) - * If you use this approach and want to use the global Bulma styles, - * import rbx/src/index.sass and configure webpack to handle sass files - */ -import Columns from "rbx/lib/components/columns"; +import { Columns } from "rbx/grid/columns"; export const MyPage = () => ( @@ -130,35 +116,24 @@ While some components may slightly differ from the Bulma API, these changes are | Hero | [Stories](https://dfee.github.io/rbx/?selectedKind=Layout%2FHero) | [Documentation](http://bulma.io/documentation/layout/hero/) | | Section | [Stories](https://dfee.github.io/rbx/?selectedKind=Layout%2FSection) | [Documentation](http://bulma.io/documentation/layout/section/) | -### Overriding Bulma variables +### Styling -#### General +#### SASS Support -To override the variables set by Bulma you will need to create a sass file like this one (\_variable.sass): +To override the variables set by Bulma, [follow the Bulma instructions](https://bulma.io/documentation/customize/variables/). -```sass -@import "~bulma/sass/utilities/initial-variables" +You will also need to import `rbx/index.sass` as it contains any pertinent bug fixes for Bulma. -// ADD HERE variables you want to override -$primary: #f4f4f4 +A minimal example of `style.sass` might look like: -@import "~bulma/sass/utilities/_all" -``` - -It may be necessary, depending on your project setup, to create this file, even if you do not intend on overriding default styles. - -After that you will need to add an alias pointing to the file to your webpack configuration +```sass +$primary: #61dafb +@import "~bulma/bulma.sass" +@import "../src/index.sass" ``` -resolve { - // Other resolve props - alias: { - // Other aliases - '_variables.sass': path.resolve(__dirname, 'relative/path/from/webpack/config/to/your/_variables.sass'), - }, -} -``` +Then, import this file into the root of your project. #### Create React App @@ -166,14 +141,7 @@ Create React App 2 supports SASS compilation out of the box. To get started, please follow the [official instructions](https://facebook.github.io/create-react-app/docs/adding-a-sass-stylesheet) to enable this feature. -Then, create a SASS file in your project with the following code: - -```sass -// Any Bulma variables I want to override go here... -$family-sans-serif: 'Overpass', sans-serif - -@import '~rbx/src/index.module.sass' -``` +Then, create a SASS file in your project (as described above): Finally, import this stylesheet somewhere in your CRA app. @@ -181,47 +149,6 @@ Finally, import this stylesheet somewhere in your CRA app. import "./App.sass"; ``` -#### Gatsby.js v1 - -Add a `modifyWebpackConfig` export to your `gatsby-node.js` file: - -``` -exports.modifyWebpackConfig = ({config, env}) => { - config.merge({ - resolve: { - alias: { - '_variables.sass': path.resolve(__dirname, 'relative/path/from/webpack/config/to/your/_variables.sass') - } - } - }) - return config -} -``` - -#### Gatsby.js v2 - -Add a `onCreateWebpackConfig` export to your `gatsby-node.js` file: - -``` -const path = require('path') - -exports.onCreateWebpackConfig = ({ - stage, - getConfig, - rules, - loaders, - actions, -}) => { - actions.setWebpackConfig({ - resolve: { - alias: { - '_variables.sass': path.resolve(__dirname, 'relative/path/from/webpack/config/to/your/_variables.sass'), - }, - }, - }) -} -``` - #### Etc. This library was hard-forked from [`react-bulma-components`](https://github.com/couds/react-bulma-components) and has been rewritten in its entirety from scratch. diff --git a/package-lock.json b/package-lock.json index 058e2426..5e3b3f7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rbx", - "version": "1.0.0-beta.1", + "version": "1.0.0-beta.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -4047,7 +4047,8 @@ "bulma": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.7.2.tgz", - "integrity": "sha512-6JHEu8U/1xsyOst/El5ImLcZIiE2JFXgvrz8GGWbnDLwTNRPJzdAM0aoUM1Ns0avALcVb6KZz9NhzmU53dGDcQ==" + "integrity": "sha512-6JHEu8U/1xsyOst/El5ImLcZIiE2JFXgvrz8GGWbnDLwTNRPJzdAM0aoUM1Ns0avALcVb6KZz9NhzmU53dGDcQ==", + "dev": true }, "bytes": { "version": "3.0.0", diff --git a/package.json b/package.json index 0f14b3a6..bf46cd56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rbx", - "version": "1.0.0-beta.1", + "version": "1.0.0-beta.2", "description": "The Comprehensive Bulma UI Framework for React", "main": "lib/index.js", "module": "es/index.js", @@ -45,10 +45,10 @@ }, "homepage": "https://github.com/dfee/rbx#readme", "dependencies": { - "bulma": "0.7.2", "classnames": "^2.2.6" }, "peerDependencies": { + "bulma": "0.7.2", "react": "^16.3.0", "react-dom": "^16.3.0" }, @@ -81,6 +81,7 @@ "@types/storybook__react": "^4.0.0", "babel-core": "^7.0.0-bridge.0", "babel-loader": "^8.0.4", + "bulma": "0.7.2", "coveralls": "3.0.2", "cpx": "^1.5.0", "css-loader": "2.0.0", diff --git a/src/_variables.sass b/src/_variables.sass deleted file mode 100644 index 75b128a8..00000000 --- a/src/_variables.sass +++ /dev/null @@ -1,5 +0,0 @@ -@import "~bulma/sass/utilities/initial-variables.sass" - -// ADD HERE variables you want to override - -@import "~bulma/sass/utilities/_all.sass" diff --git a/src/components/breadcrumb/breadcrumb.module.sass b/src/components/breadcrumb/breadcrumb.module.sass deleted file mode 100644 index d45f1671..00000000 --- a/src/components/breadcrumb/breadcrumb.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/breadcrumb.sass' \ No newline at end of file diff --git a/src/components/breadcrumb/index.ts b/src/components/breadcrumb/index.ts index a8d8c3d2..69b4a5ce 100644 --- a/src/components/breadcrumb/index.ts +++ b/src/components/breadcrumb/index.ts @@ -1,3 +1 @@ -import "./breadcrumb.module.sass"; - export { Breadcrumb } from "./breadcrumb"; diff --git a/src/components/card/card.module.sass b/src/components/card/card.module.sass deleted file mode 100644 index 9289af58..00000000 --- a/src/components/card/card.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/card.sass' \ No newline at end of file diff --git a/src/components/card/index.ts b/src/components/card/index.ts index 59c1f308..738731bf 100644 --- a/src/components/card/index.ts +++ b/src/components/card/index.ts @@ -1,3 +1 @@ -import "./card.module.sass"; - export { Card } from "./card"; diff --git a/src/components/components.module.sass b/src/components/components.module.sass deleted file mode 100644 index 433ccb82..00000000 --- a/src/components/components.module.sass +++ /dev/null @@ -1,13 +0,0 @@ -@import "./breadcrumb/breadcrumb.sass" -@import "./card/card.sass" -@import "./dropdown/dropdown.sass" -@import "./level/level.sass" -@import "./list/list.sass" -@import "./media/media.sass" -@import "./menu/menu.sass" -@import "./message/message.sass" -@import "./modal/modal.sass" -@import "./navbar/navbar.sass" -@import "./pagination/pagination.sass" -@import "./panel/panel.sass" -@import "./tabs/tabs.sass" diff --git a/src/components/dropdown/dropdown.module.sass b/src/components/dropdown/dropdown.module.sass deleted file mode 100644 index e5ce4a8b..00000000 --- a/src/components/dropdown/dropdown.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/dropdown.sass' \ No newline at end of file diff --git a/src/components/dropdown/index.ts b/src/components/dropdown/index.ts index 310be547..467ea385 100644 --- a/src/components/dropdown/index.ts +++ b/src/components/dropdown/index.ts @@ -1,3 +1 @@ -import "./dropdown.module.sass"; - export { Dropdown } from "./dropdown"; diff --git a/src/components/level/index.ts b/src/components/level/index.ts index 8c5d7488..7cfc6ca6 100644 --- a/src/components/level/index.ts +++ b/src/components/level/index.ts @@ -1,3 +1 @@ -import "./level.module.sass"; - export { Level } from "./level"; diff --git a/src/components/level/level.module.sass b/src/components/level/level.module.sass deleted file mode 100644 index c5c1addb..00000000 --- a/src/components/level/level.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/level.sass' \ No newline at end of file diff --git a/src/components/list/index.ts b/src/components/list/index.ts index 6ebf2de9..f470c889 100644 --- a/src/components/list/index.ts +++ b/src/components/list/index.ts @@ -1,3 +1 @@ -import "./list.module.sass"; - export { List } from "./list"; diff --git a/src/components/list/list.module.sass b/src/components/list/list.module.sass deleted file mode 100644 index d7d18bce..00000000 --- a/src/components/list/list.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/list.sass' \ No newline at end of file diff --git a/src/components/media/index.ts b/src/components/media/index.ts index 64c69f19..34553e4c 100644 --- a/src/components/media/index.ts +++ b/src/components/media/index.ts @@ -1,3 +1 @@ -import "./media.module.sass"; - export { Media } from "./media"; diff --git a/src/components/media/media.module.sass b/src/components/media/media.module.sass deleted file mode 100644 index eba12875..00000000 --- a/src/components/media/media.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/media.sass' \ No newline at end of file diff --git a/src/components/menu/index.ts b/src/components/menu/index.ts index 7751aed2..1f577526 100644 --- a/src/components/menu/index.ts +++ b/src/components/menu/index.ts @@ -1,3 +1 @@ -import "./menu.module.sass"; - export { Menu } from "./menu"; diff --git a/src/components/menu/menu.module.sass b/src/components/menu/menu.module.sass deleted file mode 100644 index 09e9e49b..00000000 --- a/src/components/menu/menu.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/menu.sass' \ No newline at end of file diff --git a/src/components/message/index.ts b/src/components/message/index.ts index 9a827501..142b1aaf 100644 --- a/src/components/message/index.ts +++ b/src/components/message/index.ts @@ -1,3 +1 @@ -import "./message.module.sass"; - export { Message } from "./message"; diff --git a/src/components/message/message.module.sass b/src/components/message/message.module.sass deleted file mode 100644 index 084339c2..00000000 --- a/src/components/message/message.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/message.sass' \ No newline at end of file diff --git a/src/components/modal/index.ts b/src/components/modal/index.ts index 8ddcc780..18fc26b7 100644 --- a/src/components/modal/index.ts +++ b/src/components/modal/index.ts @@ -1,3 +1 @@ -import "./modal.module.sass"; - export { Modal } from "./modal"; diff --git a/src/components/modal/modal.module.sass b/src/components/modal/modal.module.sass deleted file mode 100644 index cc3f93a5..00000000 --- a/src/components/modal/modal.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/modal.sass' diff --git a/src/components/navbar/index.ts b/src/components/navbar/index.ts index 9b80070c..4f092886 100644 --- a/src/components/navbar/index.ts +++ b/src/components/navbar/index.ts @@ -1,2 +1 @@ -import "./navbar.module.sass"; export { Navbar } from "./navbar"; diff --git a/src/components/navbar/navbar.module.sass b/src/components/navbar/navbar.module.sass deleted file mode 100644 index 22536a94..00000000 --- a/src/components/navbar/navbar.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/navbar.sass' diff --git a/src/components/pagination/index.ts b/src/components/pagination/index.ts index 908c372f..b936691d 100644 --- a/src/components/pagination/index.ts +++ b/src/components/pagination/index.ts @@ -1,3 +1 @@ -import "./pagination.module.sass"; - export { Pagination } from "./pagination"; diff --git a/src/components/pagination/pagination.module.sass b/src/components/pagination/pagination.module.sass deleted file mode 100644 index a98901aa..00000000 --- a/src/components/pagination/pagination.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/pagination.sass' diff --git a/src/components/panel/index.ts b/src/components/panel/index.ts index 32e368f3..8628fc58 100644 --- a/src/components/panel/index.ts +++ b/src/components/panel/index.ts @@ -1,3 +1 @@ -import "./panel.module.sass"; - export { Panel } from "./panel"; diff --git a/src/components/panel/panel.module.sass b/src/components/panel/panel.module.sass deleted file mode 100644 index 1910f20c..00000000 --- a/src/components/panel/panel.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/panel.sass' \ No newline at end of file diff --git a/src/components/tabs/index.ts b/src/components/tabs/index.ts index d44e7982..aee02207 100644 --- a/src/components/tabs/index.ts +++ b/src/components/tabs/index.ts @@ -1,3 +1 @@ -import "./tabs.module.sass"; - export { Tabs } from "./tabs"; diff --git a/src/components/tabs/tabs.module.sass b/src/components/tabs/tabs.module.sass deleted file mode 100644 index 7e86c952..00000000 --- a/src/components/tabs/tabs.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/components/tabs.sass' \ No newline at end of file diff --git a/src/elements/box/box.module.sass b/src/elements/box/box.module.sass deleted file mode 100644 index 8044ed1f..00000000 --- a/src/elements/box/box.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/box.sass' \ No newline at end of file diff --git a/src/elements/box/index.ts b/src/elements/box/index.ts index f870011d..4e5c5d94 100644 --- a/src/elements/box/index.ts +++ b/src/elements/box/index.ts @@ -1,3 +1 @@ -import "./box.module.sass"; - export { Box } from "./box"; diff --git a/src/elements/button/button.module.sass b/src/elements/button/button.module.sass deleted file mode 100644 index 96ad8661..00000000 --- a/src/elements/button/button.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../utils.sass" -@import "~bulma/sass/elements/button.sass" diff --git a/src/elements/button/index.ts b/src/elements/button/index.ts index 5c9d5b1e..398a3c50 100644 --- a/src/elements/button/index.ts +++ b/src/elements/button/index.ts @@ -1,3 +1 @@ -import "./button.module.sass"; - export { Button } from "./button"; diff --git a/src/elements/container/container.module.sass b/src/elements/container/container.module.sass deleted file mode 100644 index 09ee60b7..00000000 --- a/src/elements/container/container.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/container.sass' \ No newline at end of file diff --git a/src/elements/container/index.ts b/src/elements/container/index.ts index 74573caf..5159506b 100644 --- a/src/elements/container/index.ts +++ b/src/elements/container/index.ts @@ -1,3 +1 @@ -import "./container.module.sass"; - export { Container } from "./container"; diff --git a/src/elements/content/content.module.sass b/src/elements/content/content.module.sass deleted file mode 100644 index a000637a..00000000 --- a/src/elements/content/content.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/content.sass' \ No newline at end of file diff --git a/src/elements/content/index.ts b/src/elements/content/index.ts index e69b377e..767e68cf 100644 --- a/src/elements/content/index.ts +++ b/src/elements/content/index.ts @@ -1,3 +1 @@ -import "./content.module.sass"; - export { Content } from "./content"; diff --git a/src/elements/elements.module.sass b/src/elements/elements.module.sass deleted file mode 100644 index 98a2c10a..00000000 --- a/src/elements/elements.module.sass +++ /dev/null @@ -1,13 +0,0 @@ -@import "./box/box.module.sass" -@import "./button/button.module.sass" -@import "./container/container.module.sass" -@import "./content/content.module.sass" -@import "./form/form.module.sass" -@import "./icon/icon.module.sass" -@import "./image/image.module.sass" -@import "./notification/notification.module.sass" -@import "./other/other.module.sass" -@import "./progress/progress.module.sass" -@import "./table/table.module.sass" -@import "./tag/tag.module.sass" -@import "./title/title.module.sass" diff --git a/src/elements/form/index.ts b/src/elements/form/index.ts index e51bafc6..36a418ed 100644 --- a/src/elements/form/index.ts +++ b/src/elements/form/index.ts @@ -1,5 +1,3 @@ -import "./form.module.sass"; - export { Checkbox } from "./checkbox"; export { Control } from "./control"; export { Field } from "./field"; diff --git a/src/elements/icon/icon.module.sass b/src/elements/icon/icon.module.sass deleted file mode 100644 index f55dddf3..00000000 --- a/src/elements/icon/icon.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/icon.sass' diff --git a/src/elements/icon/index.ts b/src/elements/icon/index.ts index a7bf9f11..74a3d6cd 100644 --- a/src/elements/icon/index.ts +++ b/src/elements/icon/index.ts @@ -1,3 +1 @@ -import "./icon.module.sass"; - export { Icon } from "./icon"; diff --git a/src/elements/image/image.module.sass b/src/elements/image/image.module.sass deleted file mode 100644 index 917201c0..00000000 --- a/src/elements/image/image.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/image.sass' \ No newline at end of file diff --git a/src/elements/image/index.ts b/src/elements/image/index.ts index 30ddbb42..9752e64d 100644 --- a/src/elements/image/index.ts +++ b/src/elements/image/index.ts @@ -1,3 +1 @@ -import "./image.module.sass"; - export { Image } from "./image"; diff --git a/src/elements/notification/index.ts b/src/elements/notification/index.ts index fddc8421..241fc476 100644 --- a/src/elements/notification/index.ts +++ b/src/elements/notification/index.ts @@ -1,3 +1 @@ -import "./notification.module.sass"; - export { Notification } from "./notification"; diff --git a/src/elements/notification/notification.module.sass b/src/elements/notification/notification.module.sass deleted file mode 100644 index 3f933497..00000000 --- a/src/elements/notification/notification.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/notification.sass' \ No newline at end of file diff --git a/src/elements/other/index.ts b/src/elements/other/index.ts index c09c41b5..2dda8427 100644 --- a/src/elements/other/index.ts +++ b/src/elements/other/index.ts @@ -1,5 +1,3 @@ -import "./other.module.sass"; - export { Block } from "./block"; export { Delete } from "./delete"; export { Heading } from "./heading"; diff --git a/src/elements/other/other.module.sass b/src/elements/other/other.module.sass deleted file mode 100644 index 5dde3b82..00000000 --- a/src/elements/other/other.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/other.sass' \ No newline at end of file diff --git a/src/elements/progress/index.ts b/src/elements/progress/index.ts index e2fe070f..46e25586 100644 --- a/src/elements/progress/index.ts +++ b/src/elements/progress/index.ts @@ -1,3 +1 @@ -import "./progress.module.sass"; - export { Progress } from "./progress"; diff --git a/src/elements/progress/progress.module.sass b/src/elements/progress/progress.module.sass deleted file mode 100644 index f7fe62da..00000000 --- a/src/elements/progress/progress.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/progress.sass' \ No newline at end of file diff --git a/src/elements/table/index.ts b/src/elements/table/index.ts index eb5c0844..8efc4312 100644 --- a/src/elements/table/index.ts +++ b/src/elements/table/index.ts @@ -1,3 +1 @@ -import "./table.module.sass"; - export { Table } from "./table"; diff --git a/src/elements/table/table.module.sass b/src/elements/table/table.module.sass deleted file mode 100644 index 8138d732..00000000 --- a/src/elements/table/table.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/table.sass' \ No newline at end of file diff --git a/src/elements/tag/index.ts b/src/elements/tag/index.ts index 57fcade7..1dc84122 100644 --- a/src/elements/tag/index.ts +++ b/src/elements/tag/index.ts @@ -1,3 +1 @@ -import "./tag.module.sass"; - export { Tag } from "./tag"; diff --git a/src/elements/tag/tag.module.sass b/src/elements/tag/tag.module.sass deleted file mode 100644 index f0b5a070..00000000 --- a/src/elements/tag/tag.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/tag.sass' \ No newline at end of file diff --git a/src/elements/title/index.ts b/src/elements/title/index.ts index 22e20bf3..57d39a72 100644 --- a/src/elements/title/index.ts +++ b/src/elements/title/index.ts @@ -1,3 +1 @@ -import "./title.module.sass"; - export { Title } from "./title"; diff --git a/src/elements/title/title.module.sass b/src/elements/title/title.module.sass deleted file mode 100644 index 4688f0c0..00000000 --- a/src/elements/title/title.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/title.sass' \ No newline at end of file diff --git a/src/grid/columns/columns.module.sass b/src/grid/columns/columns.module.sass deleted file mode 100644 index 9284576e..00000000 --- a/src/grid/columns/columns.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/grid/columns.sass' \ No newline at end of file diff --git a/src/grid/columns/index.ts b/src/grid/columns/index.ts index c2e45e51..a86a7812 100644 --- a/src/grid/columns/index.ts +++ b/src/grid/columns/index.ts @@ -1,3 +1 @@ -import "./columns.module.sass"; - export { Columns } from "./columns"; diff --git a/src/grid/grid.module.sass b/src/grid/grid.module.sass deleted file mode 100644 index 6746f085..00000000 --- a/src/grid/grid.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import "./columns/columns.module.sass" -@import "./tiles/tiles.module.sass" diff --git a/src/grid/tiles/index.ts b/src/grid/tiles/index.ts index 2f04911a..62039cf7 100644 --- a/src/grid/tiles/index.ts +++ b/src/grid/tiles/index.ts @@ -1,3 +1 @@ -import "./tiles.module.sass"; - export { Tile } from "./tile"; diff --git a/src/grid/tiles/tiles.module.sass b/src/grid/tiles/tiles.module.sass deleted file mode 100644 index 04151616..00000000 --- a/src/grid/tiles/tiles.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/grid/tiles.sass' \ No newline at end of file diff --git a/src/index.module.sass b/src/index.module.sass deleted file mode 100644 index e402586f..00000000 --- a/src/index.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import "~bulma/sass/utilities/_all.sass" -@import "~bulma/sass/base/_all.sass" diff --git a/src/elements/form/form.module.sass b/src/index.sass similarity index 55% rename from src/elements/form/form.module.sass rename to src/index.sass index b376ccfd..fbe582bf 100644 --- a/src/elements/form/form.module.sass +++ b/src/index.sass @@ -1,9 +1,5 @@ -@import '../../utils.sass' -@import '~bulma/sass/elements/form.sass' - // https://github.com/jgthms/bulma/issues/2271 - .checkbox, .radio &.is-disabled color: $input-disabled-color - cursor: not-allowed \ No newline at end of file + cursor: not-allowed diff --git a/src/index.ts b/src/index.ts index 5bd4f69b..564fd04e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,3 @@ -import "./index.module.sass"; - export * from "./base"; export * from "./components"; export * from "./elements"; diff --git a/src/layout/footer/footer.module.sass b/src/layout/footer/footer.module.sass deleted file mode 100644 index 7fbe5a1f..00000000 --- a/src/layout/footer/footer.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/layout/footer.sass' \ No newline at end of file diff --git a/src/layout/footer/index.ts b/src/layout/footer/index.ts index 6e145e80..25eaacd6 100644 --- a/src/layout/footer/index.ts +++ b/src/layout/footer/index.ts @@ -1,3 +1 @@ -import "./footer.module.sass"; - export { Footer } from "./footer"; diff --git a/src/layout/hero/hero.module.sass b/src/layout/hero/hero.module.sass deleted file mode 100644 index b740eede..00000000 --- a/src/layout/hero/hero.module.sass +++ /dev/null @@ -1,9 +0,0 @@ -@import '../../utils.sass' -// todo: remove extra dependency `navbar.sass` when 0.7.3 is released -// https://github.com/jgthms/bulma/issues/2154 -@import '~bulma/sass/components/navbar.sass' -@import '~bulma/sass/layout/hero.sass' - -.has-navbar-fixed-top, .has-navbar-fixed-bottom - .is-fullheight - min-height: calc(100vh - 3.5rem) !important diff --git a/src/layout/hero/index.ts b/src/layout/hero/index.ts index cd7d8636..9f31e411 100644 --- a/src/layout/hero/index.ts +++ b/src/layout/hero/index.ts @@ -1,3 +1 @@ -import "./hero.module.sass"; - export { Hero } from "./hero"; diff --git a/src/layout/layout.module.sass b/src/layout/layout.module.sass deleted file mode 100644 index a2914b01..00000000 --- a/src/layout/layout.module.sass +++ /dev/null @@ -1,3 +0,0 @@ -@import "./footer/footer.module.sass" -@import "./hero/hero.module.sass" -@import "./section/section.module.sass" diff --git a/src/layout/section/index.ts b/src/layout/section/index.ts index 110f9b79..2e37b756 100644 --- a/src/layout/section/index.ts +++ b/src/layout/section/index.ts @@ -1,3 +1 @@ -import "./section.module.sass"; - export { Section } from "./section"; diff --git a/src/layout/section/section.module.sass b/src/layout/section/section.module.sass deleted file mode 100644 index f2c37b03..00000000 --- a/src/layout/section/section.module.sass +++ /dev/null @@ -1,2 +0,0 @@ -@import '../../utils.sass' -@import '~bulma/sass/layout/section.sass' \ No newline at end of file diff --git a/src/utils.sass b/src/utils.sass deleted file mode 100644 index a11ca8c1..00000000 --- a/src/utils.sass +++ /dev/null @@ -1,9 +0,0 @@ -@charset "utf-8" - -@import "_variables.sass" -@import "~bulma/sass/utilities/initial-variables.sass" -@import "~bulma/sass/utilities/functions.sass" -@import "~bulma/sass/utilities/derived-variables.sass" -@import "~bulma/sass/utilities/animations.sass" -@import "~bulma/sass/utilities/mixins.sass" -@import "~bulma/sass/utilities/controls.sass"