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

Update modal border #2597

Merged
merged 3 commits into from
Dec 5, 2024
Merged

Update modal border #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7366c2
copy updates
DarksightKellar Dec 5, 2024
69b3ead
Apply modal border dimension effects
DarksightKellar Dec 5, 2024
e94f677
Merge branch 'develop' into 2593-modal-border
DarksightKellar Dec 5, 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
2 changes: 1 addition & 1 deletion src/components/Roles/RolePaymentDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ export function RolePaymentDetails({
height={6}
borderRadius="lg"
>
{t(payment.isCancelling ? 'cancelling' : 'cancelled')}
{t('cancelled')}
</Tag>
)}
<GreenStreamingDot isStreaming={payment.isStreaming()} />
Expand Down
3 changes: 1 addition & 2 deletions src/components/ui/modals/ModalBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ export function ModalBase({
) : (
<ModalContent
bg="neutral-2"
borderWidth="1px"
borderRadius="0.5rem"
borderColor="neutral-4"
boxShadow="0px 0px 0px 1px #100414, 0px 0px 0px 1px rgba(248, 244, 252, 0.04) inset, 0px 1px 0px 0px rgba(248, 244, 252, 0.04) inset"
padding="1.5rem"
containerProps={
zIndex
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/locales/en/proposal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,6 @@
"pendingProposalNotice": "Pending proposal still processing",
"metadataFailedParsePlaceholder": "Unknown - Failed to parse metadata",
"multisigNonceDuplicateErrorMessage": "Transaction with the same nonce already exists",
"createFromScratch": "Create from scratch",
"createFromScratch": "Start from scratch",
"browseTemplates": "Browse templates"
}
1 change: 0 additions & 1 deletion src/i18n/locales/en/roles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
"roleInfoErrorPaymentScheduleInvalid": "Invalid payment schedule.",
"cancelPayment": "Cancel Payment",
"cancelled": "Canceled",
"cancelling": "Cancelling",
"cancelPaymentInfoMessage": "These values can't be edited. To update them, please cancel this payment and create a new one.",
"cancellingPaymentInfoMessage": "This payment is marked for cancelling and thus can not be edited.",
"confirmCancelPaymentTitle": "Are you sure you want to cancel this payment?",
Expand Down
Loading