Merge branch 'master' into feature/options-menu
This commit is contained in:
commit
f6d82b176c
GPG Key ID:
F40E70337AB24C9B
|
|
@ -48,13 +48,13 @@
|
|||
"cypress-file-upload": "5.0.2",
|
||||
"eslint": "7.18.0",
|
||||
"eslint-plugin-vue": "7.5.0",
|
||||
"faker": "5.1.0",
|
||||
"faker": "5.2.0",
|
||||
"jest": "26.6.3",
|
||||
"node-sass": "5.0.0",
|
||||
"sass-loader": "10.1.1",
|
||||
"vue-flatpickr-component": "8.1.6",
|
||||
"vue-notification": "1.3.20",
|
||||
"vue-router": "3.4.9",
|
||||
"vue-router": "3.5.0",
|
||||
"vue-template-compiler": "2.6.12",
|
||||
"wait-on": "5.2.1"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -461,6 +461,11 @@ export default {
|
|||
&-lines pre {
|
||||
margin: 0 !important;
|
||||
}
|
||||
|
||||
&-placeholder {
|
||||
color: $grey-400;
|
||||
font-style: italic;
|
||||
}
|
||||
}
|
||||
|
||||
.editor-preview {
|
||||
|
|
@ -497,6 +502,7 @@ export default {
|
|||
|
||||
pre.CodeMirror-line {
|
||||
margin-bottom: 0 !important;
|
||||
color: $grey-700 !important;
|
||||
}
|
||||
|
||||
.cm-header {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
.filename {
|
||||
font-weight: bold;
|
||||
margin-bottom: .25rem;
|
||||
color: $dark;
|
||||
color: $text;
|
||||
}
|
||||
|
||||
.info {
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@
|
|||
|
||||
.box, .card {
|
||||
border: 1px solid $grey-200;
|
||||
box-shadow: $shadow-md;
|
||||
box-shadow: $shadow-sm;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
box-shadow: none !important;
|
||||
|
||||
.hint-text {
|
||||
color: $dark;
|
||||
color: $text;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -97,14 +97,14 @@ $gantt-vertical-border-color: $grey-100;
|
|||
}
|
||||
|
||||
&.has-dark-text {
|
||||
color: $dark;
|
||||
color: $text;
|
||||
|
||||
&.done span:after {
|
||||
border-top: 1px solid $dark;
|
||||
}
|
||||
|
||||
.edit-toggle {
|
||||
color: $dark;
|
||||
color: $text;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@
|
|||
background: $green;
|
||||
color: $white;
|
||||
padding: .5rem;
|
||||
font-size: 1.5rem;
|
||||
font-size: 1rem;
|
||||
margin-left: .5rem;
|
||||
font-weight: bold;
|
||||
line-height: 1;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
}
|
||||
|
||||
.card {
|
||||
background: #fff;
|
||||
background: $white;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,29 +66,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.hero {
|
||||
.navbar {
|
||||
border: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
@each $name, $pair in $colors {
|
||||
$color: nth($pair, 1);
|
||||
$color-invert: nth($pair, 2);
|
||||
|
||||
&.is-#{$name} {
|
||||
.navbar {
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
@include touch {
|
||||
.navbar-menu {
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.navbar-menu .navbar-item .icon {
|
||||
margin: 0 0.5rem;
|
||||
}
|
||||
|
|
@ -372,7 +349,7 @@
|
|||
z-index: 31;
|
||||
font-weight: bold;
|
||||
font-size: 2rem;
|
||||
color: $dark;
|
||||
color: $text;
|
||||
line-height: 1;
|
||||
|
||||
&:hover, &:focus {
|
||||
|
|
@ -384,7 +361,7 @@
|
|||
position: fixed;
|
||||
|
||||
&:hover, &:focus {
|
||||
color: $dark;
|
||||
color: $text;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ $green: #00db60;
|
|||
$red: #ff4136;
|
||||
$blue: #1973ff;
|
||||
$primary: $blue;
|
||||
$dark: $grey-900;
|
||||
|
||||
$info-invert: #fff;
|
||||
$family-sans-serif: 'Open Sans', Helvetica, Arial, sans-serif;
|
||||
|
|
@ -27,7 +26,7 @@ $vikunja-green: #4DB788;
|
|||
|
||||
$navbar-padding: 2rem;
|
||||
$vikunja-nav-background: $light-background;
|
||||
$vikunja-nav-color: $grey-800;
|
||||
$vikunja-nav-color: $grey-700;
|
||||
$vikunja-nav-selected-width: 0.4rem;
|
||||
|
||||
$transition-duration: 150ms;
|
||||
|
|
@ -38,7 +37,7 @@ $scrollbar-track-color: $grey-300;
|
|||
$scrollbar-thumb-color: $grey-500;
|
||||
$scrollbar-hover-color: $grey-700;
|
||||
|
||||
$button-height: 2.648rem;
|
||||
$button-height: 34px;
|
||||
|
||||
$switch-view-height: 43px;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
type="text"
|
||||
autocomplete="username"
|
||||
v-focus
|
||||
@keyup.enter="submit"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -34,6 +35,7 @@
|
|||
required
|
||||
type="password"
|
||||
autocomplete="current-password"
|
||||
@keyup.enter="submit"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -48,6 +50,7 @@
|
|||
required
|
||||
type="text"
|
||||
v-focus
|
||||
@keyup.enter="submit"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,9 @@
|
|||
type="text"
|
||||
autocomplete="username"
|
||||
v-focus
|
||||
v-model="credentials.username"/>
|
||||
v-model="credentials.username"
|
||||
@keyup.enter="submit"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
|
|
@ -28,7 +30,9 @@
|
|||
placeholder="e.g. frederic@vikunja.io"
|
||||
required
|
||||
type="email"
|
||||
v-model="credentials.email"/>
|
||||
v-model="credentials.email"
|
||||
@keyup.enter="submit"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
|
|
@ -42,7 +46,9 @@
|
|||
required
|
||||
type="password"
|
||||
autocomplete="new-password"
|
||||
v-model="credentials.password"/>
|
||||
v-model="credentials.password"
|
||||
@keyup.enter="submit"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
|
|
@ -56,7 +62,9 @@
|
|||
required
|
||||
type="password"
|
||||
autocomplete="new-password"
|
||||
v-model="credentials.password2"/>
|
||||
v-model="credentials.password2"
|
||||
@keyup.enter="submit"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
16
yarn.lock
16
yarn.lock
|
|
@ -7260,10 +7260,10 @@ extsprintf@^1.2.0:
|
|||
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
|
||||
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
|
||||
|
||||
faker@5.1.0:
|
||||
version "5.1.0"
|
||||
resolved "https://registry.yarnpkg.com/faker/-/faker-5.1.0.tgz#e10fa1dec4502551aee0eb771617a7e7b94692e8"
|
||||
integrity sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==
|
||||
faker@5.2.0:
|
||||
version "5.2.0"
|
||||
resolved "https://registry.yarnpkg.com/faker/-/faker-5.2.0.tgz#5ee7ca475737eda8cf59c0cbaae5f5068e668dd9"
|
||||
integrity sha512-UlrF1NNRIdzEPtBcy5l8JTlnXQZdz+4pQc3v2TAVocW39nnczCNQ0g0CBKgPGISJPzA2DqJVN1kdr+FCRFdN5g==
|
||||
|
||||
fast-deep-equal@^2.0.1:
|
||||
version "2.0.1"
|
||||
|
|
@ -15189,10 +15189,10 @@ vue-notification@1.3.20:
|
|||
resolved "https://registry.yarnpkg.com/vue-notification/-/vue-notification-1.3.20.tgz#d85618127763b46f3e25b8962b857947d5a97cbe"
|
||||
integrity sha512-vPj67Ah72p8xvtyVE8emfadqVWguOScAjt6OJDEUdcW5hW189NsqvfkOrctxHUUO9UYl9cTbIkzAEcPnHu+zBQ==
|
||||
|
||||
vue-router@3.4.9:
|
||||
version "3.4.9"
|
||||
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
|
||||
integrity sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA==
|
||||
vue-router@3.5.0:
|
||||
version "3.5.0"
|
||||
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.0.tgz#ae49da16a2939f8d28d66d5784b14167d661192f"
|
||||
integrity sha512-QYrPzHMJiJCq20ezhlGok+NbrmjzhQDG6pnpJaD14Eg3NvT07s3acYz2ktxJ7vGHd/Ts4TgG9Tt8a2PA+Js5fw==
|
||||
|
||||
vue-shortkey@3.1.7:
|
||||
version "3.1.7"
|
||||
|
|
|
|||
Reference in New Issue