From 5cd3e478088e0319af02af980d1054f6cb31a1fa Mon Sep 17 00:00:00 2001
From: btzr-io <btzr.io@gmail.com>
Date: Tue, 23 Jul 2019 23:32:34 -0600
Subject: [PATCH 1/2] fix claim preview on description (markdown)

---
 src/ui/component/previewLink/view.jsx        | 12 ++++++------
 src/ui/scss/component/_markdown-preview.scss | 13 +++++++++++--
 static/locales/en.json                       |  4 ++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/ui/component/previewLink/view.jsx b/src/ui/component/previewLink/view.jsx
index 58799884d..b03f37d41 100644
--- a/src/ui/component/previewLink/view.jsx
+++ b/src/ui/component/previewLink/view.jsx
@@ -30,18 +30,18 @@ class PreviewLink extends React.PureComponent<Props> {
 
     return (
       <span className={'preview-link'} role="button" onClick={this.handleClick}>
-        <span className={'file-list__item'}>
+        <span className={'claim-preview'}>
           <span style={thumbnailStyle} className={'preview-link__thumbnail media__thumb'} />
-          <span className={'file-list__item-metadata'}>
-            <span className={'file-list__item-info'}>
-              <span className={'file-list__item-title'}>
+          <span className={'claim-preview-metadata'}>
+            <span className={'claim-preview-info'}>
+              <span className={'claim-preview-title'}>
                 <TruncatedText text={title} lines={1} />
               </span>
             </span>
-            <span className={'preview-link__description media__subtitle'}>
+            <span className={'media__subtitle'}>
               <UriIndicator uri={uri} link />
             </span>
-            <span className={'file-list__item-properties'}>
+            <span className={'claim-preview-properties'}>
               <span className={'preview-link__description media__subtitle'}>
                 <TruncatedText lines={2} showTooltip={false}>
                   <MarkdownPreview content={description} promptLinks strip />
diff --git a/src/ui/scss/component/_markdown-preview.scss b/src/ui/scss/component/_markdown-preview.scss
index b11338c50..3922c91c6 100644
--- a/src/ui/scss/component/_markdown-preview.scss
+++ b/src/ui/scss/component/_markdown-preview.scss
@@ -98,8 +98,17 @@
     border-left: 0.5rem solid $lbry-teal-5;
     display: block;
     align-items: center;
-    width: 40rem;
     word-break: break-all;
+    overflow: hidden;
+
+    .claim-preview {
+      border: 0;
+      background: transparent;
+    }
+
+    .media__subtitle {
+      display: block;
+    }
   }
 
   .preview-link__thumbnail {
@@ -107,6 +116,6 @@
   }
 
   .preview-link__description {
-    display: block;
+    margin-top: var(--spacing-small);
   }
 }
diff --git a/static/locales/en.json b/static/locales/en.json
index 718d6d979..6236739ca 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -593,6 +593,7 @@
   " Both also help secure ": " Both also help secure ",
   "vanity names": "vanity names",
   "Add support to this claim": "Add support to this claim",
+<<<<<<< HEAD
   "Find New Tags": "Find New Tags",
   "Send LBC to your friends or favorite creators.": "Send LBC to your friends or favorite creators.",
   "Use this address to receive LBC. You can generate a new address at any time, and any previous addresses will continue to work.": "Use this address to receive LBC. You can generate a new address at any time, and any previous addresses will continue to work.",
@@ -639,4 +640,7 @@
   "File Size": "File Size",
   "You deposited 1 LBC as a support!": "You deposited 1 LBC as a support!",
   "Refreshed!": "Refreshed!"
+=======
+  "%s blocks behind": "%s blocks behind"
+>>>>>>> fix claim preview on description (markdown)
 }
\ No newline at end of file

From e4d4826ed022bb7f8cf56731459708969cb969ac Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 29 Jul 2019 10:12:53 -0400
Subject: [PATCH 2/2] fix rebase typo

---
 src/ui/component/claimPreview/view.jsx | 1 +
 static/locales/en.json                 | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/ui/component/claimPreview/view.jsx b/src/ui/component/claimPreview/view.jsx
index 43fee4239..41dda6e82 100644
--- a/src/ui/component/claimPreview/view.jsx
+++ b/src/ui/component/claimPreview/view.jsx
@@ -76,6 +76,7 @@ function ClaimPreview(props: Props) {
   }
 
   const isChannel = isValid ? parseURI(uri).isChannel : false;
+  const signingChannel = claim && claim.signing_channel;
   let shouldHide =
     placeholder !== 'loading' && ((abandoned && !showPublishLink) || (!claimIsMine && obscureNsfw && nsfw));
 
diff --git a/static/locales/en.json b/static/locales/en.json
index 6236739ca..9f079563c 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -593,7 +593,6 @@
   " Both also help secure ": " Both also help secure ",
   "vanity names": "vanity names",
   "Add support to this claim": "Add support to this claim",
-<<<<<<< HEAD
   "Find New Tags": "Find New Tags",
   "Send LBC to your friends or favorite creators.": "Send LBC to your friends or favorite creators.",
   "Use this address to receive LBC. You can generate a new address at any time, and any previous addresses will continue to work.": "Use this address to receive LBC. You can generate a new address at any time, and any previous addresses will continue to work.",
@@ -640,7 +639,4 @@
   "File Size": "File Size",
   "You deposited 1 LBC as a support!": "You deposited 1 LBC as a support!",
   "Refreshed!": "Refreshed!"
-=======
-  "%s blocks behind": "%s blocks behind"
->>>>>>> fix claim preview on description (markdown)
-}
\ No newline at end of file
+}