Skip to content
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

Jump to bottom

fix: restore QMK icon #1319

Merged
merged 1 commit into from
Oct 28, 2023
Merged

fix: restore QMK icon #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 assets/qmk_icon_36.png → public/qmk_icon_36.png
View file
Open in desktop
File renamed without changes
0 assets/qmk_icon_512.png → public/qmk_icon_512.png
View file
Open in desktop
File renamed without changes
57 changes: 33 additions & 24 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p class="random-potato">{{ potatoFact }}</p>
</header>
<router-view />
<spinner :isVisible="showSpinner" :status="spinnerMsg" />
<spinner :is-visible="showSpinner" :status="spinnerMsg" />
<InfoBar :msg="message" />
</div>
<slideout-panel></slideout-panel>
Expand All @@ -18,8 +18,8 @@
<div
class="help"
:class="helpClasses"
@click="toggleTutorial"
:title="$t('help.label')"
@click="toggleTutorial"
@mouseenter="
setMessage($t('help.label'));
hover = true;
Expand All @@ -36,9 +36,9 @@
size="3x"
/>
<img
v-show="snowflakes && !tutorialEnabled"
class="santa-hat"
src="../assets/Santa_hat.svg"
v-show="snowflakes && !tutorialEnabled"
alt="Santa Hat by Theresa Knott [Public domain], via Wikimedia Commons"
/>
<font-awesome-icon
Expand All @@ -48,9 +48,9 @@
size="3x"
/>
<img
v-show="snowflakes && tutorialEnabled"
class="jinglebell"
src="../assets/jinglebell.svg"
v-show="snowflakes && tutorialEnabled"
alt="Jingle Bell SVG Icon made from Icon Fonts is licensed by CC BY 3.0"
/>
</div>
Expand Down Expand Up @@ -97,6 +97,26 @@ export default {
hover: false
};
},
computed: {
...mapGetters('keymap', ['isDirty']),
...mapState([
'showSpinner',
'spinnerMsg',
'message',
'tutorialEnabled',
'snowflakes'
]),
showInfoBar() {
return this.message !== '';
},
helpClasses() {
var classes = [];
if (this.hover) {
classes.push('faa-tada', 'animated-hover');
}
return classes.join(' ');
}
},
async beforeMount() {
await this.appLoad();
this.randomPotatoFact();
Expand All @@ -122,26 +142,6 @@ export default {
// remove event listener
window.removeEventListener('beforeunload', this.showConfirmationPrompt);
},
computed: {
...mapGetters('keymap', ['isDirty']),
...mapState([
'showSpinner',
'spinnerMsg',
'message',
'tutorialEnabled',
'snowflakes'
]),
showInfoBar() {
return this.message !== '';
},
helpClasses() {
var classes = [];
if (this.hover) {
classes.push('faa-tada', 'animated-hover');
}
return classes.join(' ');
}
},
methods: {
...mapMutations([
'setShowSpinner',
Expand Down Expand Up @@ -236,6 +236,15 @@ export default {
transform: rotate(-9deg);
}

.qmk-logo {
grid-column: qmk-logo;
background-image: url('/qmk_icon_36.png');
width: 36px;
height: 36px;
transform: scale(0.777777);
margin-top: 2px;
}

/* TADA - from https://l-lin.github.io/font-awesome-animation/ */
@keyframes tada {
0% {
Expand Down
8 changes: 0 additions & 8 deletions src/scss/status-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@
grid-template: 1fr / [qmk-logo] auto [qmk-app-name] auto [api-version];
}

.qmk-logo {
grid-column: qmk-logo;
background-image: url('../assets/qmk_icon_36.png');
width: 36px;
height: 36px;
transform: scale(0.777777);
margin-top: 2px;
}
.qmk-app-name {
grid-column: qmk-app-name;
color: #fff;
Expand Down
17 changes: 0 additions & 17 deletions vue.config.js.old
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2749,9 +2749,9 @@ camelcase@^6.0.0:
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==

caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297:
version "1.0.30001383"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001383.tgz"
integrity sha512-swMpEoTp5vDoGBZsYZX7L7nXHe6dsHxi9o6/LKf/f0LukVtnrxly5GVb/fWdCDTqi/yw6Km6tiJ0pmBacm0gbg==
version "1.0.30001555"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001555.tgz"
integrity sha512-NzbUFKUnJ3DTcq6YyZB6+qqhfD112uR3uoEnkmfzm2wVzUNsFkU7AwBjKQ654Sp5cau0JxhFyRSn/tQZ+XfygA==

caseless@~0.12.0:
version "0.12.0"
Expand Down
Loading