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 10427 changes that inadvertently had too broad of an impact #5335

Merged
merged 6 commits into from
Sep 6, 2024
Merged

Revert 10427 changes that inadvertently had too broad of an impact #5335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
483ab8c
10427: fix nav item button spacing introduced by previous padding change
En-8 Sep 4, 2024
0c2cbf9
10427: fix message-document-viewer misalignment due to button padding…
En-8 Sep 4, 2024
3b647c8
10427: cleanup
En-8 Sep 4, 2024
c784126
Revert "10427: cleanup"
En-8 Sep 5, 2024
7b30533
Merge branch 'staging' into 10427-story
En-8 Sep 5, 2024
e5fe2ef
Merge remote-tracking branch 'ustc/test' into 10427-story-intermediate
En-8 Sep 6, 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: 3 additions & 4 deletions web-client/src/styles/buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,12 @@ button:disabled {
}

&.ustc-button--unstyled {
margin-top: 0.75rem;
margin-bottom: 0.75rem;
padding: 0.75rem 0;
line-height: normal;
text-align: center;

&.margin-top-0 {
margin-top: 0;
&.padding-top-0 {
padding-top: 0;
}
}

Expand Down
7 changes: 0 additions & 7 deletions web-client/src/styles/custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ hr {
&.underlined {
border-bottom: 1px solid color($theme-color-base-lighter);
}

/* big screens */
@media only screen and (min-width: $medium-screen) {
&.flex-justify-space-between {
justify-content: space-between;
}
}
}

.max-width-200 {
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/ustc-ui/Modal/ConfirmModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const ConfirmModal = connect<ConfirmModalProps, typeof confirmModalDeps>(
<Button
iconRight
link
className="text-no-underline hide-on-mobile float-right margin-right-0 margin-top-0"
className="text-no-underline hide-on-mobile float-right margin-right-0 padding-top-0"
icon="times-circle"
onClick={event => {
event.stopPropagation();
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/views/CreateOrder/CreateOrder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const CreateOrder = connect(
{createOrderHelper.showAddDocketNumbersButton && (
<Button
link
className="margin-top-0"
className="padding-top-0"
data-testid="add-docket-number-btn"
icon={createOrderHelper.addDocketNumbersButtonIcon}
id="add-docket-numbers-btn"
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/views/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ export const Header = connect(
<Button
iconRight
link
className="usa-nav__close float-right margin-right-0 margin-top-0"
className="usa-nav__close float-right margin-right-0 padding-top-0"
icon="times-circle"
onClick={() => toggleMobileMenuSequence()}
>
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/views/Login/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export const Login = connect(
<span>
Don&apos;t have an account?{' '}
<Button
className="margin-top-0"
className="padding-top-0"
link={true}
type="button"
onClick={e => {
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/views/ModalDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export const ModalDialog = ({
<Button
iconRight
link
className="text-no-underline hide-on-mobile float-right margin-right-0 margin-top-0"
className="text-no-underline hide-on-mobile float-right margin-right-0 padding-top-0"
data-testid="close-modal-button"
icon="times-circle"
id="close-modal-button"
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/views/ScanBatchPreviewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export const ScanBatchPreviewer = connect(
<div className="padding-top-2">
<Button
link
className="red-warning push-right margin-bottom-1 margin-top-0"
className="red-warning push-right margin-bottom-1 padding-top-0"
data-testid="remove-pdf"
onClick={() => {
openConfirmDeletePDFModalSequence();
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/views/StartCaseUpdated/PetitionFactOrReason.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const PetitionFactOrReason = connect<
{factOrReasonCount > 0 && (
<Button
link
className="reason-button remove-fact-reason-button flex-align-self-center"
className="reason-button remove-fact-reason-button"
icon="times"
onClick={() =>
removeFactOrReasonSequence({
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/views/StartCaseUpdated/UpdatedFilePetitionStep3.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export const UpdatedFilePetitionStep3 = connect(
{irsNoticeUploadFormInfo.length < 5 && (
<Button
link
className={classNames('margin-top-0', 'text-left')}
className={classNames('padding-top-0', 'text-left')}
data-testid="add-another-irs-notice-button"
onClick={() => addAnotherIrsNoticeToFormSequence()}
>
Expand Down
2 changes: 1 addition & 1 deletion web-client/src/views/TrialSessionDetail/ServeThirtyDayNoticeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const component = ({
<Button
iconRight
link
className="text-no-underline hide-on-mobile float-right margin-right-0 margin-top-0"
className="text-no-underline hide-on-mobile float-right margin-right-0 padding-top-0"
icon="times-circle"
onClick={() => closeModalSequence()}
>
Expand Down
4 changes: 2 additions & 2 deletions web-client/src/views/TrialSessionDetail/TrialSessionInformation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export const TrialSessionInformation = connect(
return (
<>
<div className="grid-container padding-x-0">
<div className="grid-row flex-justify-space-between">
<div className="grid-row">
<div className="grid-col-auto">
<h1>
Session Information
Expand All @@ -115,7 +115,7 @@ export const TrialSessionInformation = connect(
)}
</h1>
</div>
<div className="grid-col-fill tablet:grid-col-auto">
<div className="grid-col-fill display-flex flex-justify-end">
{formattedTrialSessionDetails.canDelete && (
<Button
link
Expand Down
7 changes: 6 additions & 1 deletion web-client/src/views/WorkQueue/RecentMessages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import React from 'react';
export const RecentMessages = () => {
return (
<div className="margin-top-4">
<Button link className="float-right" href="/messages/my/inbox">
<Button
link
className="float-right"
href="/messages/my/inbox"
overrideMargin="margin-0"
>
View All Messages
</Button>

Expand Down
Loading