resolve conversations

pull/725/head
Audric Ackermann 5 years ago
parent d08a14e711
commit c69219ebe4

@ -508,8 +508,8 @@ label {
.message-selection-overlay { .message-selection-overlay {
display: none; display: none;
position: absolute; position: absolute;
right: 10px; right: $session-margin-sm;
left: 15px; left: $session-margin-md;
.close-button { .close-button {
float: left; float: left;

@ -227,7 +227,7 @@ $session-compose-margin: 20px;
} }
&-overlay { &-overlay {
background: linear-gradient(180deg, #171717 0%, #121212 100%); background: linear-gradient(180deg, #171717 0%, $session-background 100%);
box-shadow: 0 0 100px 0 rgba(0, 0, 0, 0.5); box-shadow: 0 0 100px 0 rgba(0, 0, 0, 0.5);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -525,6 +525,7 @@ $session-compose-margin: 20px;
} }
&-category-list-item { &-category-list-item {
@include session-dark-background;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
@ -533,7 +534,6 @@ $session-compose-margin: 20px;
line-height: 1.4; line-height: 1.4;
padding: 0px 12px; padding: 0px 12px;
flex-shrink: 0; flex-shrink: 0;
@include session-dark-background;
cursor: pointer; cursor: pointer;
transition: $session-transition-duration !important; transition: $session-transition-duration !important;
@ -600,9 +600,9 @@ $session-compose-margin: 20px;
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 13px;
padding: 11px; padding: 11px;
border-right: 1px solid #2f2f2f !important; border-right: 1px solid $session-shade-8 !important;
border-top: 1px solid #2f2f2f !important; border-top: 1px solid $session-shade-8 !important;
border-left: 1px solid #2f2f2f !important; border-left: 1px solid $session-shade-8 !important;
@include session-dark-background-lighter; @include session-dark-background-lighter;
} }
@ -616,7 +616,7 @@ $session-compose-margin: 20px;
span { span {
padding: 5px 10px; padding: 5px 10px;
border-radius: 50px; border-radius: 50px;
background-color: #121212; background-color: $session-background;
color: $session-color-light-grey; color: $session-color-light-grey;
border: 1px solid $session-color-dark-grey; border: 1px solid $session-color-dark-grey;
} }

@ -91,7 +91,7 @@
} }
.inbox { .inbox {
background: linear-gradient(180deg, #171717 0%, #121212 100%); background: linear-gradient(180deg, #171717 0%, $session-background 100%);
} }
.conversation { .conversation {

@ -835,13 +835,12 @@ export class RegistrationTabs extends React.Component<{}, State> {
const words = window.mnemonic.pubkey_to_secret_words(pubkey); const words = window.mnemonic.pubkey_to_secret_words(pubkey);
window.console.log(`Here is your secret:\n${words}`); window.console.log(`Here is your secret:\n${words}`);
window.pushToast({ window.pushToast({
title: `Here is your secret: "${words}"`, title: `${window.i18n('secretPrompt')} ${words}`,
id: 'yourSecret', id: 'yourSecret',
shouldFade: false, shouldFade: false,
}); });
} catch (e) { } catch (e) {
window.console.log(e); window.console.log(e);
//onError(e);
this.setState({ this.setState({
loading: false, loading: false,
}); });

Loading…
Cancel
Save