Skip to content

Commit

Permalink
Moving css imports to patternflyStyles directory
Browse files Browse the repository at this point in the history
  • Loading branch information
Damian Peralta committed Jul 29, 2019
1 parent 3ca4741 commit 8023cc4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 30 deletions.
5 changes: 5 additions & 0 deletions app/javascript/packs/loginPageStyles.js
Original file line number Diff line number Diff line change
@@ -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'
29 changes: 0 additions & 29 deletions app/javascript/packs/pf4BaseStyles.js

This file was deleted.

6 changes: 6 additions & 0 deletions app/javascript/src/patternflyStyles/loginPage.css
Original file line number Diff line number Diff line change
@@ -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';
6 changes: 6 additions & 0 deletions app/javascript/src/patternflyStyles/pf4Base.css
Original file line number Diff line number Diff line change
@@ -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';
2 changes: 1 addition & 1 deletion app/views/layouts/provider/login.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -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'

//
Expand Down

0 comments on commit 8023cc4

Please sign in to comment.