Skip to content

Correct key widths #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Correct key widths #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cc9694
fix: wrap key in div to keep size in correct ratio
MiniGod Mar 8, 2019
e829312
fix: always set margin on keys to have consistent sizes on keys
MiniGod Mar 8, 2019
c3afd0f
fix(layouts): correct width of zero to match grid
MiniGod Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 30 additions & 35 deletions src/keyboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
// input(type="text", v-model="keyboardText", v-if="!input")
.keyboard
.line(v-for="(line, index) in keySet", :key="index")
span(v-for="(key, index) in line", :key="index", :class="getClassesOfKey(key)", v-text="getCaptionOfKey(key)", @click="e => clickKey(e, key)", @mousedown="mousedown", :style="getKeyStyle(key)")
div(v-for="(key, index) in line", :key="index", :class="getClassesOfKey(key)", :style="getKeyStyle(key)")
div(v-if="!key.placeholder" v-text="getCaptionOfKey(key)", @click="e => clickKey(e, key)", @mousedown="mousedown")


</template>
Expand Down Expand Up @@ -310,78 +311,76 @@
.line {
display: flex;
justify-content: space-around;
margin-right: -$margin;
&:not(:last-child) {
margin-bottom: $margin;
}
}

.key {
&:not(:last-child) {
margin-right: $margin;
}

flex: $width;
//width: $btnW;
height: $height;
line-height: $height;
overflow: hidden;

vertical-align: middle;
border: 1px solid #ccc;
color: #333;
background-color: #fff;
box-shadow: 0px 2px 2px rgba(0, 0, 0, .6);
border-radius: $radius;
&.half {
flex: $width / 2;
}

font-size: 1.25em;
text-align: center;
white-space: nowrap;
user-select: none;
cursor: pointer;
> div {
height: $height;
line-height: $height;
overflow: hidden;
margin-right: $margin;

vertical-align: middle;
border: 1px solid #ccc;
color: #333;
background-color: #fff;
box-shadow: 0px 2px 2px rgba(0, 0, 0, .6);
border-radius: $radius;

font-size: 1.25em;
text-align: center;
white-space: nowrap;
user-select: none;
cursor: pointer;
}

&.backspace {
&.backspace > div {
background-image: url("./icons/backspace.svg");
background-position: center center;
background-repeat: no-repeat;
background-size: 35%;
}

&.half {
flex: $width / 2;
}

&.control {
&.control > div {
color: #fff;
background-color: #7d7d7d;
border-color: #656565;
}

&.featured {
&.featured > div {
color: #fff;
background-color: #337ab7;
border-color: #2e6da4;
}

&:hover {
&:hover > div {
color: #333;
background-color: #d6d6d6;
border-color: #adadad;
}

&:active {
&:active > div {
transform: scale(.98); // translateY(1px);
color: #333;
background-color: #d4d4d4;
border-color: #8c8c8c;
}

&.activated {
&.activated > div {
color: #fff;
background-color: #5bc0de;
border-color: #46b8da;
}

} // .key
/*
// Apple style
Expand Down Expand Up @@ -425,10 +424,6 @@
flex: $width / 2;
height: $height;
line-height: $height;

&:not(:last-child) {
margin-right: $margin;
}
}


Expand Down
4 changes: 2 additions & 2 deletions src/layouts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = {
"backspace": { func: "backspace", classes: "control"},
"accept": { func: "accept", text: "Close", classes: "control featured"},
"next": { func: "next", text: "Next", classes: "featured"},
"zero": { key: "0", width: 130}
"zero": { key: "0", width: 120}
},

default: [
Expand Down Expand Up @@ -80,7 +80,7 @@ module.exports = {
"backspace": { func: "backspace", classes: "control"},
"accept": { func: "accept", text: "Close", classes: "control featured"},
"next": { func: "next", text: "Next", classes: "control featured"},
"zero": { key: "0", width: 130}
"zero": { key: "0", width: 120}
},

default: [
Expand Down