From ad32896a936d8e427e419637ce0243be376a115c Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 16 Jan 2019 14:24:23 +0100
Subject: [Glitch] Fix hashtag timeline on mobile

Port c5b8824a3e5fa43470d12c4ef96eda3e62e10436 to glitch-soc
---
 app/javascript/flavours/glitch/styles/about.scss | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'app/javascript/flavours/glitch')

diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss
index da50581fb..c8d144e5b 100644
--- a/app/javascript/flavours/glitch/styles/about.scss
+++ b/app/javascript/flavours/glitch/styles/about.scss
@@ -1044,10 +1044,6 @@ $small-breakpoint: 960px;
 
     .scrollable {
       height: 400px;
-
-      @media screen and (max-width: $column-breakpoint) {
-        height: 90vh;
-      }
     }
 
     p {
@@ -1274,8 +1270,7 @@ $small-breakpoint: 960px;
       }
 
       #mastodon-timeline {
-        display: block;
-        width: 100vw;
+        display: flex;
         height: 100vh;
         border-radius: 0;
       }
-- 
cgit 


From 92830029cac92a60719bd9f9cabc5392d0cdf968 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 16 Jan 2019 14:25:58 +0100
Subject: [Glitch] Make hashtag search results link to the hashtag URL

Port 6cfb357940b3855ce53f6d1dfd87b1b32840a302 to glitch-soc
---
 app/javascript/flavours/glitch/components/hashtag.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/javascript/flavours/glitch')

diff --git a/app/javascript/flavours/glitch/components/hashtag.js b/app/javascript/flavours/glitch/components/hashtag.js
index 88689cc6c..d75edd994 100644
--- a/app/javascript/flavours/glitch/components/hashtag.js
+++ b/app/javascript/flavours/glitch/components/hashtag.js
@@ -1,16 +1,16 @@
 import React from 'react';
 import { Sparklines, SparklinesCurve } from 'react-sparklines';
-import { Link } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import Permalink from './permalink';
 import { shortNumberFormat } from 'flavours/glitch/util/numbers';
 
 const Hashtag = ({ hashtag }) => (
   <div className='trends__item'>
     <div className='trends__item__name'>
-      <Link to={`/timelines/tag/${hashtag.get('name')}`}>
+      <Permalink href={hashtag.get('url')} to={`/timelines/tag/${hashtag.get('name')}`}>
         #<span>{hashtag.get('name')}</span>
-      </Link>
+      </Permalink>
 
       <FormattedMessage id='trends.count_by_accounts' defaultMessage='{count} {rawCount, plural, one {person} other {people}} talking' values={{ rawCount: hashtag.getIn(['history', 0, 'accounts']), count: <strong>{shortNumberFormat(hashtag.getIn(['history', 0, 'accounts']))}</strong> }} />
     </div>
-- 
cgit 


From 5684cd090caec27729d78c204911348a0cf62cbf Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 16 Jan 2019 14:50:17 +0100
Subject: [Glitch] make draggingOver state off correctly

Port d6433b393162bcfd7c6cfaf18abb9d6b6f6aef11 to glitch-soc
---
 app/javascript/flavours/glitch/features/ui/index.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/javascript/flavours/glitch')

diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js
index f043f767e..7928dfe6c 100644
--- a/app/javascript/flavours/glitch/features/ui/index.js
+++ b/app/javascript/flavours/glitch/features/ui/index.js
@@ -182,6 +182,7 @@ export default class UI extends React.Component {
     e.preventDefault();
 
     this.setState({ draggingOver: false });
+    this.dragTargets = [];
 
     if (e.dataTransfer && e.dataTransfer.files.length === 1) {
       this.props.dispatch(uploadCompose(e.dataTransfer.files));
-- 
cgit