diff --git a/app/javascript/packs/app/constants/colors.js b/app/javascript/packs/app/constants/colors.js index dc17731be..2283c43e9 100644 --- a/app/javascript/packs/app/constants/colors.js +++ b/app/javascript/packs/app/constants/colors.js @@ -7,8 +7,6 @@ export const BORDER_LIGHT_COLOR = "#e3e3e3"; export const WILD_SAND_COLOR = "#f5f5f5"; export const MYSTIC_COLOR = "#eaeff2"; export const ICON_GREEN_COLOR = "#8fd13f"; -export const PRIMARY_GREEN_COLOR = "#8fd13f"; -export const PRIMARY_HOVER_COLOR = "#75b22b"; export const NOTIFICATION_YES = "#5a8921"; export const NOTIFICATION_YES_BORDER = "#4d751c"; export const SIDEBAR_HOVER_GRAY_COLOR = "#D2D2D2"; diff --git a/app/javascript/packs/shared/actions/UsersActions.js b/app/javascript/packs/shared/actions/UsersActions.js index 91a2e4730..8da83d97a 100644 --- a/app/javascript/packs/shared/actions/UsersActions.js +++ b/app/javascript/packs/shared/actions/UsersActions.js @@ -83,12 +83,14 @@ export function changeAssignmentsNotification(status) { payload: status }; } + export function changeAssignmentsNotificationEmail(status) { return { type: CHANGE_ASSIGNMENTS_NOTIFICATION_EMAIL, payload: status }; } + export function changeRecentNotification(status) { return { type: CHANGE_RECENT_NOTIFICATION, diff --git a/app/javascript/packs/src/settings/components/account/InputEnabled.jsx b/app/javascript/packs/src/settings/components/account/InputEnabled.jsx index 2aa6cda3a..2aa7425ce 100644 --- a/app/javascript/packs/src/settings/components/account/InputEnabled.jsx +++ b/app/javascript/packs/src/settings/components/account/InputEnabled.jsx @@ -4,11 +4,7 @@ import styled from "styled-components"; import { FormattedMessage } from "react-intl"; import { FormGroup, FormControl, ControlLabel, Button } from "react-bootstrap"; -import { - BORDER_LIGHT_COLOR, - PRIMARY_GREEN_COLOR, - PRIMARY_HOVER_COLOR -} from "../../../../app/constants/colors"; +import { BORDER_LIGHT_COLOR } from "../../../../app/constants/colors"; const StyledInputEnabled = styled.div` border: 1px solid ${BORDER_LIGHT_COLOR}; @@ -18,15 +14,6 @@ const StyledInputEnabled = styled.div` input { margin-bottom: 15px; } - - .btn-primary { - background-color: ${PRIMARY_GREEN_COLOR}; - border-color: ${PRIMARY_HOVER_COLOR}; - margin-right: 7px; - &:hover { - background-color: ${PRIMARY_HOVER_COLOR}; - } - } `; const ErrorMsg = styled.div`color: red;`; diff --git a/app/javascript/packs/src/settings/components/account/SettingsLeftTab.jsx b/app/javascript/packs/src/settings/components/account/SettingsLeftTab.jsx index c2efb9806..413bf3e52 100644 --- a/app/javascript/packs/src/settings/components/account/SettingsLeftTab.jsx +++ b/app/javascript/packs/src/settings/components/account/SettingsLeftTab.jsx @@ -47,12 +47,12 @@ const MyLinkContainer = styled(LinkContainer)` const SettingsLeftTab = () =>