Merge pull request #1019 from 3scale/THREESCALE-3057-Disable-PF-Inlin…

…e-Styles-Injection Threescale 3057 disable pf inline styles injection
3scale · Sep 5, 2019 · 6404dfa · 6404dfa
2 parents 4b34151 + 8b94a77
commit 6404dfa
Show file tree

Hide file tree

Showing 8 changed files with 1,268 additions and 1,132 deletions.
diff --git a/app/javascript/packs/loginPageStyles.js b/app/javascript/packs/loginPageStyles.js
@@ -0,0 +1,5 @@
+/* As we disabled automatic PF4/React css inline injection */
+/* Now we need to add pf4 styles manually */
+
+import 'patternflyStyles/pf4Base'
+import 'patternflyStyles/loginPage'
diff --git a/app/javascript/packs/pf4BaseStyles.js b/app/javascript/packs/pf4BaseStyles.js
diff --git a/app/javascript/src/patternflyStyles/loginPage.css b/app/javascript/src/patternflyStyles/loginPage.css
@@ -0,0 +1,6 @@
+@import '~@patternfly/patternfly/components/Login/login.css';
+@import '~@patternfly/patternfly/components/BackgroundImage/background-image.css';
+@import '~@patternfly/patternfly/components/Form/form.css';
+@import '~@patternfly/patternfly/components/FormControl/form-control.css';
+@import '~@patternfly/patternfly/components/Title/title.css';
+@import '~@patternfly/patternfly/components/Button/button.css';
diff --git a/app/javascript/src/patternflyStyles/pf4Base.css b/app/javascript/src/patternflyStyles/pf4Base.css
@@ -0,0 +1,6 @@
+@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';
diff --git a/app/views/layouts/provider/login.html.slim b/app/views/layouts/provider/login.html.slim
@@ -7,7 +7,7 @@ html lang="en"
 
     = render 'provider/analytics'
     = stylesheet_link_tag 'loginPageFonts'
-    = javascript_pack_tag 'pf4BaseStyles'
+    = javascript_pack_tag 'loginPageStyles'
     = javascript_include_tag 'vendor/jquery-1.8.2.min.js', 'vendor/rails.js'
 
   //

diff --git a/config/webpack/environment.js b/config/webpack/environment.js
@@ -10,6 +10,12 @@ environment.loaders.delete('moduleCss')
 environment.loaders.delete('sass')
 environment.loaders.delete('moduleSass')
 
+environment.loaders.append('null', {
+  test: /\.css$/,
+  include: stylesheet => stylesheet.indexOf('@patternfly/react-styles/css/') > -1,
+  use: ['null-loader']
+})
+
 environment.loaders.append('style', {
   test: /(\.css|\.scss|\.sass)$/,
   use: [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -96,6 +96,7 @@
     "moment-range": "^4.0.2",
     "moment-timezone": "^0.5.5",
     "node-sass": "^4.9.4",
+    "null-loader": "^3.0.0",
     "numeral": "^2.0.6",
     "pluralize": "^7.0.0",
     "prop-types": "^15.7.2",