commit: 1dfb8d14b21cac8a1349146df03d35c1d2ec6005
parent: 222b0aa982e978dbb692af57d87b0cbc6c9bdeab
Author: lambda <pleromagit@rogerbraun.net>
Date:   Fri, 24 Nov 2017 07:29:08 +0000
Merge branch 'fix/dont-stretch-panel-switcher' into 'develop'
Fix content sizing to not allow empty scrolling, make panel-switcher not grow on mobile
See merge request pleroma/pleroma-fe!175
Diffstat:
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/App.scss b/src/App.scss
@@ -16,7 +16,12 @@ h4 {
 }
 
 #content {
-    padding-top: 60px;
+  box-sizing: border-box;
+  padding-top: 60px;
+  margin: auto;
+  min-height: 100vh;
+  max-width: 980px;
+  background-color: rgba(0,0,0,0.15);
 }
 
 .text-center {
@@ -157,15 +162,6 @@ main-router {
     margin: 0;
 }
 
-
-#content {
-    margin: auto;
-    min-height: 100vh;
-    max-width: 980px;
-    padding-bottom: 1em;
-    background-color: rgba(0,0,0,0.1);
-}
-
 .container > * {
     min-width: 0px;
 }
@@ -210,10 +206,11 @@ nav {
 .panel-switcher {
     display: none;
     width: 100%;
-
+    height: 46px;
     button {
         display: block;
         flex: 1;
+        max-height: 32px;
         margin: 0.5em;
         padding: 0.5em;
     }