From 11832460431bb6b3196daf17656c2cc76e8ae63d Mon Sep 17 00:00:00 2001
From: Mateusz Bugowski <23140767+mbugowski@users.noreply.github.com>
Date: Fri, 11 Jan 2019 08:30:19 +0100
Subject: change height on narrow view to take 100% of screen (#9781)

* change height on narrow view to take 100% of screen

* add empty line before @media
---
 app/javascript/styles/mastodon/about.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/javascript/styles')

diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index dc456be3e..4023b34d8 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -1041,6 +1041,10 @@ $small-breakpoint: 960px;
 
     .scrollable {
       height: 400px;
+
+      @media screen and (max-width: $column-breakpoint) {
+        height: 90vh;
+      }
     }
 
     p {
-- 
cgit 


From 9ee9cb549b58a33a81a9da318cbdc26ed2e47788 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Fri, 11 Jan 2019 19:15:44 +0900
Subject: Adjust admin UI right panel size (#9768)

* Adjust admin UI right panel size

* Fix typo
---
 app/javascript/styles/mastodon/admin.scss | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/javascript/styles')

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 375c655f5..177f8145f 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1,4 +1,6 @@
 $no-columns-breakpoint: 600px;
+$sidebar-width: 240px;
+$content-width: 840px;
 
 .admin-wrapper {
   display: flex;
@@ -6,7 +8,7 @@ $no-columns-breakpoint: 600px;
   height: 100%;
 
   .sidebar-wrapper {
-    flex: 1;
+    flex: 1 1 $sidebar-width;
     height: 100%;
     background: $ui-base-color;
     display: flex;
@@ -14,7 +16,7 @@ $no-columns-breakpoint: 600px;
   }
 
   .sidebar {
-    width: 240px;
+    width: $sidebar-width;
     height: 100%;
     padding: 0;
     overflow-y: auto;
@@ -95,12 +97,12 @@ $no-columns-breakpoint: 600px;
   }
 
   .content-wrapper {
-    flex: 2;
+    flex: 2 1 $content-width;
     overflow: auto;
   }
 
   .content {
-    max-width: 700px;
+    max-width: $content-width;
     padding: 20px 15px;
     padding-top: 60px;
     padding-left: 25px;
-- 
cgit