diff --git a/lib/_global-variables.scss b/lib/_global-variables.scss index d6b70a09c..9d4a96daa 100644 --- a/lib/_global-variables.scss +++ b/lib/_global-variables.scss @@ -1,9 +1,3 @@ -/* Bootstrap scss compilation will complain if these are not set - * https://github.com/twbs/bootstrap/issues/23982 - */ -$grid-gutter-width: 30px; -$font-size-base: 1; - /* * PatternFly 4 adapting the lists too early. * When PF4 has a breakpoint of 768px width, it's actually 1108 for us, as the sidebar is 340px. diff --git a/package.json b/package.json index 35151ded4..1774f0389 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,6 @@ "@patternfly/react-table": "4.19.24", "docker-names": "1.1.1", "moment": "2.29.1", - "patternfly": "3.59.5", - "patternfly-react": "2.39.17", "prop-types": "15.7.2", "react": "16.14.0", "react-dom": "16.14.0", diff --git a/src/index.js b/src/index.js index c916f8cb2..a35f8b9d7 100644 --- a/src/index.js +++ b/src/index.js @@ -19,7 +19,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import '../lib/patternfly/patternfly-cockpit.scss'; +import '../lib/patternfly/patternfly-4-cockpit.scss'; import Application from './app.jsx'; import './podman.scss'; diff --git a/webpack.config.js b/webpack.config.js index dced66a17..4d082e835 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -130,7 +130,7 @@ module.exports = { }, /* HACK: remove unwanted fonts from PatternFly's css */ { - test: /patternfly-cockpit.scss$/, + test: /patternfly-4-cockpit.scss$/, use: [ extract.loader, { @@ -144,10 +144,6 @@ module.exports = { loader: 'string-replace-loader', options: { multiple: [ - { - search: /src:url[(]"patternfly-icons-fake-path\/glyphicons-halflings-regular[^}]*/g, - replace: 'font-display:block; src:url("../base1/fonts/glyphicons.woff") format("woff");', - }, { search: /src:url[(]"patternfly-fonts-fake-path\/PatternFlyIcons[^}]*/g, replace: 'src:url("../base1/fonts/patternfly.woff") format("woff");', @@ -171,13 +167,6 @@ module.exports = { loader: 'sass-loader', options: { sassOptions: { - includePaths: [ - // Teach webpack to resolve these references in order to build PF3 scss - path.resolve(nodedir), - path.resolve(nodedir, 'font-awesome-sass', 'assets', 'stylesheets'), - path.resolve(nodedir, 'patternfly', 'dist', 'sass'), - path.resolve(nodedir, 'bootstrap-sass', 'assets', 'stylesheets'), - ], outputStyle: 'compressed', }, sourceMap: true, @@ -187,7 +176,7 @@ module.exports = { }, { test: /\.s?css$/, - exclude: /patternfly-cockpit.scss/, + exclude: /patternfly-4-cockpit.scss/, use: [ extract.loader, { @@ -208,13 +197,12 @@ module.exports = { }, { loader: 'sass-resources-loader', - // Make PF3 and PF4 variables globably accessible to be used by the components scss + // Make PF4 variables globably accessible to be used by the components scss options: { resources: [ path.resolve(libdir, './_global-variables.scss'), path.resolve(nodedir, './@patternfly/patternfly/base/patternfly-themes.scss'), path.resolve(nodedir, './@patternfly/patternfly/base/patternfly-variables.scs'), - path.resolve(nodedir, './patternfly/dist/sass/patternfly/_variables.scss') ], }, },