diff --git a/.bootstraprc b/.bootstraprc index e9f7d1ca..179df5ee 100644 --- a/.bootstraprc +++ b/.bootstraprc @@ -1,5 +1,5 @@ { - "bootstrapVersion": 3, + "bootstrapVersion": 4, "preBootstrapCustomizations": "./src/theme/variables.scss", "appStyles": "./src/theme/app.scss", "loglevel": "disabled", @@ -9,14 +9,15 @@ "style-loader?sourceMap", "css-loader?sourceMap&importLoaders=2", "resolve-url-loader", + "postcss-loader?sourceMap", "sass-loader?sourceMap" ], "extractStyles": false }, "production": { "styleLoaders": [ - "style-loader", "css-loader?importLoaders=1", + "postcss-loader?sourceMap", "sass-loader?sourceMap" ], "extractStyles": true @@ -36,44 +37,5 @@ "tab": false, "affix": false }, - "styles": { - "mixins": true, - "normalize": true, - "print": true, - "glyphicons": true, - "scaffolding": true, - "type": true, - "code": true, - "grid": true, - "tables": true, - "forms": true, - "buttons": true, - "component-animations": true, - "dropdowns": true, - "button-groups": true, - "input-groups": true, - "navs": true, - "navbar": true, - "breadcrumbs": true, - "pagination": true, - "pager": true, - "labels": true, - "badges": true, - "jumbotron": true, - "thumbnails": true, - "alerts": true, - "progress-bars": true, - "media": true, - "list-group": true, - "panels": true, - "wells": true, - "responsive-embed": true, - "close": true, - "modals": true, - "tooltip": true, - "popovers": true, - "carousel": true, - "utilities": true, - "responsive-utilities": true - } + "styles": true } diff --git a/package.json b/package.json index 9c466668..481beb8a 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "@feathersjs/socketio-client": "^1.0.1", "axios": "^0.18.0", "body-parser": "^1.16.1", + "bootstrap": "^4.3.1", "classnames": "^2.2.5", "compression": "^1.6.2", "cookie-parser": "^1.4.3", @@ -87,7 +88,7 @@ "prop-types": "^15.5.8", "qs": "^6.5.2", "react": "^16.8.6", - "react-bootstrap": "^0.32.1", + "react-bootstrap": "^1.0.0-beta.12", "react-dom": "^16.8.6", "react-final-form": "^4.1.0", "react-helmet": "^5.0.3", @@ -135,8 +136,7 @@ "babel-jest": "^24.7.1", "babel-loader": "^8.0.0", "babel-plugin-dynamic-import-node": "^2.2.0", - "bootstrap-loader": "^2.1.0", - "bootstrap-sass": "^3.3.7", + "bootstrap-loader": "^3.0.4", "chai": "^4.1.1", "clean-webpack-plugin": "^2.0.1", "concurrently": "^4.0.1", diff --git a/src/containers/App/App.js b/src/containers/App/App.js index d90ff0cb..76a06664 100644 --- a/src/containers/App/App.js +++ b/src/containers/App/App.js @@ -6,10 +6,10 @@ import { withRouter } from 'react-router'; import { renderRoutes } from 'react-router-config'; import { provideHooks } from 'redial'; import { IndexLinkContainer, LinkContainer } from 'react-router-bootstrap'; -import Navbar from 'react-bootstrap/lib/Navbar'; -import Nav from 'react-bootstrap/lib/Nav'; -import NavItem from 'react-bootstrap/lib/NavItem'; -import Alert from 'react-bootstrap/lib/Alert'; +import Navbar from 'react-bootstrap/Navbar'; +import Nav from 'react-bootstrap/Nav'; +import Alert from 'react-bootstrap/Alert'; + import Helmet from 'react-helmet'; import qs from 'qs'; import { isLoaded as isInfoLoaded, load as loadInfo } from 'redux/modules/info'; @@ -100,42 +100,39 @@ class App extends Component { return (
- - - - -
- {config.app.title} -
-
-
- -
- - -