Skip to content

Commit 06ccbbe

Browse files
committed
improvement(design): made improvements to the design of the Activity view, including smaller tabs and placing the periodLength select in between the 'previous' and 'next' buttons
1 parent 0ded48d commit 06ccbbe

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

src/views/activity/Activity.vue

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,22 @@ div
99

1010
div.d-flex
1111
div.p-1
12-
b-button-group
13-
b-button(:to="link_prefix + '/' + previousPeriod() + '/' + subview",
14-
variant="outline-dark")
15-
icon(name="arrow-left")
16-
span.d-none.d-md-inline
17-
| Previous
18-
b-button(:to="link_prefix + '/' + nextPeriod() + '/' + subview",
19-
:disabled="nextPeriod() > today", variant="outline-dark")
20-
span.d-none.d-md-inline
21-
| Next
22-
icon(name="arrow-right")
23-
div.p-1
24-
b-select(:value="periodLength", :options="['day', 'week', 'month']",
25-
@change="(periodLength) => setDate(date, periodLength)")
12+
b-input-group
13+
b-input-group-prepend
14+
b-button(:to="link_prefix + '/' + previousPeriod() + '/' + subview",
15+
variant="outline-dark")
16+
icon(name="arrow-left")
17+
//span.d-none.d-md-inline
18+
// | Previous
19+
b-select(:value="periodLength", :options="['day', 'week', 'month']",
20+
@change="(periodLength) => setDate(date, periodLength)")
21+
b-input-group-append
22+
b-button(:to="link_prefix + '/' + nextPeriod() + '/' + subview",
23+
:disabled="nextPeriod() > today", variant="outline-dark")
24+
//span.d-none.d-md-inline
25+
// | Next
26+
icon(name="arrow-right")
27+
2628
div.p-1(v-if="periodLength === 'day'")
2729
input.form-control(id="date" type="date" :value="date" :max="today"
2830
@change="setDate($event.target.value, periodLength)")
@@ -36,19 +38,20 @@ div
3638

3739
aw-periodusage(:periodusage_arr="periodusage", :link_prefix="link_prefix")
3840

39-
ul.row.nav.nav-tabs.my-3.px-3
41+
ul.row.nav.nav-tabs.mt-3.pl-3
42+
//.flex-column.flex-sm-row
4043
li.nav-item
4144
router-link.nav-link(:to="{ name: 'activity-summary', params: $route.params }")
42-
h5 Summary
45+
h6 Summary
4346
li.nav-item
4447
router-link.nav-link(:to="{ name: 'activity-window', params: $route.params }")
45-
h5 Window
48+
h6 Window
4649
li.nav-item
4750
router-link.nav-link(:to="{ name: 'activity-browser', params: $route.params }")
48-
h5 Browser
51+
h6 Browser
4952
li.nav-item
5053
router-link.nav-link(:to="{ name: 'activity-editor', params: $route.params }")
51-
h5 Editor
54+
h6 Editor
5255

5356
div
5457
router-view
@@ -79,6 +82,7 @@ $bordercolor: #ddd;
7982
.nav-link {
8083
background-color: $buttoncolor;
8184
margin: 0 0.2em 0 0.2em;
85+
padding: 0.4em 0.5em 0.1em 0.5em;
8286
border: 2px solid $bordercolor;
8387
border-bottom: none;
8488
border-radius: 0.5rem 0.5rem 0 0;

0 commit comments

Comments
 (0)