fix: increase specificity of app styles

finos · Oct 6, 2024 · faff3a2 · faff3a2
1 parent 6a547c1
commit faff3a2
Show file tree

Hide file tree

Showing 19 changed files with 279 additions and 235 deletions.
diff --git a/src/ui/assets/jss/material-dashboard-react.js b/src/ui/assets/jss/material-dashboard-react.js
@@ -251,8 +251,15 @@ const cardLink = {
   },
 };
 
+function increaseSpecificity(styles) {
+  return {
+    '&&': styles,
+  };
+}
+
 export {
   hexToRgb,
+  increaseSpecificity,
   // variables
   drawerWidth,
   transition,

diff --git a/src/ui/assets/jss/material-dashboard-react/checkboxAdnRadioStyle.js b/src/ui/assets/jss/material-dashboard-react/checkboxAdnRadioStyle.js
@@ -1,47 +1,52 @@
-import { primaryColor, blackColor, hexToRgb } from '../material-dashboard-react.js';
+import {
+  primaryColor,
+  blackColor,
+  hexToRgb,
+  increaseSpecificity,
+} from '../material-dashboard-react.js';
 
 const checkboxAdnRadioStyle = {
-  root: {
+  root: increaseSpecificity({
     padding: '13px',
     '&:hover': {
       backgroundColor: 'unset',
     },
-  },
-  labelRoot: {
+  }),
+  labelRoot: increaseSpecificity({
     marginLeft: '-14px',
-  },
-  checked: {
+  }),
+  checked: increaseSpecificity({
     color: primaryColor[0] + '!important',
-  },
-  checkedIcon: {
+  }),
+  checkedIcon: increaseSpecificity({
     width: '20px',
     height: '20px',
     border: '1px solid rgba(' + hexToRgb(blackColor) + ', .54)',
     borderRadius: '3px',
-  },
-  uncheckedIcon: {
+  }),
+  uncheckedIcon: increaseSpecificity({
     width: '0px',
     height: '0px',
     padding: '10px',
     border: '1px solid rgba(' + hexToRgb(blackColor) + ', .54)',
     borderRadius: '3px',
-  },
-  radio: {
+  }),
+  radio: increaseSpecificity({
     color: primaryColor[0] + '!important',
-  },
-  radioChecked: {
+  }),
+  radioChecked: increaseSpecificity({
     width: '20px',
     height: '20px',
     border: '1px solid ' + primaryColor[0],
     borderRadius: '50%',
-  },
-  radioUnchecked: {
+  }),
+  radioUnchecked: increaseSpecificity({
     width: '0px',
     height: '0px',
     padding: '10px',
     border: '1px solid rgba(' + hexToRgb(blackColor) + ', .54)',
     borderRadius: '50%',
-  },
+  }),
 };
 
 export default checkboxAdnRadioStyle;
diff --git a/src/ui/assets/jss/material-dashboard-react/components/buttonStyle.js b/src/ui/assets/jss/material-dashboard-react/components/buttonStyle.js
@@ -9,10 +9,11 @@ import {
   whiteColor,
   blackColor,
   hexToRgb,
+  increaseSpecificity,
 } from '../../material-dashboard-react.js';
 
 const buttonStyle = {
-  button: {
+  button: increaseSpecificity({
     minHeight: 'auto',
     minWidth: 'auto',
     backgroundColor: grayColor[0],
@@ -88,14 +89,14 @@ const buttonStyle = {
         fontSize: '20px',
       },
     },
-  },
-  white: {
+  }),
+  white: increaseSpecificity({
     '&,&:focus,&:hover': {
       backgroundColor: whiteColor,
       color: grayColor[0],
     },
-  },
-  rose: {
+  }),
+  rose: increaseSpecificity({
     backgroundColor: roseColor[0],
     boxShadow:
       '0 2px 2px 0 rgba(' +
@@ -116,8 +117,8 @@ const buttonStyle = {
         hexToRgb(roseColor[0]) +
         ', 0.2)',
     },
-  },
-  primary: {
+  }),
+  primary: increaseSpecificity({
     backgroundColor: primaryColor[0],
     boxShadow:
       '0 2px 2px 0 rgba(' +
@@ -138,8 +139,8 @@ const buttonStyle = {
         hexToRgb(primaryColor[0]) +
         ', 0.2)',
     },
-  },
-  info: {
+  }),
+  info: increaseSpecificity({
     backgroundColor: infoColor[0],
     boxShadow:
       '0 2px 2px 0 rgba(' +
@@ -160,8 +161,8 @@ const buttonStyle = {
         hexToRgb(infoColor[0]) +
         ', 0.2)',
     },
-  },
-  success: {
+  }),
+  success: increaseSpecificity({
     backgroundColor: successColor[0],
     boxShadow:
       '0 2px 2px 0 rgba(' +
@@ -182,8 +183,8 @@ const buttonStyle = {
         hexToRgb(successColor[0]) +
         ', 0.2)',
     },
-  },
-  warning: {
+  }),
+  warning: increaseSpecificity({
     backgroundColor: warningColor[0],
     boxShadow:
       '0 2px 2px 0 rgba(' +
@@ -204,8 +205,8 @@ const buttonStyle = {
         hexToRgb(warningColor[0]) +
         ', 0.2)',
     },
-  },
-  danger: {
+  }),
+  danger: increaseSpecificity({
     backgroundColor: dangerColor[0],
     boxShadow:
       '0 2px 2px 0 rgba(' +
@@ -226,8 +227,8 @@ const buttonStyle = {
         hexToRgb(dangerColor[0]) +
         ', 0.2)',
     },
-  },
-  simple: {
+  }),
+  simple: increaseSpecificity({
     '&,&:focus,&:hover': {
       color: whiteColor,
       background: 'transparent',
@@ -263,44 +264,45 @@ const buttonStyle = {
         color: dangerColor[0],
       },
     },
-  },
-  transparent: {
+  }),
+
+  transparent: increaseSpecificity({
     '&,&:focus,&:hover': {
       color: 'inherit',
       background: 'transparent',
       boxShadow: 'none',
     },
-  },
-  disabled: {
+  }),
+  disabled: increaseSpecificity({
     opacity: '0.65',
     pointerEvents: 'none',
-  },
-  lg: {
+  }),
+  lg: increaseSpecificity({
     padding: '1.125rem 2.25rem',
     fontSize: '0.875rem',
     lineHeight: '1.333333',
     borderRadius: '0.2rem',
-  },
-  sm: {
+  }),
+  sm: increaseSpecificity({
     padding: '0.40625rem 1.25rem',
     fontSize: '0.6875rem',
     lineHeight: '1.5',
     borderRadius: '0.2rem',
-  },
-  round: {
+  }),
+  round: increaseSpecificity({
     borderRadius: '30px',
-  },
-  block: {
+  }),
+  block: increaseSpecificity({
     width: '100% !important',
-  },
-  link: {
+  }),
+  link: increaseSpecificity({
     '&,&:hover,&:focus': {
       backgroundColor: 'transparent',
       color: grayColor[0],
       boxShadow: 'none',
     },
-  },
-  justIcon: {
+  }),
+  justIcon: increaseSpecificity({
     paddingLeft: '12px',
     paddingRight: '12px',
     fontSize: '20px',
@@ -337,7 +339,7 @@ const buttonStyle = {
         height: '17px',
       },
     },
-  },
+  }),
 };
 
 export default buttonStyle;
