Merge pull request #244 from olinlibrary/osteele/dev

Protected events
olin-build · May 19, 2018 · e3b8af9 · e3b8af9
2 parents a65d446 + 550a3fa
commit e3b8af9
Show file tree

Hide file tree

Showing 18 changed files with 1,172 additions and 176 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -13,7 +13,6 @@ globals:
 rules:
   # Intentional exceptions to Airbnb rules:
   no-alert: off  # currently used in the UI
-  no-plusplus: [error, allowForLoopAfterthoughts: true]
   no-underscore-dangle: [error, allow: [__REDUX_DEVTOOLS_EXTENSION_COMPOSE__]]
   no-unused-vars: [error, argsIgnorePattern: "^_" ]
   react/jsx-no-target-blank: off
@@ -24,7 +23,6 @@ rules:
   no-restricted-globals: warn
   react/no-find-dom-node: warn
   react/prop-types: off           # TODO: #123
-  react/require-default-props: warn
 
   # TODO: #118 accessibility
   jsx-a11y/anchor-is-valid: off

diff --git a/public/css/app.css b/public/css/app.css
@@ -343,7 +343,7 @@ span.label {
     margin: 0.3rem 0.2em;
 }
 
-.button.label:hover:not(.no-hover) {
+.button.label:hover:not(.disabled):not(.no-hover) {
     background-color: #14679e;
     color: #fefefe;
     cursor: pointer;
@@ -354,13 +354,13 @@ span.label {
 }
 
 .add-edit-filters .button.label,
-.add-edit-filters .button.label:not(.selected):not(.no-hover):hover {
+.add-edit-filters .button.label:not(.selected):not(.disabled):not(.no-hover):hover {
     background-color: #14679e !important;
     color: #fefefe !important;
 }
 
 .add-edit-filters .button.label:not(.selected),
-.add-edit-filters .button.label.selected:not(.no-hover):hover {
+.add-edit-filters .button.label.selected:not(.disabled):not(.no-hover):hover {
     background-color: white !important;
     border-color: #14679e !important;
     color: #14679e !important;