Merge pull request #459 from bf2fc6cc711aee1a0c2a/cssBuildTwo

fix: css overrides that are happening in clouddot
bf2fc6cc711aee1a0c2a · Apr 23, 2021 · f5cab9b · f5cab9b
2 parents d446184 + 41dc328
commit f5cab9b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 6 deletions.
diff --git a/src/app/app.css b/src/app/app.css
@@ -3,8 +3,8 @@ html, body, #root {
 }
 
 .pf-c-select__toggle:before {
-  border-top: var(--pf-c-select__toggle--before--BorderTopWidth) solid var(--pf-c-select__toggle--before--BorderTopColor);
-  border-right: var(--pf-c-select__toggle--before--BorderRightWidth) solid var(--pf-c-select__toggle--before--BorderRightColor);
-  border-bottom: var(--pf-c-select__toggle--before--BorderBottomWidth) solid var(--pf-c-select__toggle--before--BorderBottomColor);
-  border-left: var(--pf-c-select__toggle--before--BorderLeftWidth) solid var(--pf-c-select__toggle--before--BorderLeftColor);
+  border-top: 1px solid var(--pf-c-select__toggle--before--BorderTopColor);
+  border-right: 1px solid var(--pf-c-select__toggle--before--BorderRightColor);
+  border-bottom: 1px solid var(--pf-c-select__toggle--before--BorderBottomColor);
+  border-left: 1px solid var(--pf-c-select__toggle--before--BorderLeftColor);
 }
diff --git a/src/app/common/MASGenerateCredentialsModal/MASGenerateCredentialsModal.css b/src/app/common/MASGenerateCredentialsModal/MASGenerateCredentialsModal.css
@@ -1,3 +1,7 @@
 .mk--generate-credential__empty-state--input-group {
   white-space: nowrap;
+}
+
+.pf-u-w-100 {
+  width: 100%;
 }
diff --git a/src/app/index.tsx b/src/app/index.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import "@patternfly/patternfly/patternfly.min.css";
 import "@patternfly/patternfly/utilities/Accessibility/accessibility.css";
-import "@patternfly/patternfly/utilities/Spacing/spacing.css";
 import "@patternfly/patternfly/utilities/Sizing/sizing.css";
+import "@patternfly/patternfly/utilities/Spacing/spacing.css";
 import { BrowserRouter as Router } from 'react-router-dom';
 import { AppLayout } from '@app/AppLayout/AppLayout';
 import { AppRoutes } from '@app/routes';

diff --git a/src/app/modules/OpenshiftStreams/OpenshiftStreams.css b/src/app/modules/OpenshiftStreams/OpenshiftStreams.css
@@ -11,3 +11,10 @@
   font-weight: var(--pf-global--FontWeight--semi-bold);
   --pf-c-button--m-link--Color: var(--pf-global--Color--100);
 }
+
+.pf-c-select__toggle:before {
+  border-top: 1px solid var(--pf-c-select__toggle--before--BorderTopColor);
+  border-right: 1px solid var(--pf-c-select__toggle--before--BorderRightColor);
+  border-bottom: 1px solid var(--pf-c-select__toggle--before--BorderBottomColor);
+  border-left: 1px solid var(--pf-c-select__toggle--before--BorderLeftColor);
+}
diff --git a/src/app/modules/OpenshiftStreams/components/StreamsTableView/StreamsToolbar.css b/src/app/modules/OpenshiftStreams/components/StreamsTableView/StreamsToolbar.css
@@ -9,3 +9,10 @@
 .pf-c-chip__text {
   --pf-c-chip__text--MaxWidth: 35ch;
 }
+
+.pf-c-select__toggle:before {
+  border-top: 1px solid var(--pf-c-select__toggle--before--BorderTopColor);
+  border-right: 1px solid var(--pf-c-select__toggle--before--BorderRightColor);
+  border-bottom: 1px solid var(--pf-c-select__toggle--before--BorderBottomColor);
+  border-left: 1px solid var(--pf-c-select__toggle--before--BorderLeftColor);
+}
diff --git a/webpack.prod.js b/webpack.prod.js
@@ -10,7 +10,11 @@ module.exports = merge(common('production', { mode: "production" }), {
   optimization: {
     minimizer: [
       new TerserJSPlugin({}),
-      new OptimizeCSSAssetsPlugin({})
+      new OptimizeCSSAssetsPlugin({
+        cssProcessorPluginOptions: {
+         preset: ['default', { mergeLonghand: false }] // Fixes bug in PF Select component https://github.com/patternfly/patternfly-react/issues/5650#issuecomment-822667560  
+       }
+     })
     ],
   },
   output: {