From b874b31b02c443e152ee35479da9978076ddd6d4 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Mon, 22 Sep 2014 17:26:17 -0700
Subject: [PATCH] correct mobile login form layout error

---
 .../discourse/templates/mobile/modal/login.js.handlebars      | 3 ---
 app/assets/stylesheets/common/foundation/base.scss            | 1 -
 app/assets/stylesheets/mobile/login.scss                      | 4 +---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars
index b95708f92e1..1fde21ccc7f 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.js.handlebars
@@ -1,9 +1,6 @@
 <div class="modal-body">
   {{login-buttons action="externalLogin"}}
   {{#if canLoginLocal}}
-    {{#if hasAtLeastOneLoginButton}}
-      <h3 style="text-align:center;">{{i18n login.or}}</h3>
-    {{/if}}
     <form id='login-form' method='post'>
       <div>
         <table>
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index c71817a7e86..656248df673 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -10,7 +10,6 @@ html {
   font: #{$base-font-size}/#{$base-line-height} $base-font-family;
   background-color: $secondary;
   overflow-y: scroll;
-  -webkit-font-smoothing: subpixel-antialiased;
 }
 
 // Links
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index 91fa40309f2..c9986333e5f 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -6,12 +6,10 @@
 }
 
 #login-buttons {
-  text-align: center;
   button {
     margin: 0 0 5px 0;
   }
-  margin-top: 0;
-  margin-bottom: 0;
+  display: inline-block;
 }
 
 #login-form {