Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#8443] a4-polls: adapt ui for textarea changes #2848

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[#8443] a4-polls: adapt ui for textarea changes #2848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
911dc97
a4-polls: adapt ui after latest module changes
hom3mad3 Dec 5, 2024
627b87c
update a4
hom3mad3 Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions adhocracy-plus/assets/scss/components/_a4-char_counter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.a4-char-counter {
color: $text-color-gray;
font-size: $font-size-sm;
}
4 changes: 2 additions & 2 deletions ...cy-plus/assets/scss/components/_poll.scss → ...plus/assets/scss/components/_a4-poll.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
12 changes: 12 additions & 0 deletions adhocracy-plus/assets/scss/components/_a4-textarea_with_counter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
5 changes: 3 additions & 2 deletions adhocracy-plus/assets/scss/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -127,7 +129,6 @@
@import "components/tile";
@import "components/timeline-carousel";
@import "components/upload";

@import "components/user_profile";
@import "components/userdashboard";
@import "components/userindicator";
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down