Merge pull request #4117 from nextcloud/fix/design

some design and css isues, opmizations

Author: dartcafe

.gitignore

@@ -1,5 +1,9 @@
 # SPDX-FileCopyrightText: 2016 Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
+/assets/
+/css/*.map
+/js/*
+/css/*
 .DS_Store
 .sass-cache/
 .php_cs.cache
@@ -8,11 +12,7 @@
 .project/
 .idea/
 .vscode/
-assets/
 build/
-css/*.map
-js/*
-css/*
 nbproject/
 node_modules/
 tests/.phpunit.result.cache

src/App.vue

@@ -20,7 +20,7 @@ import { usePollStore } from './stores/poll.ts'
 import { showSuccess } from '@nextcloud/dialogs'
 
 import '@nextcloud/dialogs/style.css'
-import './assets/scss/colors.scss'
+import './assets/scss/vars.scss'
 import './assets/scss/hacks.scss'
 import './assets/scss/print.scss'
 import './assets/scss/transitions.scss'

src/assets/scss/colors.scss src/assets/scss/vars.scsssrc/assets/scss/colors.scss renamed to src/assets/scss/vars.scss

@@ -10,4 +10,5 @@
 	--color-polls-background-no: rgba(var(--color-error-rgb), 0.2);
 	--color-polls-background-maybe: rgba(var(--color-warning-rgb), 0.1);
 	--container-background-light: rgba(var(--color-info-rgb), 0.1);
+	--cap-width: 49rem;
 }

src/components/VoteTable/VoteTable.vue

@@ -230,8 +230,8 @@ const showCalendarPeek = computed(
 		}
 
 		.current-user {
-			padding-top: 1.5rem;
-			padding-bottom: 1.5rem;
+			margin-top: 1.5rem;
+			margin-bottom: 1.5rem;
 		}
 
 		.option-element {
@@ -258,6 +258,7 @@ const showCalendarPeek = computed(
 
 	&.list-view {
 		grid-template-columns: auto 5rem 5rem;
+		max-width: var(--cap-width);
 
 		.grid-info,
 		.option-spacer,

src/views/Vote.vue

@@ -173,7 +173,6 @@ onUnmounted(() => {
 }
 
 .vote_main {
-	--cap-width: 49rem;
 	.markdown-description {
 		margin: auto;
 		max-width: var(--cap-width);