From 802f656caa1aa0ae2bd725ef1c68d223951fa84b Mon Sep 17 00:00:00 2001 From: Vinh Date: Fri, 31 Jul 2020 00:19:59 +0200 Subject: [PATCH] Stream UI bugfixes (#3041) * fix: various ui fixes * fix: tooltip button active color * fix: teal color * fix: RTE borders * fix: snapshots * fix: reduce padding of show more of this conversation button * Fix font weight fallback values * Replace RTE validation messages with v3 CallOuts CORL-1213 * More styling classnames * chore: remove not used style * fix: reaction button primary color * fix snapshots * harmonize data-variant on buttons * [CORL-1215] Install Style Tweaks (#3046) * fix logic around repeat posts with or without media embeds: (#3042) * fix: restore ReportCommentEvent (#3037) Co-authored-by: Wyatt Johnson * fix: fixed issue with graphiql (#3043) * README.md Update (#3045) * chore: update README.md * fix: removed README from doctoc * fix: replaced emoji codes with emjoi * fix: removed emoji's due to browser rendering issues * fix: fixed bugs with install styles Co-authored-by: Tessa Thornton Co-authored-by: Vinh * fix: remove lineheight css variables and make them relative * fix: adjust line-heights * fix: update snapshots * More css bindings for client styling Set bindable class on community guidelines Set bindable classname on "Comment on" label * fix: more tweaks * fix: snapshots * fix: lint and tests Co-authored-by: nick-funk Co-authored-by: Wyatt Johnson Co-authored-by: Tessa Thornton --- CSS_VARIABLES.md | 33 +- package-lock.json | 112 +-- src/core/client/account/routes/NotFound.css | 2 +- .../download/Download/DownloadDescription.css | 4 +- .../account/routes/email/Confirm/Confirm.css | 8 +- .../notifications/Unsubscribe/Unsubscribe.css | 8 +- .../account/routes/password/Reset/Reset.css | 8 +- .../__snapshots__/confirmEmail.spec.tsx.snap | 1 + .../__snapshots__/resetPassword.spec.tsx.snap | 1 + .../unsubscribeNotifications.spec.tsx.snap | 1 + .../admin/App/DecisionHistory/DotDivider.css | 2 +- .../admin/App/DecisionHistory/Empty.css | 2 +- .../App/DecisionHistory/GoToCommentLink.css | 2 +- .../client/admin/App/DecisionHistory/Info.css | 2 +- .../App/DecisionHistory/ShowMoreButton.css | 2 +- .../admin/App/DecisionHistory/Timestamp.css | 2 +- .../admin/App/DecisionHistory/Username.css | 2 +- .../components/Comment/CommentContent.css | 2 +- .../admin/components/Comment/InReplyTo.css | 4 +- .../admin/components/Comment/Username.css | 2 +- .../components/Comment/UsernameButton.css | 2 +- .../ConversationModalCommentContainer.tsx | 2 +- .../ConversationModalHeaderContainer.css | 2 +- .../ConversationModalHeaderContainer.tsx | 7 +- .../ConversationModalRepliesContainer.tsx | 4 +- .../client/admin/components/ModalBodyText.css | 2 +- .../client/admin/components/ModalHeader.css | 2 +- .../ModerateCard/FlagDetailsCategory.css | 2 +- .../ModerateCard/FlagDetailsEntry.css | 5 +- .../components/ModerateCard/ModerateCard.css | 14 +- .../ModerateCard/ModeratedByContainer.css | 4 +- .../components/ModerateCard/ToxicityLabel.css | 2 +- .../PaginatedSelect/PaginatedSelect.css | 2 +- .../UserHistoryDrawer/ModeratorNote.css | 6 +- .../UserHistoryDrawer/RecentHistory.css | 7 +- .../UserHistoryDrawerContainer.css | 6 +- .../UserStatusDetailsContainer.css | 2 +- .../admin/components/UserStatus/BanModal.css | 2 +- .../components/UserStatus/SuspendForm.css | 2 +- .../components/UserStatus/SuspendModal.css | 4 +- .../components/UserStatus/UserStatus.css | 2 +- .../admin/routes/AuthCheck/Restricted.css | 8 +- .../admin/routes/Community/EmptyMessage.css | 2 +- .../Community/InviteUsers/InviteUsersForm.css | 2 +- .../InviteUsers/InviteUsersModal.css | 2 +- .../Community/InviteUsers/RoleField.css | 2 +- .../routes/Community/InviteUsers/Success.css | 2 +- .../client/admin/routes/Community/UserRow.css | 2 +- .../client/admin/routes/Configure/Header.css | 2 +- .../admin/routes/Configure/HelperText.css | 2 +- .../client/admin/routes/Configure/Link.css | 2 +- .../SSOSigningSecretRotation/DateField.css | 2 +- .../SSOSigningSecretRotation/StatusField.css | 2 +- .../General/AnnouncementFormModal.css | 2 +- .../General/AnnouncementFormModal.tsx | 2 +- .../sections/General/CommentLengthConfig.css | 2 +- .../RotateSigningSecretModal.css | 2 +- .../ExternalModerationPhaseRow.css | 2 +- .../sections/Sites/CreateSiteForm.tsx | 2 +- .../RotateSigningSecretModal.css | 2 +- .../WebhookEndpoints/WebhookEndpointRow.css | 2 +- .../Dashboard/components/TodayValue.css | 2 +- .../admin/routes/Dashboard/sections/Today.css | 2 +- .../ForgotPasswordContainer.css | 2 +- .../admin/routes/Login/CompleteAccountBox.css | 6 +- .../views/LinkAccount/HorizontalSeparator.css | 2 +- .../views/SignIn/HorizontalSeparator.css | 2 +- .../routes/Login/views/SignIn/SignIn.css | 2 +- .../Login/views/SignIn/SignInWithEmail.css | 2 +- .../routes/Login/views/SignIn/Version.css | 2 +- .../admin/routes/Moderate/HotkeysModal.css | 6 +- .../ModerateSearchBar/ModerateAllOption.css | 2 +- .../Moderate/ModerateSearchBar/Option.css | 4 +- .../ModerateSearchBar/SeeAllOption.css | 2 +- .../routes/Moderate/Queue/EmptyMessage.css | 2 +- .../SectionSelectorSection.css | 2 +- .../SiteSelector/SiteSelectorSite.css | 2 +- src/core/client/admin/routes/NotFound.css | 2 +- .../admin/routes/Stories/EmptyMessage.css | 2 +- .../admin/routes/Stories/NoMatchMessage.css | 2 +- .../addEmailAddress.spec.tsx.snap | 6 - .../createPassword.spec.tsx.snap | 5 - .../createUsername.spec.tsx.snap | 5 - .../__snapshots__/linkAccount.spec.tsx.snap | 2 - .../__snapshots__/restricted.spec.tsx.snap | 2 - .../signInWithEmail.spec.tsx.snap | 6 - .../__snapshots__/community.spec.tsx.snap | 20 +- .../__snapshots__/advanced.spec.tsx.snap | 1 - .../__snapshots__/auth.spec.tsx.snap | 49 +- .../__snapshots__/general.spec.tsx.snap | 22 +- .../__snapshots__/moderation.spec.tsx.snap | 1 - .../__snapshots__/organization.spec.tsx.snap | 4 - .../__snapshots__/webhooks.spec.tsx.snap | 7 - .../__snapshots__/wordList.spec.tsx.snap | 1 - .../invite/__snapshots__/invite.spec.tsx.snap | 1 - .../__snapshots__/regularQueue.spec.tsx.snap | 14 - .../__snapshots__/rejectedQueue.spec.tsx.snap | 8 - .../__snapshots__/singleComment.spec.tsx.snap | 6 - .../__snapshots__/stories.spec.tsx.snap | 10 +- .../client/auth/components/OrSeparator.css | 2 +- .../auth/components/SetPasswordField.css | 2 +- .../client/auth/components/UsernameField.css | 2 +- .../addEmailAddress.spec.tsx.snap | 5 + .../createPassword.spec.tsx.snap | 5 + .../createUsername.spec.tsx.snap | 5 + .../forgotPassword.spec.tsx.snap | 2 + .../__snapshots__/linkAccount.spec.tsx.snap | 2 + .../test/__snapshots__/signIn.spec.tsx.snap | 10 + .../test/__snapshots__/signUp.spec.tsx.snap | 8 + .../views/AddEmailAddress/AddEmailAddress.css | 8 +- .../views/CreatePassword/CreatePassword.css | 4 +- .../views/CreateUsername/CreateUsername.css | 4 +- .../auth/views/ForgotPassword/CheckEmail.css | 8 +- .../ForgotPassword/ForgotPasswordForm.css | 6 +- .../LinkAccount/LinkAccountContainer.css | 8 +- src/core/client/auth/views/SignIn/SignIn.css | 6 +- .../auth/views/SignIn/SignInWithEmail.css | 2 +- src/core/client/auth/views/SignUp/SignUp.css | 6 +- .../client/framework/components/Markdown.css | 14 +- .../framework/components/NetworkError.css | 2 +- .../MarkdownEditor/MarkdownEditor.css | 12 +- src/core/client/install/App/App.css | 2 +- src/core/client/install/App/Header.css | 14 +- src/core/client/install/App/Header.tsx | 9 +- src/core/client/install/App/Wizard.css | 2 +- .../install/App/steps/AddOrganizationStep.tsx | 2 +- .../client/install/App/steps/FinalStep.tsx | 11 +- .../App/steps/PermittedDomainsStep.tsx | 2 +- .../install/App/steps/SelectLanguageStep.tsx | 2 +- src/core/client/stream/App/TabBar.css | 2 +- src/core/client/stream/classes.ts | 20 +- .../common/UserBox/UserBoxAuthenticated.css | 6 +- .../common/UserBox/UserBoxAuthenticated.tsx | 6 +- .../common/UserBox/UserBoxUnauthenticated.css | 2 +- .../UserBoxAuthenticated.spec.tsx.snap | 4 +- src/core/client/stream/shared/htmlContent.css | 2 +- .../stream/tabs/Comments/Comment/Comment.css | 2 +- .../stream/tabs/Comments/Comment/Comment.tsx | 1 + .../Comments/Comment/CommentContainer.tsx | 13 +- .../tabs/Comments/Comment/CommentToggle.css | 2 +- .../EditCommentForm/EditCommentForm.tsx | 8 +- .../tabs/Comments/Comment/EditedMarker.css | 2 +- .../tabs/Comments/Comment/InReplyTo.css | 4 +- .../MediaConfirmation/MediaConfirmPrompt.tsx | 2 +- .../MediaSection/MediaSectionContainer.tsx | 4 +- .../ModerationActionBanContainer.css | 2 +- .../ModerationActionsContainer.css | 4 +- .../PermalinkButton/PermalinkButton.tsx | 2 + .../PermalinkButton/PermalinkPopover.css | 2 +- .../PermalinkButton/PermalinkPopover.tsx | 1 + .../Comment/ReactionButton/ReactionButton.css | 1 - .../Comment/ReactionButton/ReactionButton.tsx | 23 +- .../ReplyCommentForm/ReplyCommentForm.css | 15 - .../ReplyCommentForm/ReplyCommentForm.tsx | 1 + .../Comment/ReplyCommentForm/ReplyTo.css | 4 +- .../Comment/ReportFlow/ReportButton.css | 2 +- .../Comment/ReportFlow/ReportButton.tsx | 1 + .../Comment/ReportFlow/ReportCommentForm.css | 10 +- .../Comments/Comment/ShowConversationLink.css | 6 +- .../Comments/Comment/ShowConversationLink.tsx | 1 + .../tabs/Comments/Comment/TopBarLeft.tsx | 2 +- .../UserBanPopoverContainer.css | 4 +- .../UserBanPopoverContainer.tsx | 2 +- .../UserIgnorePopoverContainer.css | 4 +- .../UserPopoverOverviewContainer.css | 2 +- .../Comments/Comment/Username/Username.css | 2 +- .../ShowConversationLink.spec.tsx.snap | 1 + .../tabs/Comments/GifSelector/GifSelector.tsx | 4 +- .../ConversationThreadContainer.tsx | 2 +- .../Comments/PermalinkView/PermalinkView.css | 4 +- .../PermalinkView/Timeline/Circle.css | 2 +- .../client/stream/tabs/Comments/RTE/RTE.css | 4 +- .../client/stream/tabs/Comments/RTE/RTE.tsx | 2 +- .../RTE/__snapshots__/RTE.spec.tsx.snap | 2 +- .../Comments/ReplyList/ReplyListContainer.tsx | 2 +- .../Stream/Announcement/Announcement.css | 2 +- .../AnsweredCommentContainer.css | 2 +- .../Stream/CommentForm/CommentForm.css | 14 +- .../Stream/CommentForm/CommentForm.tsx | 157 ++-- .../CommunityGuidelines.css | 1 + .../CommunityGuidelines.tsx | 6 +- .../CommunityGuidelines.spec.tsx.snap | 4 +- .../Stream/FeaturedCommentTooltip.tsx | 4 +- .../FeaturedCommentContainer.css | 2 +- .../PostCommentForm/PostCommentForm.tsx | 1 + .../PostCommentForm/PostCommentFormFake.css | 2 +- .../stream/tabs/Comments/Stream/SortMenu.css | 4 +- .../stream/tabs/Comments/Stream/SortMenu.tsx | 1 + .../tabs/Comments/Stream/StreamContainer.tsx | 3 + .../__snapshots__/SortMenu.spec.tsx.snap | 8 +- .../tabs/Configure/AddMessage/shared.css | 4 +- .../ConfigureStream/ConfigureStream.css | 2 +- .../WidthLimitedDescription.css | 2 +- .../LiveUpdatesConfig/DisableLiveUpdates.css | 4 +- .../LiveUpdatesConfig/EnableLiveUpdates.css | 4 +- .../OpenOrCloseStream/CloseStream.css | 4 +- .../OpenOrCloseStream/OpenStream.css | 4 +- .../stream/tabs/Configure/Q&A/DisableQA.css | 4 +- .../stream/tabs/Configure/Q&A/EnableQA.css | 4 +- .../tabs/Configure/Q&A/ExpertListItem.css | 6 +- .../tabs/Configure/Q&A/ExpertSearchItem.css | 4 +- .../Q&A/ExpertSelectionContainer.css | 10 +- .../tabs/Configure/Q&A/NoLongerAnExpert.css | 4 +- .../tabs/Discussions/DiscussionsContainer.tsx | 2 +- .../Profile/MyComments/CommentHistory.css | 4 +- .../Profile/MyComments/CommentHistory.tsx | 2 +- .../MyComments/DownloadCommentsContainer.css | 6 +- .../Profile/MyComments/HistoryComment.css | 12 +- .../Profile/MyComments/HistoryComment.tsx | 6 +- .../CommentHistory.spec.tsx.snap | 4 +- .../HistoryComment.spec.tsx.snap | 6 +- .../Preferences/IgnoreUserListItem.css | 4 +- .../IgnoreUserSettingsContainer.css | 6 +- .../NotificationSettingsContainer.css | 6 +- .../ChangeEmail/ChangeEmailContainer.css | 13 +- .../tabs/Profile/Settings/ChangePassword.css | 4 +- .../ChangeUsernameContainer.css | 12 +- .../DeleteAccount/DeleteAccountContainer.css | 4 +- .../DeleteAccount/Pages/Common/Page.css | 8 +- .../stream/tabs/Profile/Settings/Username.css | 2 +- .../renderFeaturedStream.spec.tsx.snap | 25 +- .../__snapshots__/permalinkView.spec.tsx.snap | 55 +- ...permalinkViewCommentNotFound.spec.tsx.snap | 3 + ...permalinkViewLoadMoreParents.spec.tsx.snap | 57 +- .../comments/permalink/permalinkView.spec.tsx | 1 + .../__snapshots__/editComment.spec.tsx.snap | 719 +++++++++--------- .../__snapshots__/loadMore.spec.tsx.snap | 21 +- .../__snapshots__/postComment.spec.tsx.snap | 15 +- .../postLocalReply.spec.tsx.snap | 271 ++++--- .../__snapshots__/postReply.spec.tsx.snap | 225 +++--- .../__snapshots__/reaction.spec.tsx.snap | 10 +- .../renderCommunityGuidelines.spec.tsx.snap | 33 +- .../renderMessageBox.spec.tsx.snap | 199 ++--- .../__snapshots__/renderReplies.spec.tsx.snap | 40 +- .../__snapshots__/renderStream.spec.tsx.snap | 31 +- .../__snapshots__/reportComment.spec.tsx.snap | 12 +- .../showAllReplies.spec.tsx.snap | 11 +- .../showConversation.spec.tsx.snap | 13 +- .../__snapshots__/sortStream.spec.tsx.snap | 20 +- .../renderConfigure.spec.tsx.snap | 13 +- .../__snapshots__/account.spec.tsx.snap | 5 + .../__snapshots__/myComments.spec.tsx.snap | 17 +- .../v2/AppNotification/AppNotification.css | 2 +- src/core/client/ui/components/v2/Box/Box.tsx | 5 +- .../client/ui/components/v2/Button/Button.css | 2 +- .../client/ui/components/v2/Button/Button.tsx | 6 +- .../Button/__snapshots__/Button.spec.tsx.snap | 5 +- .../ui/components/v2/CheckBox/CheckBox.css | 2 +- .../ui/components/v2/CheckBox/CheckBox.tsx | 4 +- .../__snapshots__/CheckBox.spec.tsx.snap | 2 +- .../ui/components/v2/Counter/Counter.css | 4 +- .../FormFieldDescription.css | 2 +- .../v2/FormFieldFooter/FormFieldFooter.css | 2 +- .../components/v2/HelperText/HelperText.css | 2 +- .../v2/InputDescription/InputDescription.css | 2 +- .../components/v2/InputLabel/InputLabel.css | 2 +- .../client/ui/components/v2/Label/Label.css | 2 +- .../ui/components/v2/Message/Message.css | 2 +- .../v2/PasswordField/PasswordField.css | 2 +- .../components/v2/RadioButton/RadioButton.css | 2 +- .../components/v2/SelectField/SelectField.css | 2 +- .../components/v2/SelectField/SelectField.tsx | 6 +- .../__snapshots__/SelectField.spec.tsx.snap | 2 +- .../client/ui/components/v2/Steps/Step.css | 2 +- .../ui/components/v2/Table/TableCell.css | 4 +- src/core/client/ui/components/v2/Tabs/Tab.css | 4 +- src/core/client/ui/components/v2/Tag/Tag.css | 2 +- .../ui/components/v2/TextField/TextField.css | 4 +- .../TextFieldAdornment/TextFieldAdornment.css | 2 +- .../ui/components/v2/TextLink/TextLink.css | 2 +- .../ui/components/v2/Textarea/Textarea.css | 2 +- .../components/v2/TileSelector/TileOption.css | 3 +- .../ui/components/v2/Timestamp/Timestamp.css | 2 +- .../ui/components/v2/Tooltip/Tooltip.css | 4 +- .../components/v2/Tooltip/TooltipButton.tsx | 15 +- .../components/v2/Typography/Typography.css | 40 +- .../client/ui/components/v3/Button/Button.css | 8 +- .../client/ui/components/v3/Button/Button.tsx | 2 + .../ui/components/v3/CallOut/CallOut.css | 6 +- .../v3/ExperimentalTag/ExperimentalTag.css | 2 +- .../v3/ExperimentalTag/ExperimentalTag.tsx | 2 +- .../ui/components/v3/Tombstone/Tombstone.css | 2 +- .../ValidationMessage/ValidationMessage.css | 2 +- src/core/client/ui/theme/sharedVariables.ts | 22 +- 284 files changed, 1740 insertions(+), 1522 deletions(-) delete mode 100644 src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentForm.css diff --git a/CSS_VARIABLES.md b/CSS_VARIABLES.md index 9f77e28e54..49cee7268e 100644 --- a/CSS_VARIABLES.md +++ b/CSS_VARIABLES.md @@ -36,7 +36,6 @@ the old CSS Variables, please upgrade. Currently we have a compatibility layer t - font-weight-primary - font-weight-secondary - font-size - - line-height - shadow - spacing - mini-unit @@ -192,17 +191,17 @@ Different font weights with matching values for the fonts. #### font-weight-primary -`--font-weight-primary-bold: 700; /* Before 6.3.0: --font-weight-sans-bold */` +`--font-weight-primary-bold: 700; /* Before 6.3.0: --font-weight-bold */` -`--font-weight-primary-semi-bold: 600; /* Before 6.3.0: --font-weight-sans-medium */` +`--font-weight-primary-semi-bold: 600; /* Before 6.3.0: --font-weight-medium */` -`--font-weight-primary-regular: 300; /* Before 6.3.0: --font-weight-sans-regular */` +`--font-weight-primary-regular: 300; /* Before 6.3.0: --font-weight-light */` #### font-weight-secondary -`--font-weight-secondary-bold: 700; /* Before 6.3.0: --font-weight-serif-bold */` +`--font-weight-secondary-bold: 700; /* Before 6.3.0: --font-weight-bold */` -`--font-weight-secondary-regular: 300; /* Before 6.3.0: --font-weight-serif-regular */` +`--font-weight-secondary-regular: 300; /* Before 6.3.0: --font-weight-light */` ### font-size @@ -234,28 +233,6 @@ Different font weights with matching values for the fonts. `--font-size-icon-xs: 0.75rem;` -### line-height - -`--line-height-comment-body: 1.45rem;` - -`--line-height-field-description: 1.3rem;` - -`--line-height-1: 0.75rem;` - -`--line-height-2: 0.875rem;` - -`--line-height-3: 1rem;` - -`--line-height-4: 1.125rem;` - -`--line-height-5: 1.25rem;` - -`--line-height-6: 1.5rem;` - -`--line-height-7: 1.75rem;` - -`--line-height-8: 2rem;` - ### shadow Different shadows that are currently used in Coral. diff --git a/package-lock.json b/package-lock.json index 92abb99ea7..c777f6f653 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22020,28 +22020,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "resolved": false, "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "resolved": false, "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "resolved": false, "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, @@ -22052,14 +22052,14 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "resolved": false, "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "optional": true, @@ -22077,35 +22077,35 @@ }, "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "resolved": false, "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "resolved": false, "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "resolved": false, "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, @@ -22115,21 +22115,21 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "resolved": false, "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "resolved": false, "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "resolved": false, "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true @@ -22159,7 +22159,7 @@ }, "gauge": { "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "resolved": false, "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, @@ -22176,7 +22176,7 @@ }, "glob": { "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "resolved": false, "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, @@ -22191,14 +22191,14 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "resolved": false, "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "resolved": false, "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, @@ -22208,7 +22208,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "resolved": false, "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, @@ -22218,7 +22218,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "resolved": false, "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, @@ -22229,21 +22229,21 @@ }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "resolved": false, "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true, "optional": true }, "ini": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "resolved": false, "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "optional": true, @@ -22253,14 +22253,14 @@ }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "resolved": false, "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "optional": true, @@ -22308,7 +22308,7 @@ }, "ms": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "resolved": false, "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true @@ -22322,7 +22322,7 @@ }, "needle": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz", + "resolved": false, "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, @@ -22334,7 +22334,7 @@ }, "node-pre-gyp": { "version": "0.12.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", + "resolved": false, "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, @@ -22353,7 +22353,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "resolved": false, "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, @@ -22364,14 +22364,14 @@ }, "npm-bundled": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", + "resolved": false, "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", + "resolved": false, "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, @@ -22382,7 +22382,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "resolved": false, "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, @@ -22395,21 +22395,21 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "resolved": false, "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "optional": true, @@ -22419,21 +22419,21 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": false, "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": false, "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "resolved": false, "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, @@ -22444,21 +22444,21 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": false, "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "resolved": false, "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "resolved": false, "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, @@ -22480,7 +22480,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, @@ -22496,7 +22496,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "resolved": false, "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, @@ -22506,49 +22506,49 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "resolved": false, "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "resolved": false, "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "resolved": false, "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "resolved": false, "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "resolved": false, "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "resolved": false, "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "optional": true, @@ -22560,7 +22560,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, @@ -22570,7 +22570,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": false, "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "optional": true, @@ -22580,7 +22580,7 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "resolved": false, "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true @@ -22603,14 +22603,14 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "resolved": false, "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "resolved": false, "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, @@ -22620,7 +22620,7 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "resolved": false, "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true, "optional": true diff --git a/src/core/client/account/routes/NotFound.css b/src/core/client/account/routes/NotFound.css index c2d433fe0d..f9a26399a2 100644 --- a/src/core/client/account/routes/NotFound.css +++ b/src/core/client/account/routes/NotFound.css @@ -3,7 +3,7 @@ font-style: normal; font-weight: var(--font-weight-secondary-bold); font-size: var(--font-size-6); - line-height: var(--line-height-7); + line-height: 1.17; color: var(--palette-text-500); diff --git a/src/core/client/account/routes/download/Download/DownloadDescription.css b/src/core/client/account/routes/download/Download/DownloadDescription.css index cf9cb02413..5ed33ecf84 100644 --- a/src/core/client/account/routes/download/Download/DownloadDescription.css +++ b/src/core/client/account/routes/download/Download/DownloadDescription.css @@ -3,7 +3,7 @@ font-style: normal; font-weight: var(--font-weight-secondary-bold); font-size: var(--font-size-6); - line-height: var(--line-height-7); + line-height: 1.17; color: var(--palette-text-500); @@ -23,7 +23,7 @@ font-style: normal; font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-3); - line-height: var(--line-height-5); + line-height: 1.25; color: var(--palette-text-500); diff --git a/src/core/client/account/routes/email/Confirm/Confirm.css b/src/core/client/account/routes/email/Confirm/Confirm.css index 3216ddebc5..4a0c94d3b8 100644 --- a/src/core/client/account/routes/email/Confirm/Confirm.css +++ b/src/core/client/account/routes/email/Confirm/Confirm.css @@ -3,7 +3,7 @@ font-style: normal; font-weight: var(--font-weight-secondary-bold); font-size: var(--font-size-6); - line-height: var(--line-height-7); + line-height: 1.17; color: var(--palette-text-500); @@ -15,7 +15,7 @@ font-style: normal; font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-3); - line-height: var(--line-height-5); + line-height: 1.25; color: var(--palette-text-500); @@ -27,7 +27,7 @@ font-style: normal; font-weight: var(--font-weight-primary-bold); font-size: var(--font-size-2); - line-height: var(--line-height-3); + line-height: 1.14; color: var(--palette-text-500); @@ -39,7 +39,7 @@ font-style: normal; font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); - line-height: var(--line-height-4); + line-height: 1.285; color: var(--palette-text-100); diff --git a/src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css b/src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css index 3216ddebc5..4a0c94d3b8 100644 --- a/src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css +++ b/src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css @@ -3,7 +3,7 @@ font-style: normal; font-weight: var(--font-weight-secondary-bold); font-size: var(--font-size-6); - line-height: var(--line-height-7); + line-height: 1.17; color: var(--palette-text-500); @@ -15,7 +15,7 @@ font-style: normal; font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-3); - line-height: var(--line-height-5); + line-height: 1.25; color: var(--palette-text-500); @@ -27,7 +27,7 @@ font-style: normal; font-weight: var(--font-weight-primary-bold); font-size: var(--font-size-2); - line-height: var(--line-height-3); + line-height: 1.14; color: var(--palette-text-500); @@ -39,7 +39,7 @@ font-style: normal; font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); - line-height: var(--line-height-4); + line-height: 1.285; color: var(--palette-text-100); diff --git a/src/core/client/account/routes/password/Reset/Reset.css b/src/core/client/account/routes/password/Reset/Reset.css index 3216ddebc5..4a0c94d3b8 100644 --- a/src/core/client/account/routes/password/Reset/Reset.css +++ b/src/core/client/account/routes/password/Reset/Reset.css @@ -3,7 +3,7 @@ font-style: normal; font-weight: var(--font-weight-secondary-bold); font-size: var(--font-size-6); - line-height: var(--line-height-7); + line-height: 1.17; color: var(--palette-text-500); @@ -15,7 +15,7 @@ font-style: normal; font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-3); - line-height: var(--line-height-5); + line-height: 1.25; color: var(--palette-text-500); @@ -27,7 +27,7 @@ font-style: normal; font-weight: var(--font-weight-primary-bold); font-size: var(--font-size-2); - line-height: var(--line-height-3); + line-height: 1.14; color: var(--palette-text-500); @@ -39,7 +39,7 @@ font-style: normal; font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); - line-height: var(--line-height-4); + line-height: 1.285; color: var(--palette-text-100); diff --git a/src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap b/src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap index 5eabe32fb7..2d2c387e44 100644 --- a/src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap +++ b/src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap @@ -36,6 +36,7 @@ exports[`renders form 1`] = `
diff --git a/src/core/client/admin/components/ConversationModal/ConversationModalRepliesContainer.tsx b/src/core/client/admin/components/ConversationModal/ConversationModalRepliesContainer.tsx index b88f433fbc..0c5c960be3 100644 --- a/src/core/client/admin/components/ConversationModal/ConversationModalRepliesContainer.tsx +++ b/src/core/client/admin/components/ConversationModal/ConversationModalRepliesContainer.tsx @@ -62,7 +62,7 @@ const ConversationModalRepliesContainer: FunctionComponent = ({
{!showReplies && comment.replyCount > 0 && ( - @@ -71,7 +71,7 @@ const ConversationModalRepliesContainer: FunctionComponent = ({ comment.replyCount > replies.length && replies.length > 0 && ( - diff --git a/src/core/client/admin/components/ModalBodyText.css b/src/core/client/admin/components/ModalBodyText.css index c90d133d21..408c5ec9a5 100644 --- a/src/core/client/admin/components/ModalBodyText.css +++ b/src/core/client/admin/components/ModalBodyText.css @@ -4,6 +4,6 @@ $modal-body-text: $colors-mono-500; font-size: var(--font-size-3); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); - line-height: var(--line-height-field-description); + line-height: 1.3; color: $modal-body-text; } diff --git a/src/core/client/admin/components/ModalHeader.css b/src/core/client/admin/components/ModalHeader.css index 23c8ef641e..934fddcb14 100644 --- a/src/core/client/admin/components/ModalHeader.css +++ b/src/core/client/admin/components/ModalHeader.css @@ -4,7 +4,7 @@ $modal-text: $colors-mono-500; font-size: var(--font-size-5); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-title); + line-height: 1.2; color: $modal-text; margin: 0; } diff --git a/src/core/client/admin/components/ModerateCard/FlagDetailsCategory.css b/src/core/client/admin/components/ModerateCard/FlagDetailsCategory.css index 12ea52f675..d87d79e0ab 100644 --- a/src/core/client/admin/components/ModerateCard/FlagDetailsCategory.css +++ b/src/core/client/admin/components/ModerateCard/FlagDetailsCategory.css @@ -4,6 +4,6 @@ $moderateCardFlagsCategoryColor: var(--palette-text-500); font-size: var(--font-size-3); font-weight: var(--font-weight-primary-bold); font-family: var(--font-family-primary); - line-height: var(--line-height-6); + line-height: 1.5; color: $moderateCardFlagsCategoryColor; } diff --git a/src/core/client/admin/components/ModerateCard/FlagDetailsEntry.css b/src/core/client/admin/components/ModerateCard/FlagDetailsEntry.css index 840639e469..b078dde2e9 100644 --- a/src/core/client/admin/components/ModerateCard/FlagDetailsEntry.css +++ b/src/core/client/admin/components/ModerateCard/FlagDetailsEntry.css @@ -6,7 +6,7 @@ $moderateCardReasonTextColor: var(--palette-text-500); font-size: var(--font-size-2); font-weight: var(--font-weight-secondary-bold); font-family: var(--font-family-secondary); - line-height: var(--line-height-3); + line-height: 1.14; padding-right: calc(0.5 * var(--mini-unit)); } @@ -17,11 +17,10 @@ $moderateCardReasonTextColor: var(--palette-text-500); font-size: var(--font-size-2); font-weight: var(--font-weight-primary-regular); font-family: var(--font-family-primary); - line-height: var(--line-height-3); + line-height: 1.14; } .flagger { - line-height: var(--line-height-3); margin-right: var(--mini-unit); padding: var(--spacing-1); margin-left: calc(-1 * var(--spacing-1)); diff --git a/src/core/client/admin/components/ModerateCard/ModerateCard.css b/src/core/client/admin/components/ModerateCard/ModerateCard.css index 05f04033c1..c6b7dbbcb6 100644 --- a/src/core/client/admin/components/ModerateCard/ModerateCard.css +++ b/src/core/client/admin/components/ModerateCard/ModerateCard.css @@ -101,7 +101,7 @@ $moderateCardLinkTextColor: $colors-teal-700; font-size: var(--font-size-1); font-weight: var(--font-weight-primary-semi-bold); font-family: var(--font-family-primary); - line-height: var(--line-height-3); + line-height: 1.33; color: $moderateCardLinkTextColor; text-transform: uppercase; } @@ -115,7 +115,7 @@ $moderateCardLinkTextColor: $colors-teal-700; font-size: var(--font-size-1); font-weight: var(--font-weight-primary-semi-bold); font-family: var(--font-family-primary); - line-height: var(--line-height-3); + line-height: 1.33; margin-bottom: var(--spacing-1); text-transform: uppercase; } @@ -123,7 +123,7 @@ $moderateCardLinkTextColor: $colors-teal-700; .commentOn { font-size: var(--font-size-2); font-family: var(--font-family-primary); - line-height: var(--line-height-3); + line-height: 1.14; margin-bottom: var(--spacing-1); } @@ -152,7 +152,7 @@ $moderateCardLinkTextColor: $colors-teal-700; font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-1); - line-height: var(--line-height-3); + line-height: 1.33; } .edited { @@ -160,7 +160,7 @@ $moderateCardLinkTextColor: $colors-teal-700; font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-1); - line-height: var(--line-height-3); + line-height: 1.33; padding-left: var(--spacing-2); } @@ -174,7 +174,7 @@ $moderateCardLinkTextColor: $colors-teal-700; font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-1); - line-height: var(--line-height-3); + line-height: 1.33; padding-left: var(--spacing-2); } @@ -183,5 +183,5 @@ $moderateCardLinkTextColor: $colors-teal-700; font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); - line-height: var(--line-height-4); + line-height: 1.285; } diff --git a/src/core/client/admin/components/ModerateCard/ModeratedByContainer.css b/src/core/client/admin/components/ModerateCard/ModeratedByContainer.css index 9e44da4a68..2d92c30ec5 100644 --- a/src/core/client/admin/components/ModerateCard/ModeratedByContainer.css +++ b/src/core/client/admin/components/ModerateCard/ModeratedByContainer.css @@ -5,7 +5,7 @@ $moderated-by-username: var(--palette-text-900); font-size: var(--font-size-1); font-weight: var(--font-weight-primary-semi-bold); font-family: var(--font-family-primary); - line-height: var(--line-height-3); + line-height: 1.33; color: $moderated-by; text-transform: uppercase; } @@ -14,7 +14,7 @@ $moderated-by-username: var(--palette-text-900); font-size: var(--font-size-2); font-weight: var(--font-weight-secondary-bold); font-family: var(--font-family-secondary); - line-height: var(--line-height-3); + line-height: 1.14; color: $moderated-by-username; text-align: center; padding-top: 1px; diff --git a/src/core/client/admin/components/ModerateCard/ToxicityLabel.css b/src/core/client/admin/components/ModerateCard/ToxicityLabel.css index a7052e98e1..600b572af8 100644 --- a/src/core/client/admin/components/ModerateCard/ToxicityLabel.css +++ b/src/core/client/admin/components/ModerateCard/ToxicityLabel.css @@ -5,7 +5,7 @@ $moderateCardToxicityColor: var(--palette-text-500); font-size: var(--font-size-2); font-weight: var(--font-weight-primary-semi-bold); font-family: var(--font-family-primary); - line-height: var(--line-height-4); + line-height: 1.285; color: $moderateCardToxicityColor; } diff --git a/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css b/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css index e75cff374d..01bdb95188 100644 --- a/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css +++ b/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css @@ -20,7 +20,7 @@ width: calc(20 * var(--mini-unit)); margin-right: calc(var(--spacing-1) / 2); font-size: var(--font-size-3); - line-height: var(--line-height-min); + line-height: 1.2; justify-content: space-between; background: var(--palette-background-input); } diff --git a/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.css b/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.css index 93586b9174..4360632f50 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.css +++ b/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.css @@ -10,7 +10,7 @@ $moderator-note-username: var(--palette-text-900); font-family: var(--font-family-primary); font-size: var(--font-size-3); font-weight: var(--font-weight-primary-regular); - line-height: var(--line-height-field-description); + line-height: 1.3; background-color: $moderator-note-bg; border-radius: 4px; padding: var(--spacing-3); @@ -25,7 +25,7 @@ $moderator-note-username: var(--palette-text-900); font-family: var(--font-family-primary); font-size: var(--font-size-2); font-weight: var(--font-weight-primary-regular); - line-height: var(--line-height-3); + line-height: 1.14; padding-left: var(--spacing-4); padding-right: var(--spacing-1); position: relative; @@ -47,8 +47,8 @@ $moderator-note-username: var(--palette-text-900); .username { font-family: var(--font-family-secondary); font-weight: var(--font-weight-secondary-bold); - line-height: var(--line-height-3); font-size: var(--font-size-3); + line-height: 1; color: $moderator-note-username; } diff --git a/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.css b/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.css index af8329fb9c..770a1b2d62 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.css +++ b/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.css @@ -9,7 +9,7 @@ $recent-history-triggered: var(--palette-error-500); font-weight: var(--font-weight-primary-bold); font-size: var(--font-size-3); margin: 0; - line-height: var(--line-height-field-description); + line-height: 1.3; color: $recent-history-title; } @@ -19,7 +19,7 @@ $recent-history-triggered: var(--palette-error-500); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); margin: 0; - line-height: var(--line-height-4); + line-height: 1.285; } .info { @@ -29,8 +29,7 @@ $recent-history-triggered: var(--palette-error-500); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); font-size: var(--font-size-6); - line-height: var(--line-height-3); - line-height: var(--line-height-3); + line-height: 0.67; color: $recent-history-info; margin: 0; } diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.css b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.css index 7b60fade2d..16a9bec7e2 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.css +++ b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.css @@ -29,7 +29,7 @@ $user-drawer-status-label: var(--palette-text-500); font-family: var(--font-family-secondary); font-weight: var(--font-weight-secondary-bold); font-size: var(--font-size-6); - line-height: var(--line-height-3); + line-height: 0.67; } .userDetail { @@ -39,7 +39,7 @@ $user-drawer-status-label: var(--palette-text-500); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-3); - line-height: var(--line-height-3); + line-height: 1; color: $user-drawer-account-info; } @@ -61,7 +61,7 @@ $user-drawer-status-label: var(--palette-text-500); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-bold); font-size: var(--font-size-2); - line-height: var(--line-height-3); + line-height: 1.14; color: $user-drawer-status-label; margin-right: var(--spacing-1); } diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.css b/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.css index b82130d3ba..b3cc46dae6 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.css +++ b/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.css @@ -5,7 +5,7 @@ $user-status-details: var(--palette-text-500); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); color: $user-status-details; - line-height: var(--line-height-4); + line-height: 1.285; margin: 0 0 var(--spacing-1) 0; } diff --git a/src/core/client/admin/components/UserStatus/BanModal.css b/src/core/client/admin/components/UserStatus/BanModal.css index a453f0453b..25ba6d3a25 100644 --- a/src/core/client/admin/components/UserStatus/BanModal.css +++ b/src/core/client/admin/components/UserStatus/BanModal.css @@ -4,7 +4,7 @@ $ban-modal-text: var(--palette-text-500); font-size: var(--font-size-3); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); - line-height: var(--line-height-field-description); + line-height: 1.3; color: $ban-modal-text; } diff --git a/src/core/client/admin/components/UserStatus/SuspendForm.css b/src/core/client/admin/components/UserStatus/SuspendForm.css index a6cb39b115..18a5af0af0 100644 --- a/src/core/client/admin/components/UserStatus/SuspendForm.css +++ b/src/core/client/admin/components/UserStatus/SuspendForm.css @@ -19,7 +19,7 @@ $suspend-modal-text: var(--palette-text-500); font-size: var(--font-size-4); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-5); + line-height: 1.11; color: $suspend-modal-text; margin: 0; } diff --git a/src/core/client/admin/components/UserStatus/SuspendModal.css b/src/core/client/admin/components/UserStatus/SuspendModal.css index 0e45478221..01901bf8ee 100644 --- a/src/core/client/admin/components/UserStatus/SuspendModal.css +++ b/src/core/client/admin/components/UserStatus/SuspendModal.css @@ -4,7 +4,7 @@ $suspend-modal-text: var(--palette-text-500); font-size: var(--font-size-3); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); - line-height: var(--line-height-field-description); + line-height: 1.3; color: $suspend-modal-text; } @@ -12,7 +12,7 @@ $suspend-modal-text: var(--palette-text-500); font-size: var(--font-size-4); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-5); + line-height: 1.11; color: $suspend-modal-text; margin: 0; } diff --git a/src/core/client/admin/components/UserStatus/UserStatus.css b/src/core/client/admin/components/UserStatus/UserStatus.css index d0eb675038..eb3a18fade 100644 --- a/src/core/client/admin/components/UserStatus/UserStatus.css +++ b/src/core/client/admin/components/UserStatus/UserStatus.css @@ -2,7 +2,7 @@ font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); font-size: var(--font-size-2); - line-height: var(--line-height-3); + line-height: 1.14; } .success { diff --git a/src/core/client/admin/routes/AuthCheck/Restricted.css b/src/core/client/admin/routes/AuthCheck/Restricted.css index af31aff80b..50e407ade7 100644 --- a/src/core/client/admin/routes/AuthCheck/Restricted.css +++ b/src/core/client/admin/routes/AuthCheck/Restricted.css @@ -3,7 +3,7 @@ font-family: var(--font-family-secondary); color: var(--palette-text-100); font-size: var(--font-size-3); - line-height: var(--line-height-4); + line-height: 1.285; padding-bottom: var(--spacing-3); } @@ -12,7 +12,7 @@ font-size: var(--font-size-6); font-weight: var(--font-weight-secondary-bold); font-family: var(--font-family-secondary); - line-height: var(--line-height-7); + line-height: 1.17; color: var(--palette-text-900); text-align: center; @@ -24,7 +24,7 @@ font-size: var(--font-size-3); font-weight: var(--font-weight-primary-regular); font-family: var(--font-family-primary); - line-height: var(--line-height-4); + line-height: 1.125; color: var(--palette-text-500); text-align: center; @@ -39,7 +39,7 @@ font-size: var(--font-size-4); font-weight: var(--font-weight-primary-semi-bold); font-family: var(--font-family-primary); - line-height: var(--line-height-3); + line-height: 0.89; color: var(--palette-text-900); text-align: center; diff --git a/src/core/client/admin/routes/Community/EmptyMessage.css b/src/core/client/admin/routes/Community/EmptyMessage.css index 8a356e313b..039cdedec0 100644 --- a/src/core/client/admin/routes/Community/EmptyMessage.css +++ b/src/core/client/admin/routes/Community/EmptyMessage.css @@ -2,6 +2,6 @@ font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-3); - line-height: var(--line-height-field-description); + line-height: 1.3; text-align: center; } diff --git a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.css b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.css index 3c153da83a..9d26fe4dcf 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.css +++ b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.css @@ -4,6 +4,6 @@ $invite-form-text: var(--palette-text-500); font-size: var(--font-size-3); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); - line-height: var(--line-height-field-description); + line-height: 1.3; color: $invite-form-text; } diff --git a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.css b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.css index 33752ab129..51ea72e0df 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.css +++ b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.css @@ -10,7 +10,7 @@ $invite-modal-text: var(--palette-text-500); font-size: var(--font-size-5); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-6); + line-height: 1.2; color: $invite-modal-text; margin: 0; } diff --git a/src/core/client/admin/routes/Community/InviteUsers/RoleField.css b/src/core/client/admin/routes/Community/InviteUsers/RoleField.css index 62c39bda7d..9d1fa1d1fd 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/RoleField.css +++ b/src/core/client/admin/routes/Community/InviteUsers/RoleField.css @@ -4,6 +4,6 @@ $role-field-text: var(--palette-text-500); font-size: var(--font-size-3); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-field-description); + line-height: 1.3; color: $role-field-text; } diff --git a/src/core/client/admin/routes/Community/InviteUsers/Success.css b/src/core/client/admin/routes/Community/InviteUsers/Success.css index 439d1fe337..cc0deddb40 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/Success.css +++ b/src/core/client/admin/routes/Community/InviteUsers/Success.css @@ -7,7 +7,7 @@ $success-text: var(--palette-text-500); font-size: var(--font-size-5); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-6); + line-height: 1.2; color: $success-text; margin: 0; } diff --git a/src/core/client/admin/routes/Community/UserRow.css b/src/core/client/admin/routes/Community/UserRow.css index 328d154441..d4c0035d24 100644 --- a/src/core/client/admin/routes/Community/UserRow.css +++ b/src/core/client/admin/routes/Community/UserRow.css @@ -24,8 +24,8 @@ padding: 0px; font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-3); font-size: var(--font-size-2); + line-height: 1.14; } .username { diff --git a/src/core/client/admin/routes/Configure/Header.css b/src/core/client/admin/routes/Configure/Header.css index a59ce55d09..92f62e90d8 100644 --- a/src/core/client/admin/routes/Configure/Header.css +++ b/src/core/client/admin/routes/Configure/Header.css @@ -6,6 +6,6 @@ $configureHeadingForegroundColor: var(--palette-text-000); color: $configureHeadingForegroundColor; font-size: var(--font-size-3); font-weight: var(--font-weight-primary-bold); - line-height: var(--line-height-3); + line-height: 1; font-family: var(--font-family-primary); } diff --git a/src/core/client/admin/routes/Configure/HelperText.css b/src/core/client/admin/routes/Configure/HelperText.css index d77967b50b..20d8677636 100644 --- a/src/core/client/admin/routes/Configure/HelperText.css +++ b/src/core/client/admin/routes/Configure/HelperText.css @@ -3,5 +3,5 @@ font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); - line-height: var(--line-height-4); + line-height: 1.285; } diff --git a/src/core/client/admin/routes/Configure/Link.css b/src/core/client/admin/routes/Configure/Link.css index 7a0f729d3d..b4ee73db79 100644 --- a/src/core/client/admin/routes/Configure/Link.css +++ b/src/core/client/admin/routes/Configure/Link.css @@ -7,7 +7,7 @@ $sideNavActiveColor: var(--palette-text-500); color: $sideNavItemColor; font-family: var(--font-family-primary); font-size: var(--font-size-4); - line-height: var(--line-height-5); + line-height: 1.11; font-weight: var(--font-weight-primary-regular); display: inline-block; padding: var(--spacing-2) var(--spacing-2) diff --git a/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/DateField.css b/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/DateField.css index 6235185b98..891f902d45 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/DateField.css +++ b/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/DateField.css @@ -6,5 +6,5 @@ font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); - line-height: var(--line-height-3); + line-height: 1.14; } diff --git a/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/StatusField.css b/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/StatusField.css index a18a75c1b7..b92dc9e9c4 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/StatusField.css +++ b/src/core/client/admin/routes/Configure/sections/Auth/SSOSigningSecretRotation/StatusField.css @@ -2,7 +2,7 @@ font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-regular); font-size: var(--font-size-2); - line-height: var(--line-height-3); + line-height: 1.14; border-radius: 2px; padding-left: var(--spacing-1); diff --git a/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.css b/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.css index 0e88f87b56..011f5acab8 100644 --- a/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.css +++ b/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.css @@ -9,7 +9,7 @@ $announcement-modal-text: var(--palette-text-500); font-size: var(--font-size-5); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-6); + line-height: 1.2; color: $announcement-modal-text; margin: 0; } diff --git a/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.tsx b/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.tsx index 6386a3ac07..1a2745713e 100644 --- a/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/AnnouncementFormModal.tsx @@ -122,7 +122,7 @@ const AnnouncementForm: FunctionComponent = ({ - diff --git a/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.css b/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.css index 6f2d778033..4431095a6f 100644 --- a/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.css +++ b/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.css @@ -7,5 +7,5 @@ font-size: var(--font-size-3); font-weight: var(--font-weight-primary-regular); font-family: var(--font-family-primary); - line-height: var(--line-height-4); + line-height: 1.125; } diff --git a/src/core/client/admin/routes/Configure/sections/ModerationPhases/ConfigureExternalModerationPhase/RotateSigningSecretModal.css b/src/core/client/admin/routes/Configure/sections/ModerationPhases/ConfigureExternalModerationPhase/RotateSigningSecretModal.css index b7107ef8b7..a20dbef52d 100644 --- a/src/core/client/admin/routes/Configure/sections/ModerationPhases/ConfigureExternalModerationPhase/RotateSigningSecretModal.css +++ b/src/core/client/admin/routes/Configure/sections/ModerationPhases/ConfigureExternalModerationPhase/RotateSigningSecretModal.css @@ -6,5 +6,5 @@ font-size: var(--font-size-5); font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-6); + line-height: 1.2; } diff --git a/src/core/client/admin/routes/Configure/sections/ModerationPhases/ExternalModerationPhaseRow.css b/src/core/client/admin/routes/Configure/sections/ModerationPhases/ExternalModerationPhaseRow.css index 034ce371b8..aac981aa34 100644 --- a/src/core/client/admin/routes/Configure/sections/ModerationPhases/ExternalModerationPhaseRow.css +++ b/src/core/client/admin/routes/Configure/sections/ModerationPhases/ExternalModerationPhaseRow.css @@ -5,6 +5,6 @@ .detailsButton { font-family: var(--font-family-primary); font-weight: var(--font-weight-primary-semi-bold); - line-height: var(--line-height-3); font-size: var(--font-size-2); + line-height: 1.14; } diff --git a/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx b/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx index 37c70577a8..781143faef 100644 --- a/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx +++ b/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx @@ -114,7 +114,7 @@ const CreateSiteForm: FunctionComponent = ({ onCreate }) => {