Skip to content

Commit bda2eb1

Browse files
authored
Merge pull request wegue-oss#13 from Geolicious/7-link-homepage
fix for wegue-oss#7 link homepage, will then change logo and title to add links...
2 parents fae5122 + b1b72f0 commit bda2eb1

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

src/components/AppHeader.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<!-- slot to inject components at the beginning (before title) -->
1111
<slot name="wgu-tb-start"></slot>
1212

13-
<v-toolbar-title>{{title}}</v-toolbar-title>
13+
<v-toolbar-title><span v-html="title"/></v-toolbar-title>
1414

1515
<!-- slot to inject components after the title text -->
1616
<slot name="wgu-tb-after-title"></slot>

src/components/AppLogo.vue

+20-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
<template>
2+
<div>
3+
<!-- Logo content maybe either avatar and/or text -->
4+
<v-avatar
5+
v-if="logoSrc"
6+
:size="logoSize"
7+
:tile="true"
8+
class="wgu-app-logo"
9+
>
10+
<img :src="logoSrc" alt="App Logo">
11+
</v-avatar>
212

3-
<v-avatar
4-
v-if="!!logoSrc"
5-
:size="logoSize"
6-
:tile="true"
7-
class="wgu-app-logo"
8-
>
9-
<img :src="logoSrc" alt="App Logo">
10-
</v-avatar>
13+
<div
14+
v-if="logoText"
15+
class="wgu-app-logo"
16+
>
17+
<span v-html="logoText"/>
18+
</div>
19+
</div>
1120

1221
</template>
1322

@@ -18,7 +27,8 @@ export default {
1827
data () {
1928
return {
2029
logoSrc: this.$appConfig.logo,
21-
logoSize: this.$appConfig.logoSize
30+
logoSize: this.$appConfig.logoSize,
31+
logoText: this.$appConfig.logoText
2232
}
2333
}
2434
}
@@ -27,7 +37,7 @@ export default {
2737
<!-- Add "scoped" attribute to limit CSS to this component only -->
2838
<style>
2939

30-
.v-avatar.v-avatar--tile.wgu-app-logo {
40+
.v-avatar.v-avatar--tile.wgu-app-logo, div.wgu-app-logo {
3141
position: absolute;
3242
z-index: 2;
3343
}

0 commit comments

Comments
 (0)