From 7b674bb8d8bda4a5172b4c0dfc76779bda848973 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Wed, 12 Feb 2020 17:27:14 +1100
Subject: [PATCH] Various UI improvements

---
 about.html                             |  4 ++--
 background.html                        |  1 -
 stylesheets/_modules.scss              |  1 +
 stylesheets/_session.scss              |  8 ++++++--
 stylesheets/_session_left_pane.scss    | 12 ++++++++----
 ts/components/session/ActionsPanel.tsx | 10 +++++-----
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/about.html b/about.html
index 7e296de61..6c1a9ddf8 100644
--- a/about.html
+++ b/about.html
@@ -39,11 +39,11 @@
   <div class='commitHash'></div>
   <div class='environment'></div>
   <div>
-    <a href="https://loki.network">loki.network</a>
+    <a href="https://getsession.org">loki.network</a>
   </div>
   <br>
   <div>
-    <a class="privacy" href="https://loki.network">Terms &amp; Privacy Policy</a>
+    <a class="privacy" href="https://getsession.org">Terms &amp; Privacy Policy</a>
   </div>
 
   <script type='text/javascript' src='node_modules/jquery/dist/jquery.js'></script>
diff --git a/background.html b/background.html
index b1ba2769d..785d40ec2 100644
--- a/background.html
+++ b/background.html
@@ -40,7 +40,6 @@
   </script>
 
   <script type='text/x-tmpl-mustache' id='two-column'>
-    <div id='session-toast-container'></div>
     <div class='gutter'>
       <div class='network-status-container'></div>
       <div class='left-pane-placeholder'></div>
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 99234384c..9d207a946 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -2015,6 +2015,7 @@
   display: flex;
   flex-direction: row;
   align-items: center;
+  margin-top: 5px;
 }
 
 .module-conversation-list-item__message__text {
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 32a79c44d..9990e9471 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -156,6 +156,10 @@ div.spacer-lg {
   width: 100%;
 }
 
+::selection {
+  background: rgba($session-color-green, 0.6);
+}
+
 input,
 textarea {
   caret-color: $session-color-green !important;
@@ -998,6 +1002,7 @@ label {
     }
 
     &-display {
+      user-select: text;
       text-align: center;
       word-break: break-all;
       font-size: $session-font-md;
@@ -1293,7 +1298,7 @@ label {
   .module-message {
     font-family: 'SF Pro Text';
     border-radius: 5px;
-  
+
     &__text--incoming {
       /* Add padding to large emojis in chat */
       img.emoji.jumbo {
@@ -1301,7 +1306,6 @@ label {
       }
     }
   }
-  
 }
 
 .bottom-bar {
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 70f3ad947..946348182 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -215,7 +215,7 @@ $session-compose-margin: 20px;
 
   &__list {
     height: -webkit-fill-available;
-    border-top: 1px solid rgba(255,255,255,0.05);
+    border-top: 1px solid rgba(255, 255, 255, 0.05);
 
     &-popup {
       width: -webkit-fill-available;
@@ -244,6 +244,10 @@ $session-compose-margin: 20px;
       padding: 13px;
     }
 
+    h2 {
+      margin-top: 0px;
+    }
+
     h3,
     h2 {
       text-align: center;
@@ -468,7 +472,7 @@ $session-compose-margin: 20px;
   justify-content: center;
   background: $session-color-danger;
   width: 22px;
-  height: 22px;  
+  height: 22px;
   font-size: $session-font-xs;
   margin-left: auto;
   text-align: center;
@@ -508,10 +512,10 @@ $session-compose-margin: 20px;
         .module-conversation__user__profile-name {
           font-size: 13px !important;
         }
-
       }
 
-      &__header__date, &__message {
+      &__header__date,
+      &__message {
         display: none;
       }
 
diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx
index cc2601893..add26cefd 100644
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@@ -165,15 +165,15 @@ export class ActionsPanel extends React.Component<Props, State> {
           notificationCount={unreadMessageCount}
         />
         <this.Section
-          type={SectionType.Contact}
-          isSelected={isContactPageSelected}
+          type={SectionType.Channel}
+          isSelected={isChannelPageSelected}
           onSelect={this.handleSectionSelect}
-          notificationCount={receivedFriendRequestCount}
         />
         <this.Section
-          type={SectionType.Channel}
-          isSelected={isChannelPageSelected}
+          type={SectionType.Contact}
+          isSelected={isContactPageSelected}
           onSelect={this.handleSectionSelect}
+          notificationCount={receivedFriendRequestCount}
         />
         <this.Section
           type={SectionType.Settings}