From 2d4eb154dfe29eef3773598a5b61bdbe1c17b4f3 Mon Sep 17 00:00:00 2001 From: Samuel Meuli Date: Mon, 15 Oct 2018 20:49:22 +0200 Subject: [PATCH 1/2] fix URL encoding of site switcher arrows (#159) --- assets/src/sass/styles.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/sass/styles.scss b/assets/src/sass/styles.scss index 1c91bd81..b1ee0b44 100644 --- a/assets/src/sass/styles.scss +++ b/assets/src/sass/styles.scss @@ -42,8 +42,8 @@ body { font: 400 16px "overpass", sans-serif; color: #222; text-align: center; p nav li.logo a { color: #533feb; font-size: 16px; } nav li.logo a:hover { color: #222; } - nav li.sites { background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg aria-hidden='true' role='img' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3Cpath fill='#533feb' d='M151.5 347.8L3.5 201c-4.7-4.7-4.7-12.3 0-17l19.8-19.8c4.7-4.7 12.3-4.7 17 0L160 282.7l119.7-118.5c4.7-4.7 12.3-4.7 17 0l19.8 19.8c4.7 4.7 4.7 12.3 0 17l-148 146.8c-4.7 4.7-12.3 4.7-17 0z'%3E%3C/path%3E%3C/svg%3E") 97% 8px no-repeat; border-radius: 4px; padding: 8px; background-size: 10px auto; } - nav li.sites:hover { background: #533feb url("data:image/svg+xml;charset=utf8,%3Csvg aria-hidden='true' role='img' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3Cpath fill='#fff' d='M168.5 164.2l148 146.8c4.7 4.7 4.7 12.3 0 17l-19.8 19.8c-4.7 4.7-12.3 4.7-17 0L160 229.3 40.3 347.8c-4.7 4.7-12.3 4.7-17 0L3.5 328c-4.7-4.7-4.7-12.3 0-17l148-146.8c4.7-4.7 12.3-4.7 17 0z'%3E%3C/path%3E%3C/svg%3E") 97% 8px no-repeat; background-size: 10px auto; } + nav li.sites { background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg aria-hidden='true' role='img' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3Cpath fill='%23533feb' d='M151.5 347.8L3.5 201c-4.7-4.7-4.7-12.3 0-17l19.8-19.8c4.7-4.7 12.3-4.7 17 0L160 282.7l119.7-118.5c4.7-4.7 12.3-4.7 17 0l19.8 19.8c4.7 4.7 4.7 12.3 0 17l-148 146.8c-4.7 4.7-12.3 4.7-17 0z'%3E%3C/path%3E%3C/svg%3E") 97% 8px no-repeat; border-radius: 4px; padding: 8px; background-size: 10px auto; } + nav li.sites:hover { background: #533feb url("data:image/svg+xml;charset=utf8,%3Csvg aria-hidden='true' role='img' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3Cpath fill='%23fff' d='M168.5 164.2l148 146.8c4.7 4.7 4.7 12.3 0 17l-19.8 19.8c-4.7 4.7-12.3 4.7-17 0L160 229.3 40.3 347.8c-4.7 4.7-12.3 4.7-17 0L3.5 328c-4.7-4.7-4.7-12.3 0-17l148-146.8c4.7-4.7 12.3-4.7 17 0z'%3E%3C/path%3E%3C/svg%3E") 97% 8px no-repeat; background-size: 10px auto; } nav li ul { display: none; position: absolute; z-index: 1001; width: 100%; background: #533feb; border-radius: 4px; padding: 8px 0; margin: 0 0 0 -8px; } nav li:hover ul { display: block; box-shadow: 0 2px 8px 0 rgba(34,34,34,.10); } nav li.sites:hover a { color: #fff; } From 43160ea2886b7d35ce1ee9908f18e497ed1aaeef Mon Sep 17 00:00:00 2001 From: Samuel Meuli Date: Mon, 15 Oct 2018 22:31:23 +0200 Subject: [PATCH 2/2] fix navigation with arrow keys (#160) * fix navigation with arrow keys * replace deprecated KeyboardEvent.keyCode --- assets/src/js/components/DatePicker.js | 4 ++-- assets/src/js/components/SiteSettings.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/src/js/components/DatePicker.js b/assets/src/js/components/DatePicker.js index 8ffadf06..d3dce202 100644 --- a/assets/src/js/components/DatePicker.js +++ b/assets/src/js/components/DatePicker.js @@ -169,7 +169,7 @@ class DatePicker extends Component { @bind handleKeyPress(evt) { // Don't handle input when the user is in a text field or text area. - let tag = event.target.tagName; + let tag = evt.target.tagName; if(tag === "INPUT" || tag === "TEXTAREA") { return; } @@ -178,7 +178,7 @@ class DatePicker extends Component { let diff = this.state.endDate - this.state.startDate + 1000; let newStartDate, newEndDate; - switch(evt.keyCode) { + switch(evt.which) { // left-arrow case 37: newStartDate = new Date(+this.state.startDate - diff) diff --git a/assets/src/js/components/SiteSettings.js b/assets/src/js/components/SiteSettings.js index 502ed211..943fe789 100644 --- a/assets/src/js/components/SiteSettings.js +++ b/assets/src/js/components/SiteSettings.js @@ -89,7 +89,7 @@ class SiteSettings extends Component { @bind handleKeydownEvent(evt) { // close modal when pressing ESC - if(evt.keyCode == 27) { + if(evt.which == 27) { this.props.onClose() } }