Skip to content

Commit

Permalink
Fix: Help display
Browse files Browse the repository at this point in the history
  • Loading branch information
sebu77 committed Jul 19, 2015
1 parent 62d2d35 commit ace6632
Show file tree
Hide file tree
Showing 7 changed files with 1,069 additions and 114 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-hotkeys",
"version": "1.4.5",
"version": "1.4.6",
"main": [
"build/hotkeys.min.js",
"build/hotkeys.min.css"
Expand Down
30 changes: 21 additions & 9 deletions build/hotkeys.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
/*!
* angular-hotkeys v1.4.5
* https://chieffancypants.github.io/angular-hotkeys
* Copyright (c) 2015 Wes Cruver
* License: MIT
*/
/*!
* angular-hotkeys v1.4.5
* https://chieffancypants.github.io/angular-hotkeys
* Copyright (c) 2014 Wes Cruver
Expand Down Expand Up @@ -36,28 +42,32 @@
font-weight: bold;
text-align: center;
font-size: 1.2em;
padding: 36px 0px
}

.cfp-hotkeys {
width: 100%;
height: 100%;
display: table-cell;
vertical-align: middle;
overflow-y: auto;
}

.cfp-hotkeys table {
margin: auto;
color: #333;
.cfp-hotkeys > ul {
list-style: none;
height: 66%;
padding: 0px 50px;
-webkit-column-count: 4;
-moz-column-count: 4;
column-count: 4;
}

.cfp-content {
display: table-cell;
vertical-align: middle;
.cfp-hotkeys > ul li {

}

.cfp-hotkeys-keys {
display: table-cell;
padding: 5px;
text-align: right;
width: 105px;
}

.cfp-hotkeys-key {
Expand All @@ -74,6 +84,8 @@
}

.cfp-hotkeys-text {
display: table-cell;
vertical-align: middle;
padding-left: 10px;
font-size: 1em;
}
Expand Down
20 changes: 13 additions & 7 deletions build/hotkeys.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
/*!
* angular-hotkeys v1.4.5
* https://chieffancypants.github.io/angular-hotkeys
* Copyright (c) 2015 Wes Cruver
* License: MIT
*/
/*!
* angular-hotkeys v1.4.5
* https://chieffancypants.github.io/angular-hotkeys
* Copyright (c) 2014 Wes Cruver
Expand Down Expand Up @@ -38,14 +44,14 @@
*/
this.template = '<div class="cfp-hotkeys-container fade" ng-class="{in: helpVisible}" style="display: none;"><div class="cfp-hotkeys">' +
'<h4 class="cfp-hotkeys-title">{{ title }}</h4>' +
'<table><tbody>' +
'<tr ng-repeat="hotkey in hotkeys | filter:{ description: \'!$$undefined$$\' }">' +
'<td class="cfp-hotkeys-keys">' +
'<ul>' +
'<li ng-repeat="hotkey in hotkeys | filter:{ description: \'!$$undefined$$\' }">' +
'<span class="cfp-hotkeys-keys">' +
'<span ng-repeat="key in hotkey.format() track by $index" class="cfp-hotkeys-key">{{ key }}</span>' +
'</td>' +
'<td class="cfp-hotkeys-text">{{ hotkey.description }}</td>' +
'</tr>' +
'</tbody></table>' +
'</span>' +
'<span class="cfp-hotkeys-text">{{ hotkey.description }}</span>' +
'</li>' +
'</ul>' +
'<div class="cfp-hotkeys-close" ng-click="toggleCheatSheet()">×</div>' +
'</div></div>';

Expand Down
6 changes: 2 additions & 4 deletions build/hotkeys.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build/hotkeys.min.js

Large diffs are not rendered by default.

30 changes: 21 additions & 9 deletions src/hotkeys.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*!
* angular-hotkeys v1.4.5
* https://chieffancypants.github.io/angular-hotkeys
* Copyright (c) 2014 Wes Cruver
* License: MIT
*/
.cfp-hotkeys-container {
display: table !important;
position: fixed;
Expand Down Expand Up @@ -30,28 +36,32 @@
font-weight: bold;
text-align: center;
font-size: 1.2em;
padding: 36px 0px
}

.cfp-hotkeys {
width: 100%;
height: 100%;
display: table-cell;
vertical-align: middle;
overflow-y: auto;
}

.cfp-hotkeys table {
margin: auto;
color: #333;
.cfp-hotkeys > ul {
list-style: none;
height: 66%;
padding: 0px 50px;
-webkit-column-count: 4;
-moz-column-count: 4;
column-count: 4;
}

.cfp-content {
display: table-cell;
vertical-align: middle;
.cfp-hotkeys > ul li {

}

.cfp-hotkeys-keys {
display: table-cell;
padding: 5px;
text-align: right;
width: 105px;
}

.cfp-hotkeys-key {
Expand All @@ -68,6 +78,8 @@
}

.cfp-hotkeys-text {
display: table-cell;
vertical-align: middle;
padding-left: 10px;
font-size: 1em;
}
Expand Down
Loading

0 comments on commit ace6632

Please sign in to comment.