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

Jump to bottom

Revert "Revert "MAIN B-21679 I-13498 overriding uswds styling"" #14191

Merged
merged 5 commits into from
Nov 14, 2024
+43 −22
Merged

Revert "Revert "MAIN B-21679 I-13498 overriding uswds styling"" #14191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a2f10e
Revert "Revert "MAIN B-21679 I-13498 overriding uswds styling""
cameroncaci Nov 14, 2024
32ed4d4
testing to see what this will do
danieljordan-caci Nov 14, 2024
6401ae8
fixing customer remark form
danieljordan-caci Nov 14, 2024
d92f244
Merge branch 'main' into revert-14189-revert-14178-MAIN-I-13498-overr…
danieljordan-caci Nov 14, 2024
d822c9f
Merge branch 'main' into revert-14189-revert-14178-MAIN-I-13498-overr…
danieljordan-caci Nov 14, 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
7 changes: 1 addition & 6 deletions src/components/ButtonDropdown/ButtonDropdown.jsx
View file
Open in desktop
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
View file
Open in desktop
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
12 changes: 3 additions & 9 deletions src/components/Customer/WizardNavigation/WizardNavigation.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,10 @@
flex-wrap: wrap;

button,
:global(.usa-button) {
// Reset button margins
:global(.usa-button){
margin: 0;
flex-grow: 1;
flex-basis: 0;

@include at-media('tablet') {
flex-grow: 0;
flex-basis: auto;
}
flex-grow: 0;
flex-basis: auto;
}

> .button + .button {
Expand Down
1 change: 1 addition & 0 deletions src/components/Office/CustomerSupportRemarkForm/CustomerSupportRemarkForm.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@

.newRemarkTextArea {
resize: vertical;
margin-bottom: 2rem;
}
1 change: 1 addition & 0 deletions src/components/Office/ShipmentForm/ShipmentForm.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@

.buttonGroup {
display: flex;
gap: 10px;
}

table {
Expand Down
36 changes: 31 additions & 5 deletions src/shared/styles/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,36 @@
}
}

.usa-form {
max-width: none;

@include at-media("mobile-lg") {
max-width: none;
}

@media all {
.usa-form {
max-width: none;
}
}

@media all{
.usa-form--large{
max-width:none;
}
}

.usa-button {
margin-top: 0;
margin-right:0.5rem;
}
}

.usa-button {
margin-top: 0;
margin-right:0.5rem;
}

//Modals

.modal {
Expand Down Expand Up @@ -318,10 +348,6 @@
border-top-color: white !important;
}

.usa-form {
max-width: 100%;
}

button {
@include u-margin-y(0);
&:first-child {
Expand All @@ -332,4 +358,4 @@
.display-flex {
@include u-margin-top(3);
}
}
}
2 changes: 1 addition & 1 deletion src/styles/form.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,4 @@ p + .radioGroup {

.pBeforeFormGroup {
@include u-margin-bottom(0);
}
}
Loading