From 9ecf47594b5a6b4461e639ba5e6fd9d15e1edb0e Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Thu, 21 Oct 2021 17:04:43 -0400
Subject: [PATCH] Tweaks to conversation details

---
 stylesheets/_mixins.scss                                 | 8 ++++----
 stylesheets/components/Button.scss                       | 4 +++-
 stylesheets/components/ConversationDetails.scss          | 3 ++-
 stylesheets/components/GroupDescription.scss             | 9 +++++++++
 .../ConversationDetailsHeader.stories.tsx                | 7 +++++--
 .../ConversationDetailsMediaList.tsx                     | 1 -
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/stylesheets/_mixins.scss b/stylesheets/_mixins.scss
index d93e64d98..12ece5ffc 100644
--- a/stylesheets/_mixins.scss
+++ b/stylesheets/_mixins.scss
@@ -5,15 +5,15 @@
 
 @mixin font-title-1 {
   font-family: $inter;
-  font-weight: 700;
-  font-size: 28px;
-  line-height: 34px;
+  font-weight: 600;
+  font-size: 26px;
+  line-height: 32px;
   letter-spacing: -0.56px;
 }
 
 @mixin font-title-2 {
   font-family: $inter;
-  font-weight: 700;
+  font-weight: 600;
   font-size: 20px;
   line-height: 26px;
   letter-spacing: -0.34px;
diff --git a/stylesheets/components/Button.scss b/stylesheets/components/Button.scss
index 3b53004f1..e7ee1fb88 100644
--- a/stylesheets/components/Button.scss
+++ b/stylesheets/components/Button.scss
@@ -220,7 +220,9 @@
     }
 
     &:focus {
-      box-shadow: 0 0 0 2px $color-ultramarine;
+      @include keyboard-mode {
+        box-shadow: 0 0 0 2px $color-ultramarine;
+      }
     }
   }
 
diff --git a/stylesheets/components/ConversationDetails.scss b/stylesheets/components/ConversationDetails.scss
index 1ceb2d402..2f9d538f3 100644
--- a/stylesheets/components/ConversationDetails.scss
+++ b/stylesheets/components/ConversationDetails.scss
@@ -7,7 +7,8 @@
       align-items: center;
       display: flex;
       flex-direction: column;
-      margin: 0 0 24px 0;
+      margin: 0 0 20px 0;
+      padding: 0 24px;
       text-align: center;
       width: 100%;
     }
diff --git a/stylesheets/components/GroupDescription.scss b/stylesheets/components/GroupDescription.scss
index 55c9134f9..c4833d0b7 100644
--- a/stylesheets/components/GroupDescription.scss
+++ b/stylesheets/components/GroupDescription.scss
@@ -7,6 +7,15 @@
     -webkit-line-clamp: 2;
     display: -webkit-box;
     overflow: hidden;
+
+    a {
+      @include light-theme {
+        color: $color-gray-90;
+      }
+      @include dark-theme {
+        color: $color-gray-02;
+      }
+    }
   }
 
   &__read-more {
diff --git a/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx b/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx
index 634a3efe3..4a47bd39e 100644
--- a/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx
@@ -27,7 +27,10 @@ const createConversation = (): ConversationType =>
     type: 'group',
     lastUpdated: 0,
     title: text('conversation title', 'Some Conversation'),
-    groupDescription: text('description', 'This is a group description'),
+    groupDescription: text(
+      'description',
+      'This is a group description. https://www.signal.org'
+    ),
   });
 
 const createProps = (overrideProps: Partial<Props> = {}): Props => ({
@@ -36,7 +39,7 @@ const createProps = (overrideProps: Partial<Props> = {}): Props => ({
   canEdit: false,
   startEditing: action('startEditing'),
   memberships: new Array(number('conversation members length', 0)),
-  isGroup: false,
+  isGroup: true,
   isMe: false,
   ...overrideProps,
 });
diff --git a/ts/components/conversation/conversation-details/ConversationDetailsMediaList.tsx b/ts/components/conversation/conversation-details/ConversationDetailsMediaList.tsx
index f1ca58ccb..27a1fd166 100644
--- a/ts/components/conversation/conversation-details/ConversationDetailsMediaList.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetailsMediaList.tsx
@@ -57,7 +57,6 @@ export const ConversationDetailsMediaList: React.ComponentType<Props> = ({
           {i18n('ConversationDetailsMediaList--show-all')}
         </button>
       }
-      borderless
       title={i18n('ConversationDetailsMediaList--shared-media')}
     >
       <div className={bem('root')}>