Skip to content

Commit

Permalink
👌 [#1924] PR Feedback part 2
Browse files Browse the repository at this point in the history
  • Loading branch information
SilviaAmAm authored and sergei-maertens committed Oct 21, 2022
1 parent e34dc56 commit 0143820
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 34 deletions.
1 change: 0 additions & 1 deletion src/openforms/js/components/form/textfield.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {Formio} from 'react-formio';

import {DEFAULT_TEXT_TABS} from './edit/tabs';

class TextField extends Formio.Components.components.textfield {
Expand Down
8 changes: 4 additions & 4 deletions src/openforms/scss/admin/_app_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,16 @@ $djai-border-width: 8px;
}

// re-apply django admin styles
background-color: buttonface;
border: 1px solid #ccc;
background-color: var(--form-input-bg);
border: 1px solid var(--border-color);
border-radius: 4px;
padding: 5px 6px;
margin-top: 0;

&:focus {
color: inherit;
background-color: buttonface;
border-color: #999;
background-color: var(--form-input-bg);
border-color: var(--border-color);
box-shadow: none;
outline: initial;
}
Expand Down
46 changes: 22 additions & 24 deletions src/openforms/scss/components/builder/_builder.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,36 +69,34 @@ div.flatpickr-calendar.open {
padding-top: 10px;
}

.choices__list {
&--dropdown {
background-color: var(--body-bg);
color: var(--body-fg);
border-color: var(--border-color);
}
[ref='editForm'],
[ref='component'] {
.choices__list {
&--dropdown {
background-color: var(--body-bg);
color: var(--body-fg);
border-color: var(--border-color);
}

.choices__input {
background-color: var(--form-input-bg);
border-color: var(--border-color);
}
.choices__input {
background-color: var(--form-input-bg);
border-color: var(--border-color);
}

.choices__input.choices__input--cloned {
background-color: var(--form-input-bg);
border-color: var(--border-color);
.choices__item--selectable.is-highlighted {
background-color: var(--formio-dropdown-highlighted-bg);
}
}

.choices__item--selectable.is-highlighted {
background-color: var(--formio-dropdown-highlighted-bg);
.choices__list + .choices__input {
border: none;
border-radius: unset;
padding: 4px 0 4px 2px;
}
}

.choices__list + .choices__input {
border: none;
border-radius: unset;
padding: 4px 0 4px 2px;
}

.choices__list:not(:empty) + .choices__input {
width: 1ch;
.choices__list:not(:empty) + .choices__input {
width: 1ch;
}
}

.builder-sidebar_scroll {
Expand Down
5 changes: 0 additions & 5 deletions src/openforms/scss/vendor/_rjsf-field.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
input[type='email'] {
width: $input-field-size; // override from admin/rjsf default
}

select {
background-color: var(--form-input-bg) !important;
border-color: var(--border-color) !important;
}
}

&__errors {
Expand Down

0 comments on commit 0143820

Please sign in to comment.