Merge pull request #112 from kaganjd/master

Add shortcuts to shortcut modal
This commit is contained in:
Cassie Tarakajian 2016-09-28 15:20:38 -04:00 committed by GitHub
commit 5037e6c27f
2 changed files with 25 additions and 8 deletions

View file

@ -28,17 +28,34 @@ class KeyboardShortcutModal extends React.Component {
<span>Save</span> <span>Save</span>
</li> </li>
<li className="keyboard-shortcut-item"> <li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">Command + [</span> <span className="keyboard-shortcut__command">
<span>Indent Code Right</span> {this.isMac ? 'Command + [' : 'Control + ['}
</li> </span>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">Command + ]</span>
<span>Indent Code Left</span> <span>Indent Code Left</span>
</li> </li>
<li className="keyboard-shortcut-item"> <li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">Command + /</span> <span className="keyboard-shortcut__command">
{this.isMac ? 'Command + ]' : 'Control + ]'}
</span>
<span>Indent Code Right</span>
</li>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">
{this.isMac ? 'Command + /' : 'Control + /'}
</span>
<span>Comment Line</span> <span>Comment Line</span>
</li> </li>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">
{this.isMac ? 'Command + Enter' : 'Control + Enter'}</span>
<span>Start Sketch</span>
</li>
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">
{this.isMac ? 'Command + Shift + Enter' : 'Control + Shift + Enter'}
</span>
<span>Stop Sketch</span>
</li>
</ul> </ul>
</section> </section>
); );

View file

@ -80,7 +80,7 @@
.keyboard-shortcuts { .keyboard-shortcuts {
@extend %modal; @extend %modal;
padding: #{20 / $base-font-size}rem; padding: #{20 / $base-font-size}rem;
width: #{400 / $base-font-size}rem; width: #{450 / $base-font-size}rem;
} }
.keyboard-shortcuts__header { .keyboard-shortcuts__header {
@ -104,7 +104,7 @@
} }
.keyboard-shortcut__command { .keyboard-shortcut__command {
width: 40%; width: 50%;
font-weight: bold; font-weight: bold;
text-align: right; text-align: right;
padding-right: #{10 / $base-font-size}rem; padding-right: #{10 / $base-font-size}rem;