From fb71003474f5a98223c7aa9c452efb45bafef6cd Mon Sep 17 00:00:00 2001
From: Damian Peralta <dperalta@redhat.com>
Date: Tue, 23 Jul 2019 16:53:47 +0200
Subject: [PATCH] Adding null-loader and importing css manuallly

---
 app/javascript/packs/pf4BaseStyles.js | 24 ++++++++++++++++++++++--
 config/webpack/environment.js         |  6 ++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/javascript/packs/pf4BaseStyles.js b/app/javascript/packs/pf4BaseStyles.js
index 088c109b7a..522f3987ba 100644
--- a/app/javascript/packs/pf4BaseStyles.js
+++ b/app/javascript/packs/pf4BaseStyles.js
@@ -1,9 +1,29 @@
 /*  Import all PF4 styles */
+// Disabled to avoid import of Overpass font
 // import '@patternfly/react-core/dist/styles/base.css'
 
-/* Below lines needed to avoid Overpass font, until issues with the font are fixed */
-/* selective pf4 base styles */
+/* As we disabled automatic PF4/React css inline injection */
+/* Now we need to add pf4 styles manually */
 import '@patternfly/patternfly/patternfly-variables.css'
 import '@patternfly/patternfly/patternfly-shield-noninheritable.css'
+import '@patternfly/patternfly/patternfly-shield-inheritable.css'
 import '@patternfly/patternfly/patternfly-common.css'
 import '@patternfly/patternfly/patternfly-globals.css'
+import '@patternfly/patternfly/patternfly-addons.css'
+import '@patternfly/patternfly/components/Page/page.css'
+import '@patternfly/patternfly/layouts/Grid/grid.css'
+import '@patternfly/patternfly/components/Button/button.css'
+import '@patternfly/patternfly/components/BackgroundImage/background-image.css'
+import '@patternfly/patternfly/components/Brand/brand.scss'
+import '@patternfly/patternfly/components/Card/card.css'
+import '@patternfly/patternfly/components/Dropdown/dropdown.css'
+import '@patternfly/patternfly/components/Form/form.css'
+import '@patternfly/patternfly/components/FormControl/form-control.css'
+import '@patternfly/patternfly/components/InputGroup/input-group.css'
+import '@patternfly/patternfly/components/Label/label.css'
+import '@patternfly/patternfly/components/List/list.css'
+import '@patternfly/patternfly/components/Login/login.css'
+import '@patternfly/patternfly/components/Title/title.css'
+import '@patternfly/patternfly/utilities/Accessibility/accessibility.css'
+import '@patternfly/patternfly/patternfly-fa-icons.css'
+import '@patternfly/patternfly/patternfly-icons.css'
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index b39bb7fd86..0703c411e2 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -25,4 +25,10 @@ environment.loaders.append('style', {
   ]
 })
 
+environment.loaders.append('null', {
+  test: /\.css$/,
+  include: stylesheet => stylesheet.indexOf('@patternfly/react-styles/css/') > -1,
+  use: ['null-loader']
+})
+
 module.exports = environment