File tree Expand file tree Collapse file tree 4 files changed +101
-31
lines changed Expand file tree Collapse file tree 4 files changed +101
-31
lines changed Original file line number Diff line number Diff line change @@ -276,7 +276,6 @@ export default class CalendarBar extends Vue {
276
276
background : rgba (0 , 0 , 0 , 0 );
277
277
height : 68px ;
278
278
min-width : 12px ;
279
- font-family : ' Noto Sans JP' , sans-serif ;
280
279
281
280
.title {
282
281
color : $color-base-color-01 ;
@@ -308,12 +307,12 @@ export default class CalendarBar extends Vue {
308
307
flex-direction : column ;
309
308
background : $color-white ;
310
309
height : 68px ;
311
- min-width : 16px ;
312
- border-radius : 30px !important ;
310
+ min-width : 1rem ;
311
+ max-width : 3rem ;
312
+ border-radius : 3em !important ;
313
313
align-items : center ;
314
314
justify-content : center ;
315
315
color : $color-gray ;
316
- font-family : ' Noto Sans JP' , sans-serif ;
317
316
margin : 0 3px ;
318
317
}
319
318
Original file line number Diff line number Diff line change @@ -43,27 +43,18 @@ export default Vue.extend({
43
43
44
44
<style scoped lang="scss">
45
45
.ContentCard {
46
- color : ' black ' ;
46
+ color : $color-gray ;
47
47
border-radius : 14px !important ;
48
48
.ContentCard-SubjectTag {
49
49
margin-right : 4px ;
50
50
}
51
51
.ContentCard-Title {
52
- font-family : ' Noto Sans' , sans-serif ;
53
- font-style : normal ;
54
52
font-weight : bold ;
55
53
font-size : 14px ;
56
- line-height : 19px ;
57
- color : #424242 ;
58
54
}
59
55
.ContentCard-Description {
60
56
white-space : pre-wrap ;
61
- font-family : ' Noto Sans' , sans-serif ;
62
- font-style : normal ;
63
- font-weight : normal ;
64
57
font-size : 12px ;
65
- line-height : 16px ;
66
- color : #424242 ;
67
58
}
68
59
}
69
60
</style >
Original file line number Diff line number Diff line change
1
+ <template >
2
+ <div class =" PeriodCard" >
3
+ <div class =" PeriodCard-NumberBlock" >
4
+ <div class =" PeriodCard-Number" >
5
+ <span class =" PeriodCard-Number-Num" >1</span >
6
+ <span class =" PeriodCard-Number-Text" >時間目</span >
7
+ </div >
8
+ <div class =" PeriodCard-Time" >
9
+ <span >00:00</span >
10
+ <span >|</span >
11
+ <span >00:00</span >
12
+ </div >
13
+ </div >
14
+ <v-row >
15
+ <v-col
16
+ v-for =" (item, i) in classData.getLessonsByDisplayDate"
17
+ :key =" i"
18
+ cols =" 12"
19
+ md =" 6"
20
+ >
21
+ <ContentCard
22
+ :description =" formatDate(item.startTime)"
23
+ :title =" item.content"
24
+ :subjects =" [{ name: item.subject }]"
25
+ />
26
+ </v-col >
27
+ </v-row >
28
+ </div >
29
+ </template >
30
+
31
+ <script lang="ts">
32
+ import Vue from ' vue'
33
+ import dayjs from ' dayjs'
34
+ import ContentCard from ' @/components/ContentCard.vue'
35
+
36
+ export default Vue .extend ({
37
+ components: { ContentCard },
38
+ props: {
39
+ classData: {
40
+ type: Object ,
41
+ default : () => {}
42
+ }
43
+ },
44
+ methods: {
45
+ formatDate(date : Date ): string {
46
+ return dayjs (date ).format (' HH:MM' )
47
+ }
48
+ }
49
+ })
50
+ </script >
51
+
52
+ <style scoped lang="scss">
53
+ .PeriodCard {
54
+ display : flex ;
55
+
56
+ & -NumberBlock {
57
+ display : flex ;
58
+ flex-direction : column ;
59
+ margin : 12px ;
60
+ }
61
+
62
+ & -Number {
63
+ display : flex ;
64
+ flex-direction : column ;
65
+ align-items : center ;
66
+ color : $color-white ;
67
+ background-color : $color-base-color-06 ;
68
+ max-width : 40px ;
69
+ border-radius : 3em ;
70
+ padding : 12px 4px ;
71
+ margin-bottom : 8px ;
72
+
73
+ & -Num {
74
+ font-size : 22px ;
75
+ }
76
+
77
+ & -Text {
78
+ font-size : 8px ;
79
+ }
80
+ }
81
+
82
+ & -Time {
83
+ display : flex ;
84
+ flex-direction : column ;
85
+ justify-content : center ;
86
+ text-align : center ;
87
+ font-size : 10px ;
88
+ color : $color-white ;
89
+ }
90
+ }
91
+ </style >
Original file line number Diff line number Diff line change 1
1
<template >
2
2
<div class =" MainPage" >
3
- <v-row v-if =" classData.getLessonsByDisplayDate.length" class =" DataBlock" >
4
- <v-col
5
- v-for =" (item, i) in classData.getLessonsByDisplayDate"
6
- :key =" i"
7
- cols =" 12"
8
- md =" 6"
9
- >
10
- <ContentCard
11
- :description =" formatDate(item.startTime)"
12
- :title =" item.content"
13
- :subjects =" [{ name: item.subject }]"
14
- />
15
- </v-col >
16
- </v-row >
17
-
3
+ <period-card
4
+ v-if =" classData.getLessonsByDisplayDate.length"
5
+ :class-data =" classData"
6
+ />
18
7
<v-row v-else-if =" today" class =" DataBlock" >
19
8
<h1 style =" color : white ; width : 100vw ; text-align : center ;" >
20
9
今日の時間割はまだ届いていないみたいです
@@ -33,7 +22,7 @@ import Vue from 'vue'
33
22
import dayjs from ' dayjs'
34
23
import isToday from ' date-fns/isToday'
35
24
import { vxm } from ' @/store'
36
- import ContentCard from ' @/components/ContentCard .vue'
25
+ import PeriodCard from ' @/components/PeriodCard .vue'
37
26
38
27
type Data = {
39
28
classData: typeof vxm .classData
@@ -42,7 +31,7 @@ type Data = {
42
31
}
43
32
44
33
export default Vue .extend ({
45
- components: { ContentCard },
34
+ components: { PeriodCard },
46
35
layout: ' classes' ,
47
36
data(): Data {
48
37
return {
You can’t perform that action at this time.
0 commit comments