Skip to content

Commit c0cac4f

Browse files
set theme
1 parent f7929e9 commit c0cac4f

File tree

5 files changed

+49
-7
lines changed

5 files changed

+49
-7
lines changed

src/App.vue

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<template>
22
<v-app id="keep-learning-app">
3-
<component v-if="initDone" :is="layout"/>
3+
<component
4+
v-if="initDone"
5+
:is="layout"
6+
class="fill-height"
7+
/>
48
<v-progress-linear
59
v-else
610
indeterminate
@@ -9,16 +13,20 @@
913
<v-snackbar
1014
:value="messageShow"
1115
@input="setMessage"
16+
:color="messageColor"
1217
>
1318
{{ messageText }}
1419
<template #action="{ attrs }">
1520
<v-btn
16-
color="pink"
21+
color="black"
1722
text
23+
icon
1824
v-bind="attrs"
1925
@click="hideMessage"
2026
>
21-
Close
27+
<v-icon>
28+
mdi-close
29+
</v-icon>
2230
</v-btn>
2331
</template>
2432
</v-snackbar>
@@ -44,7 +52,8 @@ import { noAuthenRoutes } from './router'
4452
}),
4553
...mapState('message', {
4654
messageShow: 'show',
47-
messageText: 'text'
55+
messageText: 'text',
56+
messageColor: 'color'
4857
})
4958
},
5059
methods: {
@@ -123,6 +132,7 @@ export default class App extends Vue {
123132
*/
124133
messageShow!: boolean
125134
messageText!: string
135+
messageColor!: string
126136
showMessage!: CallableFunction
127137
hideMessage!: CallableFunction
128138

src/plugins/vuetify.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
import Vue from 'vue'
22
import Vuetify from 'vuetify/lib/framework'
3+
import colors from 'vuetify/lib/util/colors'
34

45
Vue.use(Vuetify)
56

67
export default new Vuetify({
8+
theme: {
9+
options: {
10+
customProperties: true
11+
},
12+
themes: {
13+
light: {
14+
primary: {
15+
base: colors.pink.lighten1
16+
},
17+
secondary: {
18+
base: colors.pink.lighten2
19+
},
20+
anchor: colors.pink.darken2,
21+
success: colors.green.base,
22+
error: colors.red.base
23+
}
24+
}
25+
}
726
})

src/store/message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const message: Module<MessageState, RootState> = {
1313
state: {
1414
show: false,
1515
text: '',
16-
color: 'success'
16+
color: 'primary'
1717
},
1818

1919
mutations: {

src/views/classroom/ClassroomExercisesReadingTeacher.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
name: 'ReadingExerciseDetail',
5858
params: { pk: exercise.pk }
5959
}"
60+
class="exercise-links"
6061
>
6162
{{ exercise.identifier }}
6263
</router-link>
@@ -236,5 +237,7 @@ export default class ClassroomExercisesReadingTeacher extends Vue {
236237
</script>
237238

238239
<style scoped lang="scss">
239-
240+
.exercise-links {
241+
text-decoration: none;
242+
}
240243
</style>

src/views/classroom/ClassroomStudents.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@
6666
no-data-text="This class doesn't have any students yet."
6767
class="mt-3 elevation-2"
6868
>
69+
<!-- eslint-disable-next-line -->
70+
<template #item.name="{ item }">
71+
<KLAvatar
72+
:user="item"
73+
size="32"
74+
></KLAvatar>
75+
<span class="ml-5">{{ item.name }}</span>
76+
</template>
6977
<!-- eslint-disable-next-line -->
7078
<template #item.manage="{ item }">
7179
<v-menu
@@ -138,6 +146,7 @@ import { assertErrCode, status } from '@/utils/status-codes'
138146
import { Vue, Component } from 'vue-property-decorator'
139147
import { mapMutations, mapState } from 'vuex'
140148
import KLDialogConfirm from '@/components/KLDialogConfirm.vue'
149+
import KLAvatar from '@/components/KLAvatar.vue'
141150
import { Api } from '@/api'
142151
143152
@Component({
@@ -152,7 +161,8 @@ import { Api } from '@/api'
152161
})
153162
},
154163
components: {
155-
KLDialogConfirm
164+
KLDialogConfirm,
165+
KLAvatar
156166
}
157167
})
158168
export default class ClassroomStudents extends Vue {

0 commit comments

Comments
 (0)