Merge pull request #851 from vincentbavitz/clearnet

Various improvements

README.md

@@ -5,7 +5,6 @@
 Session integrates directly with [Loki Service Nodes](https://lokidocs.com/ServiceNodes/SNOverview/), which are a set of distributed, decentralized and Sybil resistant nodes. Service Nodes act as servers which store messages offline, and a set of nodes which allow for onion routing functionality obfuscating users IP Addresses. For a full understanding of how Session works, read the [Session Whitepaper](https://getsession.org/whitepaper).
 ![DesktopSession](https://i.imgur.com/ZnHvYjo.jpg)
 
-
 ## Want to Contribute? Found a Bug or Have a feature request?
 
 Please search for any [existing issues](https://github.com/loki-project/session-desktop/issues) that describe your bugs in order to avoid duplicate submissions. Submissions can be made by making a pull request to our development branch. If you don't know where to start contributing , try reading the Github issues page for ideas.

_locales/en/messages.json

@@ -976,7 +976,7 @@
     "message": "You don't have any messages, yet."
   },
   "noMessagesSubtitle": {
-    "message": "Would you like to join Session's public chat?"
+    "message": "Would you like to join Session's open group?"
   },
   "pairNewDevice": {
     "message": "Pair New Device"
@@ -2131,7 +2131,7 @@
   },
   "banUser": {
     "message": "Ban User",
-    "description": "Ban user from public chat by public key."
+    "description": "Ban user from open group by public key."
   },
   "banUserConfirm": {
     "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"
   },
   "updatePublicGroupDialogTitle": {
-    "message": "Updating a Public Chat Channel",
+    "message": "Updating a open group Channel",
     "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": {
     "message": "Show Seed",
@@ -2407,7 +2407,7 @@
     "message": "Failed to connect to server. Check URL"
   },
   "connectToServerSuccess": {
-    "message": "Successfully connected to new public chat server"
+    "message": "Successfully connected to new open group server"
   },
   "setPasswordFail": {
     "message": "Failed to set password"
@@ -2609,14 +2609,11 @@
   },
   "ByUsingThisService...": {
     "message":
-      "By using this service, you agree to our <a href=\"https://getsession.org/privacy-policy/\">Terms and Conditions</a> and <a href=\"https://getsession.org/privacy-policy/\" target=\"_blank\">Privacy Statement</a>"
+      "By using this service, you agree to our <a href=\"https://getsession.org/legal/#tos\">Terms of Service</a> and <a href=\"https://getsession.org/privacy-policy/\" target=\"_blank\">Privacy Policy</a>"
   },
   "beginYourSession": {
     "message": "Begin<br />your<br />Session."
   },
-  "welcomeToSession": {
-    "message": "Welcome to Session"
-  },
   "welcomeToYourSession": {
     "message": "Welcome to your Session"
   },
@@ -2773,7 +2770,7 @@
     "message": "Join Open Group"
   },
   "joinPublicChat": {
-    "message": "Join Public Chat"
+    "message": "Join open group"
   },
   "next": {
     "message": "Next"

stylesheets/_conversation.scss

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

stylesheets/_modules.scss

@@ -36,7 +36,6 @@
 }
 
 // Module: Message
-
 .module-message {
   position: relative;
   display: inline-flex;
@@ -1234,7 +1233,8 @@
   text-align: center;
 }
 
-.module-group-notification__change, .module-timer-notification__message {
+.module-group-notification__change,
+.module-timer-notification__message {
   background-color: #212121;
   width: 90%;
   max-width: 700px;
@@ -1444,7 +1444,6 @@
   flex-direction: row;
   align-items: center;
 
-  height: $header-height;
   color: $color-gray-90;
 
   background-color: $color-white;
@@ -1468,9 +1467,7 @@
   flex-shrink: 1;
   min-width: 0;
   display: block;
-
   text-align: center;
-  height: 48px;
 }
 
 .module-conversation-header__title-text {

stylesheets/_session.scss

@@ -136,7 +136,7 @@ div.spacer-lg {
 
 // Blur for modals
 .loki-dialog ~ .index.inbox {
-  filter: blur(1px);
+  filter: blur(2px);
   transition: filter 0.1s;
 }
 
@@ -156,10 +156,6 @@ div.spacer-lg {
   width: 100%;
 }
 
-::selection {
-  background: rgba($session-color-green, 0.6);
-}
-
 input,
 textarea {
   caret-color: $session-color-green !important;
@@ -200,14 +196,17 @@ $session-conversation-header-height: 60px;
   font-family: $session-font-family;
 }
 
-a,
+* {
-div,
+  user-select: none;
-span,
+
-label {
+  .text-selectable,
-  user-select: text;
+  input,
+  textarea {
+    user-select: text;
 
-  &::selection {
+    &::selection {
-    background: $session-shade-17;
+      background: rgba($session-color-green, 0.6);
+    }
   }
 }
 
@@ -495,6 +494,10 @@ $session-element-border-green: 4px solid $session-color-green;
   }
 }
 
+.module-conversation-header {
+  height: $main-view-header-height;
+}
+
 .module-conversation-header__title-flex,
 .module-conversation-header__title {
   font-family: Wasa;
@@ -592,6 +595,11 @@ label {
   .close-button {
     float: left;
   }
+
+  .session-button.default.danger {
+    display: flex;
+    width: 80px;
+  }
 }
 .message-selection-overlay div[role='button'] {
   display: inline-block;
@@ -1345,14 +1353,13 @@ label {
 
 .bottom-bar {
   .compose {
-    min-height: 60px;
     max-height: 200px;
   }
 
   .send-message-container {
     display: flex;
     flex-grow: 1;
-    min-height: 60px;
+    height: 48px;
     margin-bottom: -5px;
   }
 

stylesheets/_session_left_pane.scss

@@ -180,8 +180,8 @@ $session-compose-margin: 20px;
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
-    padding: 15px 7px 14px 0px;
+    height: $main-view-header-height;
-    height: 63px;
+    padding-right: 7px;
 
     @at-root .light-theme #{&} {
       background-color: $session-color-white;
@@ -405,7 +405,7 @@ $session-compose-margin: 20px;
   display: flex;
   flex-direction: row;
   position: absolute;
-  bottom: 0px;
+  bottom: 2px;
   width: 100%;
 
   @at-root .light-theme #{&} {
@@ -539,6 +539,10 @@ $session-compose-margin: 20px;
 
   &-bottom-buttons {
     @include bottom-buttons();
+
+    .session-button {
+      height: 57px;
+    }
   }
 }
 

stylesheets/_session_signin.scss

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

ts/components/EditProfileDialog.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import classNames from 'classnames';
 import { QRCode } from 'react-qr-svg';
 
 import { Avatar } from './Avatar';
@@ -109,7 +110,14 @@ export class EditProfileDialog extends React.Component<Props, State> {
           <div className="panel-text-divider">
             <span>{window.i18n('yourSessionID')}</span>
           </div>
-          <p className="session-id-section-display">{sessionID}</p>
+          <p
+            className={classNames(
+              'text-selectable',
+              'session-id-section-display'
+            )}
+          >
+            {sessionID}
+          </p>
 
           <div className="spacer-lg" />
 

ts/components/conversation/ConversationHeader.tsx

@@ -399,8 +399,14 @@ export class ConversationHeader extends React.Component<Props> {
             </div>
           </div>
           {this.renderExpirationLength()}
-          {this.renderSearch()}
+
-          {this.renderAvatar()}
+          {!this.props.isRss && (
+            <>
+              {this.renderSearch()}
+              {this.renderAvatar()}
+            </>
+          )}
+
           {this.renderMenu(triggerId)}
         </div>
       </>

ts/components/conversation/MessageBody.tsx

@@ -88,7 +88,7 @@ export class MessageBody extends React.Component<Props> {
     const { i18n, textPending } = this.props;
 
     return (
-      <span>
+      <span className="text-selectable">
         {jsx}
         {textPending ? (
           <span className="module-message-body__highlight">