Skip to content

Commit 733e345

Browse files
committed
Merge pull request #1 from davidenke/develop
update master
2 parents 1ae8156 + 4c2e53d commit 733e345

25 files changed

+1326
-363
lines changed

.npmignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1+
# hidden files
2+
.DS_Store
3+
4+
# generated files
5+
app/app.css
6+
.temp
7+
8+
# folders
19
bower_components
210
node_modules

CHANGELOG.md

100644100755
File mode changed.

LICENSE

100644100755
File mode changed.

bower.json

100644100755
Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
"dist/mdKeyboard.css"
1010
],
1111
"keywords": [
12-
"Angular",
13-
"Material",
14-
"Angular Material Design",
15-
"Onscreen",
16-
"Keyboard",
17-
"VKI",
18-
"Virtual"
12+
"Angular",
13+
"Material",
14+
"Angular Material Design",
15+
"Onscreen",
16+
"Keyboard",
17+
"VKI",
18+
"Virtual"
1919
],
2020
"license": "MIT",
2121
"ignore": [
@@ -26,8 +26,11 @@
2626
"src",
2727
"gulpfile.js"
2828
],
29-
"dependencies": {},
30-
"devDependencies": {
31-
"angular-useragent-parser": "~0.1.0"
32-
}
29+
"dependencies": {
30+
"angular": "^1.4.0",
31+
"angular-material": "^1.0.0",
32+
"angular-useragent-parser": "~0.1.0",
33+
"material-design-icons": "^2.2.3"
34+
},
35+
"devDependencies": {}
3336
}

dist/keyboard-theme.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
md-keyboard.md-THEME_NAME-theme {
2+
background-color: '{{background-50}}';
3+
border-top-color: '{{background-300}}'; }
4+
md-keyboard.md-THEME_NAME-theme .md-subheader {
5+
background-color: '{{background-50}}'; }
6+
md-keyboard.md-THEME_NAME-theme .md-subheader {
7+
color: '{{foreground-1}}'; }

dist/mdKeyboard.css

100644100755
Lines changed: 82 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,83 @@
1-
md-keyboard-container {
1+
md-keyboard {
2+
position: absolute;
3+
left: 0;
4+
right: 0;
5+
bottom: 0;
6+
padding: 8px 16px 88px 16px;
7+
z-index: 110;
8+
border-top-width: 1px;
9+
border-top-style: solid;
10+
transform: translate3d(0, 80px, 0);
11+
transition: all 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
12+
transition-property: transform;
13+
background-color: #FAFAFA;
14+
border-top-color: #E0E0E0; }
15+
md-keyboard.md-has-header {
16+
padding-top: 0; }
17+
md-keyboard.ng-enter {
18+
opacity: 0;
19+
transform: translate3d(0, 100%, 0); }
20+
md-keyboard.ng-enter-active {
21+
opacity: 1;
22+
display: block;
23+
transform: translate3d(0, 80px, 0) !important; }
24+
md-keyboard.ng-leave-active {
25+
transform: translate3d(0, 100%, 0) !important;
26+
transition: all 0.3s cubic-bezier(0.55, 0, 0.55, 0.2); }
27+
md-keyboard .md-subheader {
28+
background-color: transparent;
29+
font-family: Roboto, "Helvetica Neue", sans-serif;
30+
line-height: 56px;
31+
padding: 0;
32+
white-space: nowrap; }
33+
md-keyboard .md-button {
34+
min-width: 100%;
35+
text-transform: none; }
36+
md-keyboard .md-button.key-caps:before {
37+
content: '';
38+
position: absolute;
39+
top: 5px;
40+
left: 5px;
41+
display: inline-block;
42+
width: 3px;
43+
height: 3px;
44+
border-radius: 100%;
45+
background-color: #ccc; }
46+
md-keyboard .md-button.key-caps.locked:before {
47+
background-color: #0f0;
48+
box-shadow: 0 0 3px #adff2f; }
49+
md-keyboard md-inline-icon {
50+
display: inline-block;
51+
height: 24px;
52+
width: 24px;
53+
fill: #444; }
54+
md-keyboard md-list-item {
55+
display: flex;
56+
outline: none; }
57+
md-keyboard md-list-item:hover {
58+
cursor: pointer; }
59+
md-keyboard.md-grid {
60+
padding-left: 24px;
61+
padding-right: 24px;
62+
padding-top: 8px; }
63+
md-keyboard .layout-row > .flex {
64+
border: 4px solid transparent; }
65+
md-keyboard .layout-row > .flex:not(.key-char) {
66+
width: auto; }
67+
md-keyboard .layout-row > .flex.key-bksp, md-keyboard .layout-row > .flex.key-caps {
68+
min-width: 15%; }
69+
md-keyboard .layout-row > .flex.key-tab, md-keyboard .layout-row > .flex.key-shift, md-keyboard .layout-row > .flex.key-enter {
70+
min-width: 10%; }
71+
md-keyboard .layout-row > .flex.key-space {
72+
text-align: center; }
73+
md-keyboard .layout-row > .flex.key-space > span {
74+
max-width: 80%; }
75+
md-keyboard .layout-row > .flex > span {
76+
display: inline-block;
77+
width: 100%; }
78+
md-keyboard .layout-row > .flex > span .md-button {
79+
margin: 0; }
280

3-
}
81+
@media screen and (-ms-high-contrast: active) {
82+
md-keyboard {
83+
border: 1px solid #fff; } }

0 commit comments

Comments
 (0)