removed display references from some views, made signout page more se…

…mantic
haileys · Jun 20, 2012 · e46ca46 · e46ca46
1 parent 2be852c
commit e46ca46
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 31 deletions.
diff --git a/app/assets/stylesheets/global.css.scss b/app/assets/stylesheets/global.css.scss
@@ -119,6 +119,7 @@ a, input, textarea {
 
 .left { float: left; }
 .right { float: right; }
+.clear { clear: both; }
 
 #toggle-grid {
     z-index: 2;

diff --git a/app/assets/stylesheets/sessions.css.scss b/app/assets/stylesheets/sessions.css.scss
@@ -21,6 +21,7 @@ section.sessions {
         margin-bottom: 14px;
     }
     .icon.loading {
+        float: left;
         display: none;
         margin-left: 5.5px;
         margin-top: 5.5px;
@@ -57,9 +58,17 @@ section.sessions {
         border-radius: 0 0 2px 2px;
         border-top: none;
     }
-    footer {
+    .button-array, footer {
+        line-height: 27px;
         @include clear-fix;
+        input {
+            float: left;
+        }
+        a {
+            float: right;
+        }
+    }
+    footer {
         margin-top: 4px;
-        line-height: 27px;
     }
 }
diff --git a/app/assets/stylesheets/user-input.css.scss b/app/assets/stylesheets/user-input.css.scss
@@ -1,9 +1,3 @@
-/*
-
-Styling for the generated markdown that will be inside of comments, review, messages, descriptions, posts, etc.
-
-*/
-
 .user-input {
 	h1, h2, h3 {
 		margin: 0 !important;

diff --git a/app/views/password_resets/create.html.erb b/app/views/password_resets/create.html.erb
@@ -1,8 +1,2 @@
-<div id="outer-login-container">
-    <div class="container" id="login-container">
-        <h2>Password reset</h2>
-        <p>
-            A link to reset your password has been emailed to you.
-        </p>
-    </div>
-</div>
+<strong>Password reset</strong>
+<p>A link to reset your password has been emailed to you.</p>
diff --git a/app/views/password_resets/new.html.erb b/app/views/password_resets/new.html.erb
@@ -7,8 +7,7 @@
         <%= f.text_field :username, placeholder: "Username or email" %>
     </div>
     <footer>
-        <%= f.submit "Reset", class: "blue left", id: "session_submit" %>
-        <div class="icon loading left"></div>
-        <%= link_to "Cancel", new_sessions_path, class: "right" %>
+        <%= f.submit "Reset", class: "blue", id: "session_submit" %>
+        <%= link_to "Cancel", new_sessions_path %>
     </footer>
-<% end %>
+<% end %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
@@ -21,8 +21,8 @@
         <input type="hidden" name="redirect_to" value="<%= flash[:redirect_to] %>" />
     <% end %>
     <footer>
-        <%= f.submit "Sign in", class: "blue left", id: "session_submit" %>
-        <div class="icon loading left"></div>
-        <%= link_to "Forgot your password?", new_password_reset_path, class: "right" %>
+        <%= f.submit "Sign in", class: "blue", id: "session_submit" %>
+        <div class="icon loading"></div>
+        <%= link_to "Forgot your password?", new_password_reset_path %>
     </footer>
 <% end %>
diff --git a/app/views/sessions/show.html.erb b/app/views/sessions/show.html.erb
@@ -1,4 +1,4 @@
-<footer>
-    <%= button_to "Sign out", sessions_path, class: "blue left", method: :delete %>
-    <%= link_to "Do you want to go back?", root_path, class: "right" %>
-</footer>
+<div class="button-array">
+    <%= button_to "Sign out", sessions_path, method: :delete %>
+    <%= link_to "Do you want to go back?", root_path %>
+</div>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
@@ -38,8 +38,7 @@
         <%= f.text_field :invite_code, placeholder: "Invite code" %>
     </div>
     <footer>
-        <%= f.submit "Sign up", class: "blue left", id: "session_submit" %>
-        <div class="icon loading left"></div>
-        <%= link_to "Already have an account?", new_sessions_path, class: "right" %>
+        <%= f.submit "Sign up", class: "blue", id: "session_submit" %>
+        <%= link_to "Already have an account?", new_sessions_path %>
     </footer>
-<% end %>
+<% end %>