Merge branch 'develop' into feature/add-an-option-for-a-default-formatting
This commit is contained in:
commit
e107ed8ddc
14
src/App.scss
14
src/App.scss
|
@ -719,3 +719,17 @@ nav {
|
|||
margin-right: 0.8em;
|
||||
}
|
||||
}
|
||||
|
||||
.login-hint {
|
||||
text-align: center;
|
||||
|
||||
@media all and (min-width: 801px) {
|
||||
display: none;
|
||||
}
|
||||
|
||||
a {
|
||||
display: inline-block;
|
||||
padding: 1em 0px;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,6 +37,11 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="main">
|
||||
<div v-if="!currentUser" class="login-hint panel panel-default">
|
||||
<router-link :to="{ name: 'login' }" class="panel-body">
|
||||
{{ $t("login.hint") }}
|
||||
</router-link>
|
||||
</div>
|
||||
<transition name="fade">
|
||||
<router-view></router-view>
|
||||
</transition>
|
||||
|
|
|
@ -28,7 +28,8 @@
|
|||
"password": "Password",
|
||||
"placeholder": "e.g. lain",
|
||||
"register": "Register",
|
||||
"username": "Username"
|
||||
"username": "Username",
|
||||
"hint": "Log in to join discussion"
|
||||
},
|
||||
"nav": {
|
||||
"about": "About",
|
||||
|
|
Loading…
Reference in New Issue