From 4d65fe76abc16a0e7b4a02116c7bbd9b8a1ecb2d Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Fri, 14 Feb 2020 11:41:59 +1100
Subject: [PATCH 1/5] Updating tos & privacy links

---
 _locales/en/messages.json                  |  2 +-
 stylesheets/_modules.scss                  |  1 -
 stylesheets/_session.scss                  | 24 ++++++++++++----------
 ts/components/EditProfileDialog.tsx        |  3 ++-
 ts/components/conversation/MessageBody.tsx |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 28d8c6db2..eb759e179 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2609,7 +2609,7 @@
   },
   "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."
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 493aac60a..bd98b42eb 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -36,7 +36,6 @@
 }
 
 // Module: Message
-
 .module-message {
   position: relative;
   display: inline-flex;
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 5c3497ba8..933da6f03 100644
--- a/stylesheets/_session.scss
+++ b/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,15 @@ $session-conversation-header-height: 60px;
   font-family: $session-font-family;
 }
 
-a,
-div,
-span,
-label {
+* {
+  user-select: none;
+}
+
+.text-selectable {
   user-select: text;
 
-  &::selection {
-    background: $session-shade-17;
+  ::selection {
+    background: rgba($session-color-green, 0.6);
   }
 }
 
@@ -592,6 +589,11 @@ label {
   .close-button {
     float: left;
   }
+
+  .session-button.default.danger {
+    display: flex;
+    width: 80px;
+  }
 }
 .message-selection-overlay div[role='button'] {
   display: inline-block;
diff --git a/ts/components/EditProfileDialog.tsx b/ts/components/EditProfileDialog.tsx
index 1a560dfc7..b05e35184 100644
--- a/ts/components/EditProfileDialog.tsx
+++ b/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,7 @@ 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" />
 
diff --git a/ts/components/conversation/MessageBody.tsx b/ts/components/conversation/MessageBody.tsx
index f0af43dff..4da493324 100644
--- a/ts/components/conversation/MessageBody.tsx
+++ b/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">

From a1e4072ec19857b223cea376aec97bd39327a8dd Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Fri, 14 Feb 2020 11:55:15 +1100
Subject: [PATCH 2/5] Stylistic updated

---
 README.md                           | 1 -
 stylesheets/_modules.scss           | 6 ++----
 stylesheets/_session.scss           | 8 +++++++-
 stylesheets/_session_left_pane.scss | 4 ++--
 ts/components/EditProfileDialog.tsx | 9 ++++++++-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index aad912514..c543257f7 100644
--- a/README.md
+++ b/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.
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index bd98b42eb..ed30fc502 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1233,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;
@@ -1443,7 +1444,6 @@
   flex-direction: row;
   align-items: center;
 
-  height: $header-height;
   color: $color-gray-90;
 
   background-color: $color-white;
@@ -1467,9 +1467,7 @@
   flex-shrink: 1;
   min-width: 0;
   display: block;
-
   text-align: center;
-  height: 48px;
 }
 
 .module-conversation-header__title-text {
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 933da6f03..5f0749aaf 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -203,7 +203,9 @@ $session-conversation-header-height: 60px;
 .text-selectable {
   user-select: text;
 
-  ::selection {
+  &::selection {
+    border-radius: 3px;
+    padding: 3px;
     background: rgba($session-color-green, 0.6);
   }
 }
@@ -492,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;
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 946348182..ee8bd0e7a 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/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: 63px;
+    height: $main-view-header-height;
+    padding-right: 7px;
 
     @at-root .light-theme #{&} {
       background-color: $session-color-white;
diff --git a/ts/components/EditProfileDialog.tsx b/ts/components/EditProfileDialog.tsx
index b05e35184..8cf9f333a 100644
--- a/ts/components/EditProfileDialog.tsx
+++ b/ts/components/EditProfileDialog.tsx
@@ -110,7 +110,14 @@ export class EditProfileDialog extends React.Component<Props, State> {
           <div className="panel-text-divider">
             <span>{window.i18n('yourSessionID')}</span>
           </div>
-          <p className={classNames('text-selectable', 'session-id-section-display')}>{sessionID}</p>
+          <p
+            className={classNames(
+              'text-selectable',
+              'session-id-section-display'
+            )}
+          >
+            {sessionID}
+          </p>
 
           <div className="spacer-lg" />
 

From 513e5e34df018fb6966c732c34f1d45ff3595b03 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Fri, 14 Feb 2020 14:12:03 +1100
Subject: [PATCH 3/5] Styles

---
 _locales/en/messages.json           | 15 ++++++---------
 stylesheets/_conversation.scss      |  5 +++--
 stylesheets/_session.scss           | 17 +++++++----------
 stylesheets/_session_left_pane.scss |  7 ++++++-
 stylesheets/_session_signin.scss    |  5 ++---
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index eb759e179..c2f9b00f0 100644
--- a/_locales/en/messages.json
+++ b/_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"
@@ -2614,9 +2614,6 @@
   "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"
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 2f879d9c3..9535c20ec 100644
--- a/stylesheets/_conversation.scss
+++ b/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: 6px;
+    margin-bottom: 8px;
+    padding-left: 0px $session-margin-md;
 
     .send-message {
       flex-grow: 1;
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 5f0749aaf..c86f7b3a9 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -198,15 +198,13 @@ $session-conversation-header-height: 60px;
 
 * {
   user-select: none;
-}
-
-.text-selectable {
-  user-select: text;
 
-  &::selection {
-    border-radius: 3px;
-    padding: 3px;
-    background: rgba($session-color-green, 0.6);
+  .text-selectable, input, textarea {
+    user-select: text;
+  
+    &::selection {
+      background: rgba($session-color-green, 0.6);
+    }
   }
 }
 
@@ -1353,14 +1351,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;
   }
 
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index ee8bd0e7a..89ae7f6cf 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -405,8 +405,9 @@ $session-compose-margin: 20px;
   display: flex;
   flex-direction: row;
   position: absolute;
-  bottom: 0px;
+  bottom: 2px;
   width: 100%;
+  
 
   @at-root .light-theme #{&} {
     background-color: $session-color-white;
@@ -539,6 +540,10 @@ $session-compose-margin: 20px;
 
   &-bottom-buttons {
     @include bottom-buttons();
+    
+    .session-button {
+      height: 57px;
+    }
   }
 }
 
diff --git a/stylesheets/_session_signin.scss b/stylesheets/_session_signin.scss
index 66b5fd5c2..e0dce956c 100644
--- a/stylesheets/_session_signin.scss
+++ b/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;

From 01389aa80216cbcd9a2ee0434e8fe0ad6839a410 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Fri, 14 Feb 2020 14:25:36 +1100
Subject: [PATCH 4/5] More styles

---
 stylesheets/_session.scss                         |  6 ++++--
 stylesheets/_session_left_pane.scss               |  3 +--
 ts/components/conversation/ConversationHeader.tsx | 10 ++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index c86f7b3a9..523be5f80 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -199,9 +199,11 @@ $session-conversation-header-height: 60px;
 * {
   user-select: none;
 
-  .text-selectable, input, textarea {
+  .text-selectable,
+  input,
+  textarea {
     user-select: text;
-  
+
     &::selection {
       background: rgba($session-color-green, 0.6);
     }
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 89ae7f6cf..d9e93b67c 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -407,7 +407,6 @@ $session-compose-margin: 20px;
   position: absolute;
   bottom: 2px;
   width: 100%;
-  
 
   @at-root .light-theme #{&} {
     background-color: $session-color-white;
@@ -540,7 +539,7 @@ $session-compose-margin: 20px;
 
   &-bottom-buttons {
     @include bottom-buttons();
-    
+
     .session-button {
       height: 57px;
     }
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index a25367cc5..d4c88e8fa 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/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>
       </>

From 7e5f967379980f7b04146a9de080bc80018c23e2 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Fri, 14 Feb 2020 14:32:56 +1100
Subject: [PATCH 5/5] minor grunt fix

---
 stylesheets/_conversation.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 9535c20ec..de9c4e857 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -433,7 +433,7 @@
     flex-direction: row;
     align-items: center;
     margin-bottom: 8px;
-    padding-left: 0px $session-margin-md;
+    padding-left: 0px 15px;
 
     .send-message {
       flex-grow: 1;