Skip to content

Commit bba8b35

Browse files
committed
feat: made timeline view full-width
1 parent f0e8b4c commit bba8b35

6 files changed

Lines changed: 43 additions & 34 deletions

File tree

src/App.vue

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
div#wrapper
33
aw-header
44

5-
div.container.aw-container.my-3.py-3
6-
error-boundary
7-
user-satisfaction-poll
8-
new-release-notification(v-if="isNewReleaseCheckEnabled")
9-
router-view
5+
div(:class="{'container': !fullContainer, 'container-fluid': fullContainer}")
6+
div.aw-container.my-3.p-3
7+
error-boundary
8+
user-satisfaction-poll
9+
new-release-notification(v-if="isNewReleaseCheckEnabled")
10+
router-view
1011

1112
div.container(style="color: #555")
1213
div(style="float: left")
@@ -49,6 +50,12 @@ export default {
4950
};
5051
},
5152
53+
computed: {
54+
fullContainer() {
55+
return this.$route.meta.fullContainer;
56+
},
57+
},
58+
5259
mounted: async function () {
5360
this.$aw.getInfo().then(
5461
info => {
@@ -62,31 +69,3 @@ export default {
6269
},
6370
};
6471
</script>
65-
66-
<style lang="scss">
67-
$textcolor: #000;
68-
69-
html,
70-
body,
71-
button {
72-
color: $textcolor;
73-
font-family: 'Varela Round', sans-serif !important;
74-
}
75-
76-
body {
77-
background-color: #eee;
78-
}
79-
80-
.fa-icon {
81-
margin-top: -0.125em;
82-
margin-left: 4px;
83-
margin-right: 4px;
84-
vertical-align: middle;
85-
}
86-
87-
.aw-container {
88-
background-color: #fff;
89-
border: 1px solid #ccc;
90-
border-radius: 5px 5px 5px 5px;
91-
}
92-
</style>

src/main.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ if (!('startOfDay' in localStorage)) {
2020
// Load the Varela Round font
2121
import 'typeface-varela-round';
2222

23+
import './style/style.scss';
24+
2325
// Loads all the filters
2426
import './util/filters.js';
2527

src/route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const router = new VueRouter({
4242
},
4343
{ path: '/buckets', component: Buckets },
4444
{ path: '/buckets/:id', component: Bucket, props: true },
45-
{ path: '/timeline', component: Timeline },
45+
{ path: '/timeline', component: Timeline, meta: { fullContainer: true } },
4646
{ path: '/query', component: QueryExplorer },
4747
{ path: '/settings', component: Settings },
4848
{ path: '/stopwatch', component: Stopwatch },

src/style/_container.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.aw-container {
2+
background-color: #fff;
3+
border: 1px solid #ccc;
4+
border-radius: 5px;
5+
}

src/style/style.scss

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
@import 'globalvars';
2+
@import 'container';
3+
4+
$textcolor: #000;
5+
6+
html,
7+
body,
8+
button {
9+
color: $textcolor;
10+
font-family: 'Varela Round', sans-serif !important;
11+
}
12+
13+
body {
14+
background-color: #eee;
15+
}
16+
17+
// To make icons a little less crowded
18+
.fa-icon {
19+
margin-top: -0.125em;
20+
margin-left: 4px;
21+
margin-right: 4px;
22+
vertical-align: middle;
23+
}

0 commit comments

Comments
 (0)