From 643a19d1af038e19268c4c2e8f37c621f03e5ede Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 20 Jan 2020 15:25:55 +1100 Subject: [PATCH] Sass improvements --- stylesheets/_conversation.scss | 2 +- ts/components/EditProfileDialog.tsx | 2 +- ts/components/conversation/ConversationHeader.tsx | 2 +- ts/components/session/LeftPaneSettingSection.tsx | 2 +- ts/components/session/SessionToast.tsx | 2 +- ts/components/session/icon/Icons.tsx | 1 + ts/components/session/icon/SessionIcon.tsx | 3 +++ ts/components/session/settings/SessionSettingsHeader.tsx | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index 8ed626b36..1b2bb2144 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -710,7 +710,7 @@ text-align: center; background-color: $color-light-35; border: none; - box-shadow: 0px 3px 5px 0px rRgba(0, 0, 0, 0.2); + box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.2); outline: none; &:hover { diff --git a/ts/components/EditProfileDialog.tsx b/ts/components/EditProfileDialog.tsx index 671dab958..64b4d0de1 100644 --- a/ts/components/EditProfileDialog.tsx +++ b/ts/components/EditProfileDialog.tsx @@ -91,7 +91,7 @@ export class EditProfileDialog extends React.Component { { const el = this.inputEl.current; if (el) { diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index ac8dadc01..dc542c1cc 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -263,7 +263,7 @@ export class ConversationHeader extends React.Component { > diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx index 2bfd52710..ced49fc74 100644 --- a/ts/components/session/LeftPaneSettingSection.tsx +++ b/ts/components/session/LeftPaneSettingSection.tsx @@ -126,7 +126,7 @@ export class LeftPaneSettingSection extends React.Component { > diff --git a/ts/components/session/SessionToast.tsx b/ts/components/session/SessionToast.tsx index cb3b6d2d3..ad7c6a162 100644 --- a/ts/components/session/SessionToast.tsx +++ b/ts/components/session/SessionToast.tsx @@ -35,7 +35,7 @@ export class SessionToast extends React.PureComponent { const toastType = type ? type : SessionToastType.Info; const toastDesc = description ? description : ''; const toastIconSize = toastDesc - ? SessionIconSize.Large + ? SessionIconSize.Huge : SessionIconSize.Medium; // Set a custom icon or allow the theme to define the icon diff --git a/ts/components/session/icon/Icons.tsx b/ts/components/session/icon/Icons.tsx index 8a7ac456f..8900a98a6 100644 --- a/ts/components/session/icon/Icons.tsx +++ b/ts/components/session/icon/Icons.tsx @@ -36,6 +36,7 @@ export enum SessionIconSize { Small = 'small', Medium = 'medium', Large = 'large', + Huge = 'huge', } export const icons = { diff --git a/ts/components/session/icon/SessionIcon.tsx b/ts/components/session/icon/SessionIcon.tsx index 0996be30e..6f1bb4b0b 100644 --- a/ts/components/session/icon/SessionIcon.tsx +++ b/ts/components/session/icon/SessionIcon.tsx @@ -41,6 +41,9 @@ export class SessionIcon extends React.PureComponent { iconDimensions = '20'; break; case SessionIconSize.Large: + iconDimensions = '25'; + break; + case SessionIconSize.Huge: iconDimensions = '30'; break; default: diff --git a/ts/components/session/settings/SessionSettingsHeader.tsx b/ts/components/session/settings/SessionSettingsHeader.tsx index 1337955a9..aa5f45c7c 100644 --- a/ts/components/session/settings/SessionSettingsHeader.tsx +++ b/ts/components/session/settings/SessionSettingsHeader.tsx @@ -26,7 +26,7 @@ export class SettingsHeader extends React.Component { {categoryTitle}