Merge pull request #2157 from nextcloud/build/webpack-shared-config

This commit is contained in:
Julius Härtl
2020-07-31 21:45:39 +02:00
committed by GitHub
27 changed files with 153 additions and 155 deletions

View File

@@ -154,6 +154,7 @@ export default {
.visualdiff ins {
color: green;
}
.visualdiff del {
color: darkred;
}

View File

@@ -291,6 +291,8 @@ export default {
<style lang="scss" scoped>
.controls {
display: flex;
.board-title {
display: flex;
align-items: center;
@@ -318,20 +320,12 @@ export default {
}
#app-navigation-toggle-custom {
position: static;
width: 44px;
height: 44px;
cursor: pointer;
opacity: 1;
display: inline-block !important;
position: fixed;
}
.controls {
display: flex;
}
#app-navigation-toggle-custom {
position: static;
}
.board-actions {
@@ -350,6 +344,7 @@ export default {
background-color: transparent;
}
}
.filter--item {
input + label {
display: block;
@@ -366,11 +361,13 @@ export default {
}
}
}
.filter {
width: 250px;
max-height: 80vh;
overflow: auto;
}
.filter h3 {
margin-top: 0px;
margin-bottom: 5px;

View File

@@ -1,35 +0,0 @@
<!--
- @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
-
- @author Julius Härtl <jus@bitgrid.net>
-
- @license GNU AGPL version 3 or any later version
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->
<template>
<div />
</template>
<script>
export default {
name: 'List',
}
</script>
<style scoped>
</style>

View File

@@ -131,7 +131,7 @@ export default {
<style lang="scss" scoped>
@import "../../css/animations.scss";
@import '../../css/animations.scss';
$board-spacing: 15px;
$stack-spacing: 10px;

View File

@@ -89,6 +89,12 @@ export default {
li {
display: flex;
height: 44px;
&:hover, &:active, &.focus {
button {
opacity: 1;
}
}
}
span {
@@ -119,12 +125,5 @@ export default {
background-color: transparent;
opacity: 0.5;
}
li {
&:hover, &:active, &.focus {
button {
opacity: 1;
}
}
}
}
</style>

View File

@@ -178,20 +178,25 @@ export default {
#shareWithList {
margin-bottom: 20px;
}
#shareWithList li {
display: flex;
align-items: center;
}
.username {
padding: 12px 9px;
flex-grow: 1;
}
.board-owner-label {
opacity: .7;
}
.avatarLabel {
padding: 6px
}
.avatardiv {
background-color: #f5f5f5;
border-radius: 16px;

View File

@@ -295,6 +295,7 @@ export default {
border: none;
}
}
.stack .smooth-dnd-container.vertical {
margin-top: 3px;
}
@@ -307,6 +308,7 @@ export default {
.slide-top-leave-active {
transition: all 100ms ease;
}
.slide-top-enter, .slide-top-leave-to {
transform: translateY(-10px);
opacity: 0;

View File

@@ -501,12 +501,14 @@ export default {
</script>
<style>
@import "~easymde/dist/easymde.min.css";
@import '~easymde/dist/easymde.min.css';
.vue-easymde, .CodeMirror {
border: none;
margin: 0;
padding: 0;
}
.editor-preview,
.editor-statusbar {
display: none;
@@ -615,7 +617,7 @@ export default {
min-height: 100px;
&::v-deep {
@import "./../../css/markdown";
@import './../../css/markdown';
}
&::v-deep input {

View File

@@ -115,5 +115,5 @@ export default {
</script>
<style scoped lang="scss">
@import "../../css/comments";
@import '../../css/comments';
</style>

View File

@@ -173,7 +173,7 @@ export default {
</script>
<style scoped lang="scss">
@import "../../css/comments";
@import '../../css/comments';
.atwho-wrap {
width: 100%;

View File

@@ -172,7 +172,7 @@ export default {
</script>
<style scoped lang="scss">
@import "../../css/comments";
@import '../../css/comments';
.reply {
border-left: 3px solid var(--color-primary-element);
@@ -195,6 +195,7 @@ export default {
margin: 0;
}
}
.comment--content::v-deep a {
text-decoration: underline;
}

View File

@@ -143,6 +143,7 @@ export default {
}
}
}
.avatar-list {
float: right;
display: inline-flex;
@@ -153,6 +154,9 @@ export default {
width: 36px;
height: 36px;
box-sizing: content-box !important;
margin-right: -12px;
transition: margin-right 0.2s ease-in-out;
&.icon-more {
width: 32px;
height: 32px;
@@ -160,15 +164,12 @@ export default {
background-color: var(--color-background-dark) !important;
cursor: pointer;
}
& {
margin-right: -12px;
transition: margin-right 0.2s ease-in-out;
}
}
&:hover div:nth-child(n+2) /deep/ .avatardiv {
margin-right: 1px;
}
}
.popovermenu {
display: block;
margin: 40px -6px;

View File

@@ -127,6 +127,7 @@ export default {
.fade-enter-active, .fade-leave-active {
transition: opacity .125s;
}
.fade-enter, .fade-leave-to {
opacity: 0;
}

View File

@@ -259,9 +259,11 @@ export default {
}
}
}
.duedate {
margin-right: 9px;
}
.right {
display: flex;
align-items: flex-start;

View File

@@ -158,6 +158,7 @@ export default {
color: var(--color-text-light);
}
}
::v-deep .app-navigation-toggle {
display: none;
}

View File

@@ -87,7 +87,7 @@ export default {
display: flex;
flex-grow: 1;
input[type="text"] {
input[type='text'] {
flex-grow: 1;
}
}

View File

@@ -248,7 +248,7 @@ export default {
display: flex;
flex-grow: 1;
input[type="text"] {
input[type='text'] {
flex-grow: 1;
}
}

View File

@@ -1,6 +1,7 @@
.fade-enter-active {
transition: opacity 250ms;
}
.fade-enter, .fade-leave-to {
opacity: 0;
}
@@ -9,6 +10,7 @@
.zoom-enter-active {
animation: zoom-in var(--animation-quick);
}
.zoom-leave-active {
animation: zoom-in var(--animation-quick) reverse;
will-change: transform;

View File

@@ -12,7 +12,7 @@
}
}
input[type="submit"] {
input[type='submit'] {
width: 44px;
height: 44px;
margin: 0;
@@ -25,9 +25,11 @@
right: 0;
}
}
.comment {
margin-bottom: 10px;
}
.comment--header {
display: flex;
align-items: center;

View File

@@ -74,17 +74,19 @@ input[type=checkbox] {
min-height: 12px;
}
li input[type="checkbox"].checkbox + label::before {
li input[type='checkbox'].checkbox + label::before {
margin-left: -15px;
}
input[type="checkbox"].checkbox + label::before {
input[type='checkbox'].checkbox + label::before {
position: relative;
z-index: 100;
margin-right: 10px;
margin-top: 0;
}
li input[type="checkbox"].checkbox:not(:checked) + label::before {
li input[type='checkbox'].checkbox:not(:checked) + label::before {
background-color: var(--color-main-background);
}