Skip to content
This repository was archived by the owner on Mar 26, 2023. It is now read-only.

Commit 321e536

Browse files
netsvetochArtem Netsvetaev
andauthored
fix layout (#67)
Co-authored-by: Artem Netsvetaev <physphile@vk.com>
1 parent c46bc53 commit 321e536

4 files changed

Lines changed: 44 additions & 57 deletions

File tree

src/views/EventView.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ ul {
197197
padding: 0;
198198
}
199199
.event-wrapper {
200-
padding: 32px 24px 64px 24px;
201-
height: calc(100vh - 56px);
200+
padding: 10px 24px;
201+
min-height: calc(100vh - 56px * 2);
202202
display: flex;
203203
align-items: center;
204204
justify-content: center;

src/views/LecturerView.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ export default {
116116

117117
<style scoped>
118118
.lecturer-wrapper {
119-
padding: 32px 24px 0px;
119+
padding: 10px 24px;
120120
display: flex;
121-
height: calc(100vh - 56px);
121+
min-height: calc(100vh - 56px * 2);
122122
justify-content: center;
123123
align-items: center;
124124
margin: 0 auto;

src/views/RoomView.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ export default {
109109

110110
<style scoped>
111111
.room-wrapper {
112-
padding: 32px 24px 0px;
112+
padding: 10px 24px;
113113
display: flex;
114-
height: calc(100vh - 56px);
114+
min-height: calc(100vh - 56px * 2);
115115
align-items: center;
116116
justify-content: center;
117117
max-width: 640px;

src/views/TimetableView.vue

Lines changed: 38 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,42 @@
11
<template>
2-
<div class="timetable">
3-
<div class="container">
4-
<div class="weekday">
5-
<span
6-
class="noselect clickable"
7-
@click="changeDate({ detail: { dir: 'right' } })"
8-
>
9-
<span class="material-symbols-sharp"> arrow_back_ios </span>
10-
{{ yesterdayWeekdayFormated }}
11-
</span>
12-
<span class="noselect">{{ todayWeekdayFormated }}</span>
13-
<span
14-
class="noselect clickable"
15-
@click="changeDate({ detail: { dir: 'left' } })"
16-
>
17-
{{ tomorrowWeekdayFormated }}
18-
<span class="material-symbols-sharp">
19-
arrow_forward_ios
20-
</span>
21-
</span>
22-
</div>
23-
<div
24-
v-if="!loaded"
25-
class="lds-dual-ring"
26-
></div>
27-
<template v-else>
28-
<div
29-
v-if="!timetable.length"
30-
class="no-events"
31-
>
32-
Свободный день!
33-
</div>
34-
<div v-else>
35-
<EventRow
36-
v-for="lesson of timetable"
37-
:key="lesson.id"
38-
:lesson="lesson"
39-
@click="$router.push(`/timetable/event/${lesson.id}`)"
40-
/>
41-
</div>
42-
</template>
2+
<div class="container">
3+
<div class="weekday">
4+
<span
5+
class="noselect clickable"
6+
@click="changeDate({ detail: { dir: 'right' } })"
7+
>
8+
<span class="material-symbols-sharp"> arrow_back_ios </span>
9+
{{ yesterdayWeekdayFormated }}
10+
</span>
11+
<span class="noselect">{{ todayWeekdayFormated }}</span>
12+
<span
13+
class="noselect clickable"
14+
@click="changeDate({ detail: { dir: 'left' } })"
15+
>
16+
{{ tomorrowWeekdayFormated }}
17+
<span class="material-symbols-sharp"> arrow_forward_ios </span>
18+
</span>
4319
</div>
20+
<div
21+
v-if="!loaded"
22+
class="lds-dual-ring"
23+
></div>
24+
<template v-else>
25+
<div
26+
v-if="!timetable.length"
27+
class="no-events"
28+
>
29+
Свободный день!
30+
</div>
31+
<div v-else>
32+
<EventRow
33+
v-for="lesson of timetable"
34+
:key="lesson.id"
35+
:lesson="lesson"
36+
@click="$router.push(`/timetable/event/${lesson.id}`)"
37+
/>
38+
</div>
39+
</template>
4440
</div>
4541
</template>
4642

@@ -328,16 +324,7 @@ export default {
328324
justify-content: flex-start;
329325
height: 100%;
330326
padding-top: 8px;
331-
}
332-
333-
.timetable {
334-
display: flex;
335-
flex-direction: column;
336-
justify-content: center;
337-
align-items: center;
338-
height: calc(100vh - 56px);
339-
width: auto;
340-
overflow: scroll;
327+
min-height: calc(100vh - 56px * 2);
341328
}
342329
343330
.weekday {

0 commit comments

Comments
 (0)