Merge pull request #183 from plebbit/resolve-conflicts

Development

src/components/styled/views/Catalog.styled.jsx

@@ -51,6 +51,16 @@ export const Threads = styled.div`
     margin-top: -2px;
   }
 
+  .offline-icon-no-link-shifted {
+    height: 11px;
+    position: absolute;
+    margin-left: 35px;
+    margin-top: -2px;
+  }
+
+  .offline-icon-no-link-hovered {
+    transform: translate(16px,0);
+  }
   .sticky-icon {
     background-image: url(assets/sticky.gif);
     width: 16px;

src/components/views/AllCatalog.jsx

@@ -317,7 +317,7 @@ const CatalogPost = ({post}) => {
         ) : (
           <OfflineIndicator 
           address={thread.subplebbitAddress} 
-          className="thread-icon offline-icon-no-link"
+          className={`thread-icon ${linkCount > 0 ? "offline-icon-no-link-shifted" : "offline-icon-no-link"} ${isHoveringOnThread === thread.cid ? 'offline-icon-no-link-hovered' : ''}`}
           tooltipPlace="top" />
       )}
       </div>

src/components/views/SubscriptionsCatalog.jsx

@@ -317,7 +317,7 @@ const CatalogPost = ({post}) => {
         ) : (
           <OfflineIndicator 
           address={thread.subplebbitAddress} 
-          className="thread-icon offline-icon-no-link"
+          className={`thread-icon ${linkCount> 0?"offline-icon-no-link-shifted": "offline-icon-no-link"} ${isHoveringOnThread === thread.cid ? 'offline-icon-no-link-hovered' : ''}`}
           tooltipPlace="top" />
       )}
       </div>