pull/851/head
Vincent 5 years ago
parent a1e4072ec1
commit 513e5e34df

@ -976,7 +976,7 @@
"message": "You don't have any messages, yet." "message": "You don't have any messages, yet."
}, },
"noMessagesSubtitle": { "noMessagesSubtitle": {
"message": "Would you like to join Session's public chat?" "message": "Would you like to join Session's open group?"
}, },
"pairNewDevice": { "pairNewDevice": {
"message": "Pair New Device" "message": "Pair New Device"
@ -2131,7 +2131,7 @@
}, },
"banUser": { "banUser": {
"message": "Ban User", "message": "Ban User",
"description": "Ban user from public chat by public key." "description": "Ban user from open group by public key."
}, },
"banUserConfirm": { "banUserConfirm": {
"message": "Are you sure you want to ban user?", "message": "Are you sure you want to ban user?",
@ -2214,9 +2214,9 @@
"Title for the dialog box used to update an existing private group" "Title for the dialog box used to update an existing private group"
}, },
"updatePublicGroupDialogTitle": { "updatePublicGroupDialogTitle": {
"message": "Updating a Public Chat Channel", "message": "Updating a open group Channel",
"description": "description":
"Title for the dialog box used to update an existing public chat channel" "Title for the dialog box used to update an existing open group channel"
}, },
"showSeed": { "showSeed": {
"message": "Show Seed", "message": "Show Seed",
@ -2407,7 +2407,7 @@
"message": "Failed to connect to server. Check URL" "message": "Failed to connect to server. Check URL"
}, },
"connectToServerSuccess": { "connectToServerSuccess": {
"message": "Successfully connected to new public chat server" "message": "Successfully connected to new open group server"
}, },
"setPasswordFail": { "setPasswordFail": {
"message": "Failed to set password" "message": "Failed to set password"
@ -2614,9 +2614,6 @@
"beginYourSession": { "beginYourSession": {
"message": "Begin<br />your<br />Session." "message": "Begin<br />your<br />Session."
}, },
"welcomeToSession": {
"message": "Welcome to Session"
},
"welcomeToYourSession": { "welcomeToYourSession": {
"message": "Welcome to your Session" "message": "Welcome to your Session"
}, },
@ -2773,7 +2770,7 @@
"message": "Join Open Group" "message": "Join Open Group"
}, },
"joinPublicChat": { "joinPublicChat": {
"message": "Join Public Chat" "message": "Join open group"
}, },
"next": { "next": {
"message": "Next" "message": "Next"

@ -366,6 +366,7 @@
.bottom-bar { .bottom-bar {
box-sizing: content-box; box-sizing: content-box;
margin-bottom: 8px;
$button-width: 36px; $button-width: 36px;
form.active { form.active {
@ -431,8 +432,8 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
margin-right: 6px; margin-bottom: 8px;
margin-bottom: 6px; padding-left: 0px $session-margin-md;
.send-message { .send-message {
flex-grow: 1; flex-grow: 1;

@ -198,15 +198,13 @@ $session-conversation-header-height: 60px;
* { * {
user-select: none; user-select: none;
}
.text-selectable {
user-select: text;
&::selection { .text-selectable, input, textarea {
border-radius: 3px; user-select: text;
padding: 3px;
background: rgba($session-color-green, 0.6); &::selection {
background: rgba($session-color-green, 0.6);
}
} }
} }
@ -1353,14 +1351,13 @@ label {
.bottom-bar { .bottom-bar {
.compose { .compose {
min-height: 60px;
max-height: 200px; max-height: 200px;
} }
.send-message-container { .send-message-container {
display: flex; display: flex;
flex-grow: 1; flex-grow: 1;
min-height: 60px; height: 48px;
margin-bottom: -5px; margin-bottom: -5px;
} }

@ -405,8 +405,9 @@ $session-compose-margin: 20px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
position: absolute; position: absolute;
bottom: 0px; bottom: 2px;
width: 100%; width: 100%;
@at-root .light-theme #{&} { @at-root .light-theme #{&} {
background-color: $session-color-white; background-color: $session-color-white;
@ -539,6 +540,10 @@ $session-compose-margin: 20px;
&-bottom-buttons { &-bottom-buttons {
@include bottom-buttons(); @include bottom-buttons();
.session-button {
height: 57px;
}
} }
} }

@ -191,7 +191,7 @@
} }
&-terms-conditions-agreement { &-terms-conditions-agreement {
padding-top: 10px; padding-top: $session-margin-md;
color: $session-color-light-grey; color: $session-color-light-grey;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
@ -227,7 +227,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 94px;
padding: 20px; padding: 20px;
border-radius: 8px; border-radius: 8px;
border: 2px solid #353535; border: 2px solid #353535;
@ -243,7 +242,7 @@
line-height: 18px; line-height: 18px;
text-align: center; text-align: center;
overflow-wrap: break-word; overflow-wrap: break-word;
padding: 20px 5px 20px 5px; padding: 0px 5px 20px 5px;
display: inline-block; display: inline-block;
font-family: 'SpaceMono'; font-family: 'SpaceMono';
user-select: all; user-select: all;

Loading…
Cancel
Save