From 8023cc453dfa6eb0040724951f1b1ce759e6fc64 Mon Sep 17 00:00:00 2001
From: Damian Peralta <dperalta@redhat.com>
Date: Mon, 29 Jul 2019 15:39:25 +0200
Subject: [PATCH] Moving css imports to patternflyStyles directory

---
 app/javascript/packs/loginPageStyles.js       |  5 ++++
 app/javascript/packs/pf4BaseStyles.js         | 29 -------------------
 .../src/patternflyStyles/loginPage.css        |  6 ++++
 .../src/patternflyStyles/pf4Base.css          |  6 ++++
 app/views/layouts/provider/login.html.slim    |  2 +-
 5 files changed, 18 insertions(+), 30 deletions(-)
 create mode 100644 app/javascript/packs/loginPageStyles.js
 delete mode 100644 app/javascript/packs/pf4BaseStyles.js
 create mode 100644 app/javascript/src/patternflyStyles/loginPage.css
 create mode 100644 app/javascript/src/patternflyStyles/pf4Base.css

diff --git a/app/javascript/packs/loginPageStyles.js b/app/javascript/packs/loginPageStyles.js
new file mode 100644
index 0000000000..83bdf2ed0d
--- /dev/null
+++ 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
deleted file mode 100644
index 522f3987ba..0000000000
--- a/app/javascript/packs/pf4BaseStyles.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Import all PF4 styles */
-// Disabled to avoid import of Overpass font
-// import '@patternfly/react-core/dist/styles/base.css'
-
-/* 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/app/javascript/src/patternflyStyles/loginPage.css b/app/javascript/src/patternflyStyles/loginPage.css
new file mode 100644
index 0000000000..a29b4cdce8
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..9a58a85390
--- /dev/null
+++ 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
index dceccc0546..4a28635943 100644
--- 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'
 
   //