Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Reflect cmd to ctrl bindings in the UI on windows
The `cmd` / `ctrl` modifier is now defined in a CSS class for the UI.
  • Loading branch information
Fishrock123 committed Feb 4, 2014
1 parent 195adee commit 965531a
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 9 deletions.
18 changes: 9 additions & 9 deletions build/index.html
Expand Up @@ -256,17 +256,17 @@

<div class="menu-item red" id="save-item">
<span buttontext>Save</span>
<div class="shortcut"><span class="modifier"></span>S</div>
<div class="shortcut"><span class="modifier"></span>S</div>
</div>

<div class="menu-item red shortcut" id="save-as-item">Save as...
<div class="shortcut"><span class="modifier"></span>S</div>
<div class="shortcut"><span class="modifier"></span>S</div>
</div>

<div class="separator"><div class="separator-line"></div></div>

<div class="menu-item red shortcut" id="open-item">Open...
<div class="shortcut"><span class="modifier"></span>O</div>
<div class="shortcut"><span class="modifier"></span>O</div>
</div>

<div class="menu-item red" id="open-from-hd-item">Open from hard drive...
Expand Down Expand Up @@ -304,11 +304,11 @@
<div class="menu-dropdown with-shortcuts" id="edit-menu-dropdown">

<div class="menu-item yellow shortcut" id="undo-item">Undo
<div class="shortcut"><span class="modifier"></span>Z</div>
<div class="shortcut"><span class="modifier"></span>Z</div>
</div>

<div class="menu-item yellow shortcut" id="redo-item">Redo
<div class="shortcut"><span class="modifier"></span>Z</div>
<div class="shortcut"><span class="modifier"></span>Z</div>
</div>

<div class="menu-item yellow shortcut" id="visual-history">Visual History
Expand All @@ -318,23 +318,23 @@
<div class="separator"><div class="separator-line"></div></div>

<div class="menu-item yellow shortcut" id="cut-item">Cut
<div class="shortcut"><span class="modifier"></span>X</div>
<div class="shortcut"><span class="modifier"></span>X</div>
</div>

<div class="menu-item yellow shortcut" id="copy-item">Copy
<div class="shortcut"><span class="modifier"></span>C</div>
<div class="shortcut"><span class="modifier"></span>C</div>
</div>

<div class="menu-item yellow shortcut" id="paste-item">Paste
<div class="shortcut"><span class="modifier"></span>V</div>
<div class="shortcut"><span class="modifier"></span>V</div>
</div>

<div class="menu-item yellow shortcut" id="delete-item">Delete
<div class="shortcut"><span class="modifier"></span></div>
</div>

<div class="menu-item yellow shortcut bottom" id="select-all-item">Select all
<div class="shortcut"><span class="modifier"></span>A</div>
<div class="shortcut"><span class="modifier"></span>A</div>
</div>

</div>
Expand Down
1 change: 1 addition & 0 deletions src/coffee/ui/hotkeys.coffee
Expand Up @@ -190,6 +190,7 @@ ui.hotkeys =
if ~navigator.appVersion.indexOf("Win")
console.log 'windows'
@modifierCodes[17] = 'cmd'
dom.body?.setAttribute 'os', 'windows'

@use "app"

Expand Down
16 changes: 16 additions & 0 deletions src/less/ui.less
Expand Up @@ -89,6 +89,22 @@ body {
cursor: none!important;
}
}

.⌘ {
&:after {
content: '';
}
}

&[os="windows"] {
.⌘ {
&:after {
content: 'ctrl';
margin: auto 2px;
letter-spacing: -0.01em;
}
}
}
}

div#canvas {
Expand Down

0 comments on commit 965531a

Please sign in to comment.