diff --git a/src/ui/assets/jss/material-dashboard-react/components/cardIconStyle.js b/src/ui/assets/jss/material-dashboard-react/components/cardIconStyle.js
@@ -6,10 +6,11 @@ import {
   primaryCardHeader,
   roseCardHeader,
   grayColor,
+  increaseSpecificity,
 } from '../../material-dashboard-react.js';
 
 const cardIconStyle = {
-  cardIcon: {
+  cardIcon: increaseSpecificity({
     '&$warningCardHeader,&$successCardHeader,&$dangerCardHeader,&$infoCardHeader,&$primaryCardHeader,&$roseCardHeader':
       {
         borderRadius: '3px',
@@ -19,7 +20,7 @@ const cardIconStyle = {
         marginRight: '15px',
         float: 'left',
       },
-  },
+  }),
   warningCardHeader,
   successCardHeader,
   dangerCardHeader,

diff --git a/src/ui/assets/jss/material-dashboard-react/components/customInputStyle.js b/src/ui/assets/jss/material-dashboard-react/components/customInputStyle.js
@@ -4,48 +4,49 @@ import {
   successColor,
   grayColor,
   defaultFont,
+  increaseSpecificity,
 } from '../../material-dashboard-react.js';
 
 const customInputStyle = {
-  disabled: {
+  disabled: increaseSpecificity({
     '&:before': {
       backgroundColor: 'transparent !important',
     },
-  },
-  underline: {
+  }),
+  underline: increaseSpecificity({
     '&:hover:not($disabled):before,&:before': {
       borderColor: grayColor[4] + ' !important',
       borderWidth: '1px !important',
     },
     '&:after': {
       borderColor: primaryColor[0],
     },
-  },
-  underlineError: {
+  }),
+  underlineError: increaseSpecificity({
     '&:after': {
       borderColor: dangerColor[0],
     },
-  },
-  underlineSuccess: {
+  }),
+  underlineSuccess: increaseSpecificity({
     '&:after': {
       borderColor: successColor[0],
     },
-  },
-  labelRoot: {
+  }),
+  labelRoot: increaseSpecificity({
     ...defaultFont,
     color: grayColor[3] + ' !important',
     fontWeight: '400',
     fontSize: '14px',
     lineHeight: '1.42857',
     letterSpacing: 'unset',
-  },
-  labelRootError: {
+  }),
+  labelRootError: increaseSpecificity({
     color: dangerColor[0],
-  },
-  labelRootSuccess: {
+  }),
+  labelRootSuccess: increaseSpecificity({
     color: successColor[0],
-  },
-  feedback: {
+  }),
+  feedback: increaseSpecificity({
     position: 'absolute',
     top: '18px',
     right: '0',
@@ -55,16 +56,16 @@ const customInputStyle = {
     height: '24px',
     textAlign: 'center',
     pointerEvents: 'none',
-  },
-  marginTop: {
+  }),
+  marginTop: increaseSpecificity({
     marginTop: '16px',
-  },
-  formControl: {
+  }),
+  formControl: increaseSpecificity({
     paddingBottom: '10px',
     margin: '27px 0 0 0',
     position: 'relative',
     verticalAlign: 'unset',
-  },
+  }),
 };
 
 export default customInputStyle;