minor bugs - ready to be deployed

creativetimofficial · Jun 12, 2018 · b3e48d3 · b3e48d3
1 parent c339574
commit b3e48d3
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 4 deletions.
diff --git a/src/assets/jss/material-kit-react/components/customDropdownStyle.jsx b/src/assets/jss/material-kit-react/components/customDropdownStyle.jsx
@@ -1,7 +1,17 @@
 import {
   defaultFont,
   primaryColor,
-  primaryBoxShadow
+  primaryBoxShadow,
+  infoColor,
+  infoBoxShadow,
+  successColor,
+  successBoxShadow,
+  warningColor,
+  warningBoxShadow,
+  dangerColor,
+  dangerBoxShadow,
+  roseColor,
+  roseBoxShadow,
 } from "assets/jss/material-kit-react.jsx";
 
 const customDropdownStyle = theme => ({
@@ -70,6 +80,41 @@ const customDropdownStyle = theme => ({
       ...primaryBoxShadow
     }
   },
+  infoHover: {
+    "&:hover": {
+      backgroundColor: infoColor,
+      color: "#FFFFFF",
+      ...infoBoxShadow
+    }
+  },
+  successHover: {
+    "&:hover": {
+      backgroundColor: successColor,
+      color: "#FFFFFF",
+      ...successBoxShadow
+    }
+  },
+  warningHover: {
+    "&:hover": {
+      backgroundColor: warningColor,
+      color: "#FFFFFF",
+      ...warningBoxShadow
+    }
+  },
+  dangerHover: {
+    "&:hover": {
+      backgroundColor: dangerColor,
+      color: "#FFFFFF",
+      ...dangerBoxShadow
+    }
+  },
+  roseHover: {
+    "&:hover": {
+      backgroundColor: roseColor,
+      color: "#FFFFFF",
+      ...roseBoxShadow
+    }
+  },
   dropdownItemRTL: {
     textAlign: "right"
   },

diff --git a/src/assets/jss/material-kit-react/views/landingPage.jsx b/src/assets/jss/material-kit-react/views/landingPage.jsx
@@ -2,7 +2,7 @@ import { container, title } from "assets/jss/material-kit-react.jsx";
 
 const landingPageStyle = {
   container: {
-    zIndex: "1",
+    zIndex: "12",
     color: "#FFFFFF",
     ...container
   },

diff --git a/src/components/CustomDropdown/CustomDropdown.jsx b/src/components/CustomDropdown/CustomDropdown.jsx
@@ -147,7 +147,7 @@ CustomDropdown.defaultProps = {
 
 CustomDropdown.propTypes = {
   classes: PropTypes.object.isRequired,
-  hoverColor: PropTypes.oneOf(["primary", "black"]),
+  hoverColor: PropTypes.oneOf(["black", "primary", "info", "success", "warning", "danger", "rose"]),
   buttonText: PropTypes.node,
   buttonIcon: PropTypes.func,
   dropdownList: PropTypes.array,

diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
@@ -74,7 +74,7 @@ class Header extends React.Component {
       [classes.fixed]: fixed
     });
     const brandComponent = (
-      <Button href="#" className={classes.title}>
+      <Button className={classes.title}>
         {brand}
       </Button>
     );

diff --git a/src/views/Components/Sections/SectionNavbars.jsx b/src/views/Components/Sections/SectionNavbars.jsx
@@ -105,6 +105,7 @@ class SectionNavbars extends React.Component {
                     <ListItem className={classes.listItem}>
                       <CustomDropdown
                         left
+                        hoverColor="info"
                         dropdownHeader="Dropdown Header"
                         buttonIcon={Settings}
                         buttonProps={{