From 13c7f080f0b7dfefce3865312d59138b1ba0e208 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 May 2023 11:19:08 +0200 Subject: [PATCH 1/7] removed compiled css files --- webapp/assets/_new/styles/mixins/buttonStates.css | 1 - webapp/assets/_new/styles/mixins/buttonStates.css.map | 1 - 2 files changed, 2 deletions(-) delete mode 100644 webapp/assets/_new/styles/mixins/buttonStates.css delete mode 100644 webapp/assets/_new/styles/mixins/buttonStates.css.map diff --git a/webapp/assets/_new/styles/mixins/buttonStates.css b/webapp/assets/_new/styles/mixins/buttonStates.css deleted file mode 100644 index 27b24b9ce..000000000 --- a/webapp/assets/_new/styles/mixins/buttonStates.css +++ /dev/null @@ -1 +0,0 @@ -/*# sourceMappingURL=buttonStates.css.map */ \ No newline at end of file diff --git a/webapp/assets/_new/styles/mixins/buttonStates.css.map b/webapp/assets/_new/styles/mixins/buttonStates.css.map deleted file mode 100644 index aa1b02a29..000000000 --- a/webapp/assets/_new/styles/mixins/buttonStates.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":[],"names":[],"mappings":"","file":"buttonStates.css"} \ No newline at end of file From e6e972e50e8a20c966408dc4a5426da7493e9134 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 May 2023 11:22:56 +0200 Subject: [PATCH 2/7] removed compiled css files --- webapp/assets/_new/styles/resets.css | 29 ------ webapp/assets/_new/styles/resets.css.map | 1 - webapp/assets/_new/styles/tokens.css | 122 ----------------------- webapp/assets/_new/styles/tokens.css.map | 1 - 4 files changed, 153 deletions(-) delete mode 100644 webapp/assets/_new/styles/resets.css delete mode 100644 webapp/assets/_new/styles/resets.css.map delete mode 100644 webapp/assets/_new/styles/tokens.css delete mode 100644 webapp/assets/_new/styles/tokens.css.map diff --git a/webapp/assets/_new/styles/resets.css b/webapp/assets/_new/styles/resets.css deleted file mode 100644 index b9aeaa72e..000000000 --- a/webapp/assets/_new/styles/resets.css +++ /dev/null @@ -1,29 +0,0 @@ -* { - box-sizing: border-box; -} - -button { - padding: 0; - background: transparent; - border: none; - font-family: inherit; - font-size: inherit; -} - -h1, -h2, -h3, -h4, -h5, -h6, -p, -li { - margin: 0; -} - -ol, -ul { - list-style-type: none; - margin: 0; - padding: 0; -}/*# sourceMappingURL=resets.css.map */ \ No newline at end of file diff --git a/webapp/assets/_new/styles/resets.css.map b/webapp/assets/_new/styles/resets.css.map deleted file mode 100644 index e759c9680..000000000 --- a/webapp/assets/_new/styles/resets.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["resets.scss","resets.css"],"names":[],"mappings":"AAAA;EACE,sBAAA;ACCF;;ADEA;EACE,UAAA;EACA,uBAAA;EACA,YAAA;EACA,oBAAA;EACA,kBAAA;ACCF;;ADEA;;;;;;;;EAQE,SAAA;ACCF;;ADEA;;EAEE,qBAAA;EACA,SAAA;EACA,UAAA;ACCF","file":"resets.css"} \ No newline at end of file diff --git a/webapp/assets/_new/styles/tokens.css b/webapp/assets/_new/styles/tokens.css deleted file mode 100644 index 45bac6085..000000000 --- a/webapp/assets/_new/styles/tokens.css +++ /dev/null @@ -1,122 +0,0 @@ -/** - * @tokens Color Brand - * @presenter Color - */ -/** - * @tokens Color Neutral - * @presenter Color - */ -/** - * @tokens Color Text - * @presenter Color - */ -/** - * @tokens Color Background - * @presenter Color - */ -/** - * @tokens Color Border - * @presenter Color - */ -/** - * @tokens Border Size - * @presenter Border - */ -/** - * @tokens Border Radius - * @presenter BorderRadius - */ -/** - * @tokens Font Size - * @presenter FontSize - */ -/** - * @tokens Font Space - * @presenter Spacing - */ -/** - * @tokens Font Family - * @presenter FontFamily - */ -/** - * @tokens Font Weight - * @presenter FontWeight - */ -/** - * @tokens Line Height - * @presenter LineHeight - */ -/** - * @tokens Letter Spacing - * @presenter Spacing - */ -/** - * @tokens Opacity - * @presenter Opacity - */ -/** - * @tokens Space - * @presenter Spacing - */ -/** - * @tokens Size Height - * @presenter Spacing - */ -/** - * @tokens Size Width - * @presenter Spacing - */ -/** - * @tokens Size Avatar - * @presenter Spacing - */ -/** - * @tokens Size Buttons - * @presenter Spacing - */ -/** - * @tokens Size Images - * @presenter Spacing - */ -/** - * @tokens Size Icons - * @presenter Spacing - */ -/** - * @tokens Shadow - * @presenter Shadow - */ -/** - * @tokens Effects - */ -/** - * @tokens Animation Duration - */ -/** - * @tokens Animation Ease - * @presenter Easing - */ -/** - * @tokens Z-Index - */ -/** - * @tokens Media Query - */ -/** - * @tokens Background Images - */ -/** - * @tokens Header Color - */ -/** - * @tokens Footer Color - */ -/** - * @tokens Locale Menu Color - */ -/** - * @tokens Donation Bar Color - */ -/** - * @tokens Toast Color - *//*# sourceMappingURL=tokens.css.map */ \ No newline at end of file diff --git a/webapp/assets/_new/styles/tokens.css.map b/webapp/assets/_new/styles/tokens.css.map deleted file mode 100644 index 5111f4b00..000000000 --- a/webapp/assets/_new/styles/tokens.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["tokens.scss"],"names":[],"mappings":"AAAA;;;EAAA;AA4BA;;;EAAA;AAmBA;;;EAAA;AAuBA;;;EAAA;AAgCA;;;EAAA;AAeA;;;EAAA;AASA;;;EAAA;AAYA;;;EAAA;AAgBA;;;EAAA;AAgBA;;;EAAA;AAUA;;;EAAA;AAQA;;;EAAA;AAUA;;;EAAA;AAWA;;;EAAA;AASA;;;EAAA;AAgBA;;;EAAA;AAaA;;;EAAA;AASA;;;EAAA;AASA;;;EAAA;AASA;;;EAAA;AAUA;;;EAAA;AAQA;;;EAAA;AAcA;;EAAA;AAMA;;EAAA;AAUA;;;EAAA;AAWA;;EAAA;AAaA;;EAAA;AAUA;;EAAA;AAIA;;EAAA;AAMA;;EAAA;AAOA;;EAAA;AAMA;;EAAA;AAOA;;EAAA","file":"tokens.css"} \ No newline at end of file From 572272b58105b096efda6b1e7429cb5c2689cff3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 May 2023 11:26:31 +0200 Subject: [PATCH 3/7] typo --- webapp/components/ContributionForm/ContributionForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 51efbc6a4..d901eaa0e 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -152,7 +152,7 @@ - + Date: Thu, 25 May 2023 11:56:10 +0200 Subject: [PATCH 4/7] make time selection to be always valid --- .../ContributionForm/ContributionForm.vue | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index d901eaa0e..4c0389325 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -67,10 +67,11 @@ type="datetime" value-type="format" :minute-step="15" - formmat="DD-MM-YYYY HH:mm" + Xformat="DD-MM-YYYY HH:mm" style="z-index: 20" :placeholder="$t('post.viewEvent.eventStart')" :disabled-date="notBeforeToday" + :disabled-time="notBeforeNow" :show-second="false" > @@ -86,12 +87,14 @@ @@ -316,7 +319,16 @@ export default { }, methods: { notBeforeToday(date) { - return date < new Date(new Date().setHours(0, 0, 0, 0)) + return date < new Date().setHours(0, 0, 0, 0) + }, + notBeforeNow(date) { + return date < new Date() + }, + notBeforeEventDay(date) { + return date < new Date(this.formData.eventStart).setHours(0,0,0,0) + }, + notBeforeEvent(date) { + return date <= new Date(this.formData.eventStart) }, submit() { let image = null From 3f1e42e6fd995658aee89e0623c19b8a3d2357a9 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 May 2023 12:15:03 +0200 Subject: [PATCH 5/7] externalize styles --- webapp/pages/post/create.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue index c8419d08f..0ebcf6ccb 100644 --- a/webapp/pages/post/create.vue +++ b/webapp/pages/post/create.vue @@ -11,7 +11,7 @@ ghost fullwidth size="x-large" - style="background-color: #ff000000; color: whitesmoke" + class="inactive-tab-button" > {{ $t('post.createNewPost.title') }} @@ -30,8 +30,7 @@ size="x-large" v-if="creatEvent" hover - style="background-color: #ff000000; color: whitesmoke" - > + class="inactive-tab-button" > {{ $t('post.createNewEvent.title') }} @@ -41,7 +40,7 @@ -
+
{{ $t('post.createNewPost.forGroup.title', { name: group.name }) }}
@@ -100,3 +99,13 @@ export default { }, } + \ No newline at end of file From 73417079ed9edeead3e9e05f308dc107d44ef662 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 May 2023 12:40:32 +0200 Subject: [PATCH 6/7] fix eslint ignore --- webapp/.eslintignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/.eslintignore b/webapp/.eslintignore index be90fc8e3..a90a66efa 100644 --- a/webapp/.eslintignore +++ b/webapp/.eslintignore @@ -1,5 +1,5 @@ node_modules -build +dist .nuxt styleguide/ **/*.min.js From 04ab8148f9832b83f36f3362cb7209bb6f222637 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 May 2023 12:41:04 +0200 Subject: [PATCH 7/7] lint fixes --- webapp/components/ContributionForm/ContributionForm.vue | 2 +- webapp/pages/post/create.vue | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 4c0389325..997a25341 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -325,7 +325,7 @@ export default { return date < new Date() }, notBeforeEventDay(date) { - return date < new Date(this.formData.eventStart).setHours(0,0,0,0) + return date < new Date(this.formData.eventStart).setHours(0, 0, 0, 0) }, notBeforeEvent(date) { return date <= new Date(this.formData.eventStart) diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue index 0ebcf6ccb..199cc14a4 100644 --- a/webapp/pages/post/create.vue +++ b/webapp/pages/post/create.vue @@ -30,7 +30,8 @@ size="x-large" v-if="creatEvent" hover - class="inactive-tab-button" > + class="inactive-tab-button" + > {{ $t('post.createNewEvent.title') }} @@ -102,10 +103,10 @@ export default { \ No newline at end of file +