From 161fdea8667d2070ffb191284dba1b3dbafb1672 Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Tue, 13 Sep 2016 00:33:53 -0700 Subject: [PATCH 1/3] Fix keyboard shortcuts --- frontend/components/Layout/Layout.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/components/Layout/Layout.js b/frontend/components/Layout/Layout.js index 891f2cb74..ef05bcd49 100644 --- a/frontend/components/Layout/Layout.js +++ b/frontend/components/Layout/Layout.js @@ -36,13 +36,13 @@ class Layout extends React.Component { @keydown(['/', 't']) search() { - if (!this.props.user) return; + // if (!this.props.user) return; _.defer(() => browserHistory.push('/search')); } @keydown(['d']) dashboard() { - if (!this.props.user) return; + // if (!this.props.user) return; _.defer(() => browserHistory.push('/')); } From 9d2f415bf4f71d762ed5c2179563bd100497dbbe Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Tue, 13 Sep 2016 00:34:01 -0700 Subject: [PATCH 2/3] lint --- frontend/scenes/DocumentEdit/DocumentEdit.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/scenes/DocumentEdit/DocumentEdit.js b/frontend/scenes/DocumentEdit/DocumentEdit.js index c191ebfc6..2aef063c6 100644 --- a/frontend/scenes/DocumentEdit/DocumentEdit.js +++ b/frontend/scenes/DocumentEdit/DocumentEdit.js @@ -79,18 +79,17 @@ class DocumentEdit extends Component { if (key) { // Cmd + Enter - if(key.key === 'Enter' && (key.metaKey || key.ctrl.Key)) { + if (key.key === 'Enter' && (key.metaKey || key.ctrl.Key)) { this.onSave(); } // Cmd + Esc - if(key.key === 'Escape' && (key.metaKey || key.ctrl.Key)) { + if (key.key === 'Escape' && (key.metaKey || key.ctrl.Key)) { this.onCancel(); } // Cmd + m - console.log(key) - if(key.key === 'P' && key.shiftKey && (key.metaKey || key.ctrl.Key)) { + if (key.key === 'P' && key.shiftKey && (key.metaKey || key.ctrl.Key)) { this.store.togglePreview(); } } From 1a409ad774fd01fe514767f69093cc4e953e7a27 Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Tue, 13 Sep 2016 00:34:19 -0700 Subject: [PATCH 3/3] Added lighter font --- frontend/styles/fonts.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/frontend/styles/fonts.css b/frontend/styles/fonts.css index cb4186354..427c3a539 100644 --- a/frontend/styles/fonts.css +++ b/frontend/styles/fonts.css @@ -12,6 +12,20 @@ font-style: normal; } +@font-face { + font-family: 'Atlas Grotesk'; + src: url('../fonts/atlas/AtlasGrotesk-Light-Web.woff') format('woff'); + font-weight: lighter; + font-style: normal; +} + +@font-face { + font-family: 'Atlas Grotesk'; + src: url('../fonts/atlas/AtlasGrotesk-LightItalic-Web.woff') format('woff'); + font-weight: lighter; + font-style: italic; +} + @font-face { font-family: 'Atlas Grotesk'; src: url('../fonts/atlas/AtlasGrotesk-RegularItalic-Web.woff') format('woff');