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.

Sign up for GitHub

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

Jump to bottom

Add support for PF4 styling through webpack #5537

Merged
merged 1 commit into from May 9, 2019
Merged

Add support for PF4 styling through webpack #5537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions app/assets/stylesheets/patternfly_overrides.scss
View file
Open in desktop
Expand Up @@ -60,9 +60,9 @@

.resizer-box {
bottom: 100px;
left: -18px;
left: -20px;
position: absolute;
width: 38px;
width: 40px;
}

.resizer .btn {
Expand Down Expand Up @@ -826,6 +826,13 @@ td.action > .btn.btn-default {
word-wrap: break-word;
}

/// override PF4 override of PF3 sidebar-pf
.sidebar-pf {
background: #fafafa !important;
padding-right: 20px !important;
padding-left: 20px !important;
}

/// Panel in sidebar doesn't need bottom margin
.sidebar-pf-left {
.panel-group {
Expand Down
2 changes: 2 additions & 0 deletions app/javascript/packs/application-common.js
View file
Open in desktop
Expand Up @@ -22,6 +22,8 @@ import { history } from '../miq-component/react-history.ts';
import createReduxRoutingActions from '../miq-redux/redux-router-actions';
import { formButtonsActionTypes, createFormButtonsActions } from '../forms/form-buttons-reducer';

import '../../stylesheet/application-webpack.scss';

ManageIQ.component = {
...newRegistry,
reactBlueprint,
Expand Down
6 changes: 6 additions & 0 deletions app/stylesheet/application-webpack.scss
View file
Open in desktop
@@ -0,0 +1,6 @@
$pf-global--enable-reset: false;
$pf-global--disable-fontawesome: true;

@import '~@fortawesome/fontawesome-free/css/all.css';
@import '~@fortawesome/fontawesome-free/scss/v4-shims.scss';
@import '~@patternfly/patternfly-next/patternfly.scss';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be @patternfly/patternfly/patternfly.scss - #5635

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it wasn't when I read the docs about it ...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not blaming you, I still can't even find any docs about it :)

But looks like the last release of patternfly-next was in January, since then, it's the other one.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -23,8 +23,10 @@
"dependencies": {
"@data-driven-forms/pf3-component-mapper": "^1.9.9",
"@data-driven-forms/react-form-renderer": "^1.9.9",
"@manageiq/ui-components": "~1.2.4",
"@fortawesome/fontawesome-free": "^5.8.1",
"@manageiq/react-ui-components": "~0.11.14",
"@manageiq/ui-components": "~1.2.4",
"@patternfly/patternfly": "^2.6.6",
"@pf3/select": "~1.12.6",
"@pf3/timeline": "~1.0.8",
"angular": "~1.6.6",
Expand Down