From 65b6e23c00f09f3627e29987302cd16c9e069da2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 28 Jul 2020 01:27:11 +0300
Subject: refactor status

---
 src/components/conversation/conversation.vue | 33 ++++++++++++++++++----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 2e48240a..7e2c6a9d 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -1,7 +1,7 @@
 <template>
   <div
-    class="timeline panel-default"
-    :class="[isExpanded ? 'panel' : 'panel-disabled']"
+    class="Conversation"
+    :class="{ '-expanded' : isExpanded, 'panel' : isExpanded }"
   >
     <div
       v-if="isExpanded"
@@ -28,7 +28,7 @@
       :replies="getReplies(status.id)"
       :in-profile="inProfile"
       :profile-user-id="profileUserId"
-      class="status-fadein panel-body"
+      class="conversation-status status-fadein panel-body"
       @goto="setHighlight"
       @toggleExpanded="toggleExpanded"
     />
@@ -40,14 +40,25 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.timeline {
-  .panel-disabled {
-    .status-el {
-      border-left: none;
-      border-bottom-width: 1px;
-      border-bottom-style: solid;
-      border-color: var(--border, $fallback--border);
-      border-radius: 0;
+.Conversation {
+  .conversation-status {
+    border-left: none;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-color: var(--border, $fallback--border);
+    border-radius: 0;
+  }
+
+  &.-expanded {
+    .conversation-status:last-child {
+      border-bottom: none;
+    }
+  }
+
+  &:not(.-expanded) > {
+    .conversation-status:last-child {
+      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
+      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 10bb2b288d1b2d100bc4ba2d970229da7970c4d8 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:26:07 +0300
Subject: remove unnecessary border-radius

---
 src/components/conversation/conversation.vue | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 7e2c6a9d..4322500f 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -54,12 +54,5 @@
       border-bottom: none;
     }
   }
-
-  &:not(.-expanded) > {
-    .conversation-status:last-child {
-      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
-      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
-    }
-  }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 0d02b04726d75687abd218fd6ad68690cf0cfbae Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:32:47 +0300
Subject: bring back red stripe

---
 src/components/conversation/conversation.vue | 10 +++++++++-
 src/components/status/status.scss            |  4 ----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 4322500f..19f769e5 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -45,13 +45,21 @@
     border-left: none;
     border-bottom-width: 1px;
     border-bottom-style: solid;
-    border-color: var(--border, $fallback--border);
+    border-bottom-color: var(--border, $fallback--border);
     border-radius: 0;
   }
 
   &.-expanded {
+    .conversation-status {
+      border-color: $fallback--border;
+      border-color: var(--border, $fallback--border);
+      border-left: 4px solid $fallback--cRed;
+      border-left: 4px solid var(--cRed, $fallback--cRed);
+    }
     .conversation-status:last-child {
       border-bottom: none;
+      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
+      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
     }
   }
 }
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 46088cf9..fec9f9e9 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -5,10 +5,6 @@ $status-margin: 0.75em;
 
 .Status {
   min-width: 0;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-  border-left: 4px $fallback--cRed;
-  border-left: 4px var(--cRed, $fallback--cRed);
 
   &:hover .avatar {
     --still-image-img: visible;
-- 
cgit v1.2.3-70-g09d2


From a962ca6065412f6bde067f6d4a3d460914604c88 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:34:18 +0300
Subject: lint

---
 src/components/conversation/conversation.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 19f769e5..997a4d10 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -56,6 +56,7 @@
       border-left: 4px solid $fallback--cRed;
       border-left: 4px solid var(--cRed, $fallback--cRed);
     }
+
     .conversation-status:last-child {
       border-bottom: none;
       border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
-- 
cgit v1.2.3-70-g09d2

