From c2579c5916c41b7fe5ffa84bd2480dc68f5f1c38 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 18 May 2017 16:11:46 -0400
Subject: [PATCH] FIX: layout of buttons and modals on mobile

---
 app/assets/stylesheets/mobile/compose.scss    |  3 +
 app/assets/stylesheets/mobile/discourse.scss  |  3 +
 app/assets/stylesheets/mobile/login.scss      |  8 ++-
 app/assets/stylesheets/mobile/modal.scss      |  6 +-
 app/assets/stylesheets/mobile/topic-post.scss | 60 ++++++++++---------
 app/assets/stylesheets/mobile/topic.scss      | 15 +++++
 6 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 04d35906ff5..ebe8feb418b 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -230,6 +230,9 @@ input {
     margin: 7px 0 0 5px;
     position: absolute;
   }
+  .btn-primary {
+    margin-bottom: 8px;
+  }
 }
 
 #reply-control.edit-title.private-message {
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 2f0979efe1f..97c23d24271 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -53,6 +53,9 @@ body {
       }
     }
   }
+  .control-group {
+    margin-bottom: 9px;
+  }
 }
 
 blockquote {
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index 41ba55d67bd..d6aa875ca2a 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -37,7 +37,13 @@ a#new-account-link { white-space:nowrap; }
 
 a#forgot-password-link {clear: left; float: left; }
 
-.btn-primary {margin-bottom: 10px; font-size: 15; float: left;}
+.login-modal, .create-account {
+  .btn-primary {
+    margin-bottom: 10px;
+    font-size: 15;
+    float: left;
+  }
+}
 
 
 $label-width: 85px;
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 716d37f16ff..2e83aaf0bf5 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -34,14 +34,14 @@
 .modal-body {
   overflow-y: auto;
   max-height: 400px;
-  padding: 10px 0 10px 10px;
-  width: 95%;
+  padding: 10px;
 }
 
 // we need a little extra room on mobile for the
 // stuff inside the footer to fit
 .modal-footer {
-  padding-right: 0;
+  padding-left: 7px;
+  padding-right: 7px;
 }
 
 .modal-footer .btn + .btn {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index d43c00572bc..228f14abdf4 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -58,38 +58,40 @@ button.like-count {
   padding: 8px 4px;
 }
 
-button {
-  border: none;
-  font-size: 1.214em;
-  padding: 8px 10px;
-  vertical-align: top;
-  background: transparent;
-  color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
-  float: left;
-  &.hidden {
-    display: none;
-  }
-  &.admin {
-    position: relative;
-  }
-  &.expand-post {
-    margin:10px 0 10px 0;
-  }
-  &.has-like {color: $love;}
+.topic-post {
+  button {
+    border: none;
+    font-size: 1.214em;
+    padding: 8px 10px;
+    vertical-align: top;
+    background: transparent;
+    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    float: left;
+    &.hidden {
+      display: none;
+    }
+    &.admin {
+      position: relative;
+    }
+    &.expand-post {
+      margin:10px 0 10px 0;
+    }
+    &.has-like {color: $love;}
 
-  .read-icon {
-    &:before {
-      font-family: "FontAwesome";
-      content: "\f02e";
-    }
-    &.unseen {
+    .read-icon {
       &:before {
-        content: "\f097";
+        font-family: "FontAwesome";
+        content: "\f02e";
       }
-    }
-    &.bookmarked {
-      &:before {
-        color: $tertiary;
+      &.unseen {
+        &:before {
+          content: "\f097";
+        }
+      }
+      &.bookmarked {
+        &:before {
+          color: $tertiary;
+        }
       }
     }
   }
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 7e0fc0cac6a..f920c9b096f 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -45,6 +45,9 @@
 
 .topic-status-info {
   margin-left: 10px;
+  h3 {
+    margin: 0;
+  }
 }
 
 .docked #topic-progress {
@@ -194,3 +197,15 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
   .start-date { font-size: 110%; padding: 5px; }
   .now-date { font-size: 110%; padding: 5px; }
 }
+
+.edit-topic-timer-modal {
+  .auto-update-input {
+    .alert-info {
+      margin: 0 -10px -10px -10px;
+      padding: 10px;
+    }
+  }
+  .btn.pull-right {
+    margin-right: 0;
+  }
+}
\ No newline at end of file