Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Threescale 3057 disable pf inline styles injection #1019

Merged
merged 6 commits into from
Sep 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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'
9 changes: 0 additions & 9 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';
damianpm marked this conversation as resolved.
Show resolved Hide resolved
@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';
damianpm marked this conversation as resolved.
Show resolved Hide resolved
@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'
damianpm marked this conversation as resolved.
Show resolved Hide resolved
= javascript_include_tag 'vendor/jquery-1.8.2.min.js', 'vendor/rails.js'

//
Expand Down
6 changes: 6 additions & 0 deletions config/webpack/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
2,365 changes: 1,243 additions & 1,122 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down