From 8b7b65e995849550957ecfda7fc1bf5fa9c8fcdf Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 19 Apr 2019 10:48:54 +0200
Subject: [Glitch] Allow modal secondary button to shrink and allow wider
 confirmation modals

Port 7f75792bf305eea297c63731600af3b02968aea4 to glitch-soc
---
 app/javascript/flavours/glitch/styles/components/modal.scss | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'app/javascript/flavours/glitch/styles/components/modal.scss')

diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
index fece8593b..05af34680 100644
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
@@ -488,14 +488,6 @@
   font-size: 14px;
 }
 
-.confirmation-modal {
-  max-width: 85vw;
-
-  @media screen and (min-width: 480px) {
-    max-width: 380px;
-  }
-}
-
 .mute-modal {
   line-height: 24px;
 }
@@ -685,6 +677,10 @@
       color: darken($lighter-text-color, 4%);
     }
   }
+
+  .confirmation-modal__secondary-button {
+    flex-shrink: 1;
+  }
 }
 
 .confirmation-modal__do_not_ask_again {
-- 
cgit 


From 039e35560c04e4af1bb35b8ab11b9e145c8a4985 Mon Sep 17 00:00:00 2001
From: kedama <kedama@foresdon.jp>
Date: Mon, 22 Apr 2019 21:55:50 +0900
Subject: [Glitch] Fix modal items cannot scroll on touch devices

Port d763d39d2628bef123cdc801b2a3a3922b7e37f2 to glitch-soc
---
 .../flavours/glitch/features/ui/components/actions_modal.js          | 2 +-
 app/javascript/flavours/glitch/styles/components/modal.scss          | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/javascript/flavours/glitch/styles/components/modal.scss')

diff --git a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js
index 9ac6dcf49..724f1c764 100644
--- a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js
@@ -114,7 +114,7 @@ export default class ActionsModal extends ImmutablePureComponent {
       <div className='modal-root__modal actions-modal'>
         {status}
 
-        <ul>
+        <ul className={classNames({ 'with-status': !!status })}>
           {this.props.actions.map(this.renderAction)}
         </ul>
       </div>
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
index 05af34680..2e5b7be55 100644
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
@@ -621,6 +621,11 @@
   ul {
     overflow-y: auto;
     flex-shrink: 0;
+    max-height: 80vh;
+
+    &.with-status {
+      max-height: calc(80vh - 75px);
+    }
 
     li:empty {
       margin: 0;
-- 
cgit 


From adbb174c9cecc53bf26b46f4e0cc3c5ce4ebf987 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 24 Apr 2019 16:39:49 +0200
Subject: Fix status header display in toot mobile menu

---
 app/javascript/flavours/glitch/styles/components/modal.scss | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'app/javascript/flavours/glitch/styles/components/modal.scss')

diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
index 2e5b7be55..65b2e75f0 100644
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
@@ -415,14 +415,21 @@
   position: relative;
   flex-direction: column;
 
+  .status__relative-time {
+    color: $dark-text-color;
+    float: right;
+    font-size: 14px;
+    width: auto;
+    margin: initial;
+    padding: initial;
+  }
+
   .status__display-name {
     display: flex;
   }
 
   .status__avatar {
-    height: 28px;
-    left: 10px;
-    top: 10px;
+    height: 48px;
     width: 48px;
   }
 
-- 
cgit