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

Carbon - add carbon scss #7068

Merged
merged 4 commits into from
May 22, 2020
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/stylesheet/application-webpack.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
@import '~@manageiq/react-ui-components/dist/textual_summary.css';
@import '~@manageiq/react-ui-components/dist/wooden-tree.css';
@import '~@manageiq/ui-components/dist/css/ui-components.css';
@import './carbon.scss';
25 changes: 25 additions & 0 deletions app/stylesheet/carbon.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// enable carbon UI shell
$feature-flags: (
ui-shell: true,
);

// disable IBM fonts until we can override patternfly
$css--font-face: false;
$css--plex: false;

// don't break patternfly styling
$css--body: false;
$css--reset: false;
$css--default-type: false;

// Use the gray 90 theme
@import '~@carbon/themes/scss/themes';
$carbon--theme: $carbon--theme--g90;
@include carbon--theme();

@import '~carbon-components/scss/globals/scss/styles.scss';

// ignored by patternfly, but sets the right base for carbon rem units
html {
font-size: 100%;
}
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"homepage": "https://github.com/ManageIQ/manageiq#readme",
"dependencies": {
"@carbon/themes": "~10.12.0",
"@data-driven-forms/pf3-component-mapper": "~1.30.0",
"@data-driven-forms/react-form-renderer": "~1.30.0",
"@manageiq/react-ui-components": "~0.11.68",
Expand All @@ -45,6 +46,7 @@
"awesome-debounce-promise": "^2.1.0",
"bootstrap-filestyle": "~1.2.1",
"bootstrap-switch": "3.3.4",
"carbon-components": "~10.12.0",
"classnames": "~2.2.6",
"codemirror": "~5.47.0",
"connected-react-router": "~6.7.0",
Expand Down