Skip to content

Commit

Permalink
Merge pull request #7068 from himdel/carbon-base
Browse files Browse the repository at this point in the history
Carbon - add carbon scss

(cherry picked from commit 9cfcf1c)
  • Loading branch information
skateman authored and simaishi committed May 28, 2020
1 parent 8f2dead commit ce43753
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
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.18.0",
"@data-driven-forms/react-form-renderer": "~1.18.0",
"@manageiq/react-ui-components": "~0.11.57",
Expand All @@ -44,6 +45,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

0 comments on commit ce43753

Please sign in to comment.