about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/styles
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-01-16 16:28:38 +0100
committerGitHub <noreply@github.com>2019-01-16 16:28:38 +0100
commit530d29148ca0c5bf29f6fa516b1ef4f91d95894b (patch)
treee074e7b778e973b12e754d939cc5e2805eb012d6 /app/javascript/flavours/glitch/styles
parent077639c27409f897e87522dd18a51801b6cbc40d (diff)
parent5684cd090caec27729d78c204911348a0cf62cbf (diff)
Merge pull request #887 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
-rw-r--r--app/javascript/flavours/glitch/styles/about.scss7
1 files changed, 1 insertions, 6 deletions
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;
       }