Skip to content

Commit

Permalink
Merge pull request #14193 from transcom/INT-B-21679-V2
Browse files Browse the repository at this point in the history
INT B-21679 v2
  • Loading branch information
danieljordan-caci authored Nov 14, 2024
2 parents 4bfbbed + 27e40d0 commit f52c1b3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
7 changes: 1 addition & 6 deletions src/components/ButtonDropdown/ButtonDropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ import styles from './ButtonDropdown.module.scss';

const ButtonDropdown = ({ children, onChange, value, ariaLabel, divClassName, testId }) => (
<div className={classnames(styles.ButtonDropdown, divClassName)} data-testid={testId}>
<Dropdown
aria-label={ariaLabel}
onChange={onChange}
className={classnames(styles.ButtonDropdown, 'usa-button')}
value={value}
>
<Dropdown aria-label={ariaLabel} onChange={onChange} className={styles.ButtonDropdown} value={value}>
{children}
</Dropdown>
<span className={styles.ButtonDropdownIcon} />
Expand Down
6 changes: 5 additions & 1 deletion src/components/ButtonDropdown/ButtonDropdown.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

.ButtonDropdown {
position: relative;
display: inline-block;
display: flex;
align-items: center;
font-weight: 600;
font-size:1.06rem;

select {
color: white;
background-color: $primary;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
display: flex;
flex-wrap: wrap;

button {
button,
:global(.usa-button){
margin: 0;
flex-grow: 0;
flex-basis: auto;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@

.newRemarkTextArea {
resize: vertical;
margin-bottom: 2rem;
}

0 comments on commit f52c1b3

Please sign in to comment.