mB redesign poll

liqd · Jun 24, 2024 · 1ef70bd · 1ef70bd
1 parent 811c326
commit 1ef70bd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/adhocracy4/polls/static/PollDetail/PollOpenQuestion.jsx b/adhocracy4/polls/static/PollDetail/PollOpenQuestion.jsx
@@ -25,7 +25,7 @@ export const PollOpenQuestion = (props) => {
  }
 
  return (
- <div className="poll">
+ <div className="poll poll--question">
  <h2>{props.question.label}</h2>
  {questionHelpText}
  <div className="poll__rows">

diff --git a/adhocracy4/polls/static/PollDetail/PollQuestion.jsx b/adhocracy4/polls/static/PollDetail/PollQuestion.jsx
@@ -69,7 +69,7 @@ export const PollQuestion = (props) => {
 
  return (
  <form>
- <div className="poll">
+ <div className="poll poll--question">
  <h2>{props.question.label}</h2>
  {questionHelpText}
  {multiHelpText}

diff --git a/adhocracy4/polls/static/PollDetail/PollResults.jsx b/adhocracy4/polls/static/PollDetail/PollResults.jsx
@@ -41,9 +41,9 @@ export default class PollResult extends React.Component {
  getOtherAnswerText () {
  let otherAnswerText
  if (this.state.showOtherAnswers) {
- otherAnswerText = <span>{django.gettext('Hide other answers')}</span>
+ otherAnswerText = <>{django.gettext('Hide other answers')}</>
  } else {
- otherAnswerText = <span>{django.gettext('Show other answers')}</span>
+ otherAnswerText = <>{django.gettext('Show other answers')}</>
  }
  return (
  otherAnswerText
@@ -95,7 +95,7 @@ export default class PollResult extends React.Component {
  }
 
  return (
- <div className="poll">
+ <div className="poll poll--result">
  <h2>{this.state.question.label}</h2>
  <div className="poll__rows">
  {this.state.question.choices.map((choice, i) => {

diff --git a/adhocracy4/polls/static/__tests__/__snapshots__/PollQuestion.jest.jsx.snap b/adhocracy4/polls/static/__tests__/__snapshots__/PollQuestion.jest.jsx.snap
@@ -7,7 +7,7 @@ exports[`render <PollQuestion> with... -> multiple-choice -> non-open-asnwers 1`
  <div>
  <form>
  <div
- class="poll"
+ class="poll poll--question"
  >
  <h2>
  My Question
@@ -62,7 +62,7 @@ exports[`render <PollQuestion> with... -> multiple-choice -> non-open-asnwers 1`
  "container": <div>
  <form>
  <div
- class="poll"
+ class="poll poll--question"
  >
  <h2>
  My Question
@@ -174,7 +174,7 @@ exports[`render <PollQuestion> with... -> multiple-choice -> open-asnwers 1`] =
  <div>
  <form>
  <div
- class="poll"
+ class="poll poll--question"
  >
  <h2>
  My Question
@@ -229,7 +229,7 @@ exports[`render <PollQuestion> with... -> multiple-choice -> open-asnwers 1`] =
  "container": <div>
  <form>
  <div
- class="poll"
+ class="poll poll--question"
  >
  <h2>
  My Question
@@ -341,7 +341,7 @@ exports[`render <PollQuestion> with... -> single-choice -> non-open-asnwers 1`]
  <div>
  <form>
  <div
- class="poll"
+ class="poll poll--question"
  >
  <h2>
  My Question
@@ -391,7 +391,7 @@ exports[`render <PollQuestion> with... -> single-choice -> non-open-asnwers 1`]
  "container": <div>
  <form>
  <div
- class="poll"
+ class="poll poll--question"
  >
  <h2>
  My Question
@@ -498,7 +498,7 @@ exports[`render <PollQuestion> with... -> single-choice -> open-asnwers 1`] = `
  <div>
  <form>
  <div
- class="poll"
+ class="poll poll--question"
  >
  <h2>
  My Question
@@ -548,7 +548,7 @@ exports[`render <PollQuestion> with... -> single-choice -> open-asnwers 1`] = `
  "container": <div>
  <form>
  <div
- class="poll"
+ class="poll poll--question"
  >
  <h2>
  My Question

diff --git a/changelog/_8186.md b/changelog/_8186.md
@@ -0,0 +1,4 @@
+## Changed
+
+- added new modifier classes to `PollResults.jsx`, `PollOpenQuestion.jsx` and `PollQuestion.jsx` for customized paddings
+- replaced `<span></span>` with react fragment to keep consistency