Skip to content

Commit 6aa76ba

Browse files
Merge branch 'develop' into 'master'
Hotfix: icon and name of main page See merge request noluckjustskill/hackathon_training!66
2 parents 6e04711 + 59b6436 commit 6aa76ba

File tree

6 files changed

+18
-10
lines changed

6 files changed

+18
-10
lines changed

pages/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
},
7272
head () {
7373
return {
74-
title: 'Портфолио',
74+
title: 'Профиль',
7575
};
7676
},
7777
async asyncData({ $axios }) {

pages/tests/belbin.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,21 +149,23 @@
149149
:block="isMobile"
150150
rounded
151151
depressed
152+
exact
152153
to="/"
153154
color="primary"
154155
class="mt-2 mr-1"
155156
>
156157
<v-icon left>
157-
mdi-arrow-left
158+
mdi-account
158159
</v-icon>
159-
<span class="body-2">Портфолио</span>
160+
<span class="body-2">Вернуться в профиль</span>
160161
</v-btn>
161162
<v-btn
162163
v-if="activeUser"
163164
:block="isMobile"
164165
color="primary"
165166
rounded
166167
depressed
168+
exact
167169
to="/tests"
168170
class="mt-2 mr-1"
169171
>

pages/tests/disk.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,21 +119,23 @@
119119
:block="isMobile"
120120
rounded
121121
depressed
122+
exact
122123
to="/"
123124
color="primary"
124125
class="mt-2 mr-1"
125126
>
126127
<v-icon left>
127-
mdi-arrow-left
128+
mdi-account
128129
</v-icon>
129-
<span class="body-2">Портфолио</span>
130+
<span class="body-2">Вернуться в профиль</span>
130131
</v-btn>
131132
<v-btn
132133
v-if="activeUser"
133134
:block="isMobile"
134135
color="primary"
135136
rounded
136137
depressed
138+
exact
137139
to="/tests"
138140
class="mt-2 mr-1"
139141
>

pages/tests/golland.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,21 +198,23 @@
198198
:block="isMobile"
199199
rounded
200200
depressed
201+
exact
201202
to="/"
202203
color="primary"
203204
class="mt-2 mr-1"
204205
>
205206
<v-icon left>
206-
mdi-arrow-left
207+
mdi-account
207208
</v-icon>
208-
<span class="body-2">Портфолио</span>
209+
<span class="body-2">Вернуться в профиль</span>
209210
</v-btn>
210211
<v-btn
211212
v-if="activeUser"
212213
:block="isMobile"
213214
color="primary"
214215
rounded
215216
depressed
217+
exact
216218
to="/tests"
217219
class="mt-2 mr-1"
218220
>

pages/tests/klimov.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,21 +111,23 @@
111111
:block="isMobile"
112112
rounded
113113
depressed
114+
exact
114115
to="/"
115116
color="primary"
116117
class="mt-2 mr-1"
117118
>
118119
<v-icon left>
119-
mdi-arrow-left
120+
mdi-account
120121
</v-icon>
121-
<span class="body-2">Портфолио</span>
122+
<span class="body-2">Вернуться в профиль</span>
122123
</v-btn>
123124
<v-btn
124125
v-if="activeUser"
125126
:block="isMobile"
126127
color="primary"
127128
rounded
128129
depressed
130+
exact
129131
to="/tests"
130132
class="mt-2 mr-1"
131133
>

plugins/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export default (ctx, inject) => {
33
routes: [
44
{
55
icon: 'mdi-account-circle',
6-
title: 'Портфолио',
6+
title: 'Профиль',
77
to: '/'
88
},
99
{

0 commit comments

Comments
 (0)