yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from jorilallo/jori-user-accounts

Browse Source 
Jori user accounts
This commit is contained in:
Jori Lallo
2016-09-13 00:36:18 -07:00
committed by GitHub
parent 7f7fb1f4b0 1a409ad774
commit 780b9c187f
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/components/Layout/Layout.js
View File

@@ -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('/'));
}

7
frontend/scenes/DocumentEdit/DocumentEdit.js
View File

@@ -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();
}
}

14
frontend/styles/fonts.css
View File

@@ -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');