diff --git a/client/.eslintrc.json b/client/.eslintrc.json index 3affd1f6..60ed4acd 100644 --- a/client/.eslintrc.json +++ b/client/.eslintrc.json @@ -1,4 +1,5 @@ { + "parser": "babel-eslint", "extends": [ "airbnb", "prettier", @@ -45,7 +46,8 @@ "trailingComma": "es5", "singleQuote": true } - ] + ], + "react/state-in-constructor": [0, "always"] }, "plugins": [ "react", diff --git a/client/lessVariables.js b/client/lessVariables.js index 701db48c..c0fef3e8 100644 --- a/client/lessVariables.js +++ b/client/lessVariables.js @@ -1,8 +1,6 @@ module.exports = { '@primary-color': '#E8505B', '@white': '#FFFFFF', - '@light-grey': '#F0F2F9', - '@grey': '#E3E1E2', '@btn-font-weight': '400', '@btn-primary-color': '@primary-color', '@btn-danger-bg': '@primary-color', @@ -10,5 +8,5 @@ module.exports = { '@btn-border-radius-base': '5px', '@pagination-item-bg': '#E3E1E2', '@pagination-item-bg-active': '@primary-color', - '@pagination-item-link-bg': '@light-grey', + '@pagination-item-link-bg': '#F0F2F9', }; diff --git a/client/src/components/AdminCard/index.js b/client/src/components/AdminCard/index.js index 0dff1f46..b2d58574 100644 --- a/client/src/components/AdminCard/index.js +++ b/client/src/components/AdminCard/index.js @@ -36,7 +36,9 @@ const AdminCard = ({ )}
{student && (