Skip to content

Commit 235935f

Browse files
committed
Merge branch 'fix/per-rating-dropdown-position' into develop
2 parents 72da8c9 + 9466c97 commit 235935f

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

app/src/views/PerAssessmentForm/AreaInput/ComponentInput/index.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,14 @@ function ComponentInput(props: Props) {
187187
)}
188188
key={component.id}
189189
heading={getComponentTitle(component)}
190-
childrenContainerClassName={styles.questionList}
191-
headerDescription={component.description}
192190
headingClassName={styles.heading}
193191
withInternalPadding
194192
withoutWrapInHeading
195193
spacing="comfortable"
196194
headingDescriptionContainerClassName={styles.statusSelectionContainer}
197-
/>
195+
>
196+
{component.description}
197+
</Container>
198198
);
199199
}
200200

@@ -203,10 +203,10 @@ function ComponentInput(props: Props) {
203203
className={_cs(styles.componentInput, className)}
204204
key={component.id}
205205
heading={getComponentTitle(component)}
206-
childrenContainerClassName={styles.questionList}
207206
withHeaderBorder
208207
headerDescription={component.description}
209-
headingDescriptionContainerClassName={styles.statusSelectionContainer}
208+
headingClassName={styles.heading}
209+
headingContainerClassName={styles.headingContainer}
210210
headingDescription={(
211211
<SelectInput
212212
readOnly={readOnly}
@@ -227,7 +227,7 @@ function ComponentInput(props: Props) {
227227
showExpandButtonAtBottom
228228
initiallyExpanded
229229
contentViewType="vertical"
230-
spacing="relaxed"
230+
spacing="comfortable"
231231
>
232232
<NonFieldError error={error} />
233233
<NonFieldError error={questionInputError} />

app/src/views/PerAssessmentForm/AreaInput/ComponentInput/styles.module.css

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
.component-input {
2+
.heading-container {
3+
@media screen and (max-width: 50rem) {
4+
flex-wrap: wrap;
5+
}
6+
}
7+
28
.heading {
39
flex-grow: 1;
410
}
511

6-
.status-selection-container {
7-
display: flex;
8-
9-
.status-selection {
10-
width: 20rem;
11-
}
12+
.status-selection {
13+
width: 100%;
14+
max-width: 20rem;
1215
}
1316

1417
.description {

0 commit comments

Comments
 (0)