diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index 08dd2d873..0cdf01d59 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -183,9 +183,6 @@ h4.section-toggle, .network-status-container { .network-status { - background: url('../images/error_red.svg') no-repeat left 10px center; - background-size: 25px 25px; - background-color: #fcd156; padding: 10px; padding-inline-start: 2 * $button-height; display: none; @@ -203,16 +200,6 @@ h4.section-toggle, padding: 0.5em 0; } } - .action { - button { - border-radius: $border-radius; - border: solid 1px #ccc; - cursor: pointer; - font-family: inherit; - color: white; - background: $blue; - } - } } } diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss index 5212b6cbd..50310d006 100644 --- a/stylesheets/_session_conversation.scss +++ b/stylesheets/_session_conversation.scss @@ -1,4 +1,3 @@ - @keyframes fadein { from { opacity: 0; @@ -221,7 +220,7 @@ padding: 0px $session-margin-md; min-height: min-content; @include themify($themes) { - background: themed('inputBackground'); + background: themed('composeViewBackground'); } & > .session-icon-button { diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss index 680451a33..39991d809 100644 --- a/stylesheets/_session_theme.scss +++ b/stylesheets/_session_theme.scss @@ -169,10 +169,13 @@ h4 { text-align: center; } -.dark-theme .network-status-container .network-status { - background-color: rgba($session-color-green, 0.6); +.network-status { + @include themify($themes) { + background: themed('accent'); + } + h3, .network-status-message { - color: $session-color-white; + color: $black; } } diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss index 17b11b8ef..b9da8cda4 100644 --- a/stylesheets/_theme_dark.scss +++ b/stylesheets/_theme_dark.scss @@ -146,27 +146,6 @@ } } - // _index - .network-status-container { - .network-status { - background: url('../images/error_red.svg') no-repeat left 10px center; - background-size: 25px 25px; - background-color: #fcd156; - - .network-status-message { - color: $color-dark-85; - } - - .action { - button { - border: solid 1px #ccc; - color: white; - background: $blue; - } - } - } - } - .tool-bar { color: $color-dark-05; diff --git a/ts/components/Lightbox.tsx b/ts/components/Lightbox.tsx index ad7ce8ac2..d244a9bbc 100644 --- a/ts/components/Lightbox.tsx +++ b/ts/components/Lightbox.tsx @@ -359,9 +359,7 @@ export class Lightbox extends React.Component { this.onClose(); }; - private readonly onObjectClick = ( - event: React.MouseEvent - ) => { + private readonly onObjectClick = (event: any) => { event.stopPropagation(); this.onClose(); }; diff --git a/ts/components/conversation/Image.tsx b/ts/components/conversation/Image.tsx index 705d3d661..d2cf67eab 100644 --- a/ts/components/conversation/Image.tsx +++ b/ts/components/conversation/Image.tsx @@ -129,7 +129,7 @@ export class Image extends React.Component { {closeButton ? (
) => { + onClick={(e: any) => { e.stopPropagation(); if (onClickClose) { onClickClose(attachment); diff --git a/ts/components/conversation/Quote.tsx b/ts/components/conversation/Quote.tsx index 3856064d0..c87cd7daf 100644 --- a/ts/components/conversation/Quote.tsx +++ b/ts/components/conversation/Quote.tsx @@ -277,7 +277,7 @@ export class Quote extends React.Component { // We don't want the overall click handler for the quote to fire, so we stop // propagation before handing control to the caller's callback. - const onClick = (e: React.MouseEvent<{}>): void => { + const onClick = (e: any): void => { e.stopPropagation(); onClose(); }; diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index 7b5785bc6..333458787 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -584,8 +584,8 @@ export class SessionConversation extends React.Component { const ourPK = window.textsecure.storage.user.getNumber(); const members = conversation.get('members') || []; const isAdmin = conversation.isMediumGroup() - ? true - : conversation.get('groupAdmins').includes(ourPK); + ? true + : conversation.get('groupAdmins').includes(ourPK); return { id: conversation.id, @@ -609,12 +609,12 @@ export class SessionConversation extends React.Component { })), onSetDisappearingMessages: (seconds: any) => { - if (seconds > 0) { - conversation.updateExpirationTimer(seconds); - } else { - conversation.updateExpirationTimer(null); - } - }, + if (seconds > 0) { + conversation.updateExpirationTimer(seconds); + } else { + conversation.updateExpirationTimer(null); + } + }, onGoBack: () => { this.toggleGroupSettingsPane(); @@ -872,10 +872,14 @@ export class SessionConversation extends React.Component { // If removable from server, we "Unsend" - otherwise "Delete" const pluralSuffix = multiple ? 's' : ''; const title = window.i18n( - isServerDeletable ? `deleteMessage${pluralSuffix}ForEveryone` : `deleteMessage${pluralSuffix}` + isServerDeletable + ? `deleteMessage${pluralSuffix}ForEveryone` + : `deleteMessage${pluralSuffix}` ); - const okText = window.i18n(isServerDeletable ? 'deleteForEveryone' : 'delete'); + const okText = window.i18n( + isServerDeletable ? 'deleteForEveryone' : 'delete' + ); window.confirmationDialog({ title, diff --git a/ts/components/session/conversation/SessionRecording.tsx b/ts/components/session/conversation/SessionRecording.tsx index 7556832d8..dbaad9c73 100644 --- a/ts/components/session/conversation/SessionRecording.tsx +++ b/ts/components/session/conversation/SessionRecording.tsx @@ -91,7 +91,7 @@ export class SessionRecording extends React.Component { this.updateCanvasDimensions = this.updateCanvasDimensions.bind(this); const now = getTimestamp(); - const updateTimerInterval = setInterval(this.timerUpdate, 500); + const updateTimerInterval = global.setInterval(this.timerUpdate, 500); this.state = { recordDuration: 0, diff --git a/ts/session/constants.ts b/ts/session/constants.ts index 999aee597..28c774574 100644 --- a/ts/session/constants.ts +++ b/ts/session/constants.ts @@ -45,32 +45,6 @@ export const UI = { DARK_GREY: '#353535', BLACK: '#000000', GREEN: '#00F782', - GREEN_ALT_1: '#00F480', - GREEN_ALT_2: '#00FD73', - GREEN_ALT_3: '#00F782', - BACKGROUND: '#121212', - - // SHADES - SHADE_1: '#0C0C0C', - SHADE_1_ALT: '#0F1011', - SHADE_2: '#161616', - SHADE_3: '#191818', - SHADE_4: '#1B1B1B', - SHADE_5: '#222325', - SHADE_6: '#232323', - SHADE_6_ALT: '#2C2C2C', - SHADE_7: '#2E2E2E', - SHADE_8: '#2F2F2F', - SHADE_9: '#313131', - SHADE_10: '#3E3E3E', - SHADE_11: '#3F3F3F', - SHADE_12: '#3F4146', - SHADE_13: '#474646', - SHADE_14: '#535865', - SHADE_15: '#5B6C72', - SHADE_16: '#979797', - SHADE_17: '#A0A0A0', - SHADE_18: '#141414', // SEMANTIC COLORS INFO: '#3F3F3F', diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts index f31ddfa12..cec397221 100644 --- a/ts/updater/updater.ts +++ b/ts/updater/updater.ts @@ -39,7 +39,7 @@ export async function start( autoUpdater.logger = logger; autoUpdater.autoDownload = false; - interval = setInterval(async () => { + interval = global.setInterval(async () => { try { await checkForUpdates(getMainWindow, messages, logger); } catch (error) {