From 911dc977ae61b50e88b785b6f70f36b1afb1dcb9 Mon Sep 17 00:00:00 2001
From: hom3mad3 <8156337+hom3mad3@users.noreply.github.com>
Date: Thu, 5 Dec 2024 12:09:40 +0100
Subject: [PATCH 1/2] a4-polls: adapt ui after latest module changes

---
 .../assets/scss/components/_a4-char_counter.scss     |  4 ++++
 .../scss/components/{_poll.scss => _a4-poll.scss}    |  4 ++--
 .../scss/components/_a4-textarea_with_counter.scss   | 12 ++++++++++++
 adhocracy-plus/assets/scss/style.scss                |  5 +++--
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 adhocracy-plus/assets/scss/components/_a4-char_counter.scss
 rename adhocracy-plus/assets/scss/components/{_poll.scss => _a4-poll.scss} (98%)
 create mode 100644 adhocracy-plus/assets/scss/components/_a4-textarea_with_counter.scss

diff --git a/adhocracy-plus/assets/scss/components/_a4-char_counter.scss b/adhocracy-plus/assets/scss/components/_a4-char_counter.scss
new file mode 100644
index 000000000..5ca98d9f1
--- /dev/null
+++ b/adhocracy-plus/assets/scss/components/_a4-char_counter.scss
@@ -0,0 +1,4 @@
+.a4-char-counter {
+    color: $text-color-gray;
+    font-size: $font-size-sm;
+}
diff --git a/adhocracy-plus/assets/scss/components/_poll.scss b/adhocracy-plus/assets/scss/components/_a4-poll.scss
similarity index 98%
rename from adhocracy-plus/assets/scss/components/_poll.scss
rename to adhocracy-plus/assets/scss/components/_a4-poll.scss
index c43516f83..538b85b8e 100644
--- a/adhocracy-plus/assets/scss/components/_poll.scss
+++ b/adhocracy-plus/assets/scss/components/_a4-poll.scss
@@ -1,7 +1,7 @@
 $checkbox-size: 20px;
 
-// User question view
-.pollquestionlist-container {
+.pollquestionlist-container,
+.poll__preliminary-results {
     padding-top: $spacer;
     border-bottom: 1px solid $gray-lightest;
 }
diff --git a/adhocracy-plus/assets/scss/components/_a4-textarea_with_counter.scss b/adhocracy-plus/assets/scss/components/_a4-textarea_with_counter.scss
new file mode 100644
index 000000000..249c3adf0
--- /dev/null
+++ b/adhocracy-plus/assets/scss/components/_a4-textarea_with_counter.scss
@@ -0,0 +1,12 @@
+.a4-textarea-with-counter {
+    padding: $spacer 0;
+    margin-bottom: $spacer / 2;
+
+    &__textarea {
+        resize: vertical;
+        width: 100%!important;
+        overflow-y: auto;
+        line-height: 1.5;
+        max-height: 500px;
+    }
+}
diff --git a/adhocracy-plus/assets/scss/style.scss b/adhocracy-plus/assets/scss/style.scss
index fd59c4095..14af2779c 100644
--- a/adhocracy-plus/assets/scss/style.scss
+++ b/adhocracy-plus/assets/scss/style.scss
@@ -58,9 +58,12 @@
 
 @import "icons/style";
 
+@import "components/a4-char_counter";
 @import "components/a4-comments";
 @import "components/a4-editpoll";
+@import "components/a4-poll";
 @import "components/a4-termsofuse";
+@import "components/a4-textarea_with_counter";
 @import "components/action";
 @import "components/accordion";
 @import "components/account";
@@ -109,7 +112,6 @@
 @import "components/navi";
 @import "components/organisation";
 @import "components/pagination";
-@import "components/poll";
 @import "components/popper";
 @import "components/progress";
 @import "components/project_header";
@@ -127,7 +129,6 @@
 @import "components/tile";
 @import "components/timeline-carousel";
 @import "components/upload";
-
 @import "components/user_profile";
 @import "components/userdashboard";
 @import "components/userindicator";

From 627b87c87316307fefb1f8d91c757dcf627e1fe0 Mon Sep 17 00:00:00 2001
From: hom3mad3 <8156337+hom3mad3@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:40:12 +0100
Subject: [PATCH 2/2] update a4

---
 package.json          | 2 +-
 requirements/base.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index bc873cef4..d9dc7bb0a 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "@fortawesome/fontawesome-free": "5.15.4",
     "@maplibre/maplibre-gl-leaflet": "0.0.22",
     "@react-leaflet/core": "^2.1.0",
-    "adhocracy4": "git+https://github.com/liqd/adhocracy4#2143378f7ead6f23ecfbd563fab73fa66afed74c",
+    "adhocracy4": "git+https://github.com/liqd/adhocracy4#41764225f02be47e1b39433ae1f973bbd8f81e2c",
     "autoprefixer": "10.4.19",
     "bootstrap": "5.2.3",
     "css-loader": "7.1.2",
diff --git a/requirements/base.txt b/requirements/base.txt
index 34f8e7c23..d4a5ad71d 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,5 +1,5 @@
 # A4
-git+https://github.com/liqd/adhocracy4.git@2143378f7ead6f23ecfbd563fab73fa66afed74c#egg=adhocracy4
+git+https://github.com/liqd/adhocracy4.git@41764225f02be47e1b39433ae1f973bbd8f81e2c#egg=adhocracy4
 
 # Additional requirements
 brotli==1.1.0