Permalink
Browse files

update styles, robots.txt

  • Loading branch information...
1 parent e61758c commit 8db32af53c5e04b4611bd4474994331ff24d678d @kevinwmerritt committed Apr 17, 2012
@@ -75,13 +75,6 @@ body {
color: $gray
}
-.form-actions {
- padding: 0px 20px 0px;
- margin-bottom: 0px;
- background-color: inherit;
- border-top: none;
-}
-
.btn {
@include border-radius(0px);
}
@@ -97,21 +90,6 @@ body {
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.33);
}
-.comment {
- margin-top: 10px;
-
- p {
- margin-left: 35px;
- font-size: 11px;
- line-height: 16px;
- }
-}
-
-.profile-img {
- height: 30px;
- width: 30px;
-}
-
legend {
color: #999;
font-weight: bold;
@@ -125,6 +103,7 @@ legend {
input, textarea, select, .uneditable-input {
height: $baseLineHeight + 2;
padding: 6px;
+ margin-bottom: 7px;
font-size: $baseFontSize + 2;
line-height: $baseLineHeight + 2;
border: 1px solid $inputBorder;
@@ -150,6 +129,21 @@ input:focus, textarea:focus {
color: #ff5555;
font-size: 36px;
}
+
+.comment {
+ margin-top: 10px;
+
+ p {
+ margin-left: 35px;
+ font-size: 11px;
+ line-height: 16px;
+ }
+}
+
+.profile-img {
+ height: 30px;
+ width: 30px;
+}
// Hide file upload input field
#uploadinput {
@@ -30,7 +30,21 @@ body.authentication {
}
.well {
- padding: 30px 30px 30px;
+ padding: 30px 30px 0px 30px;
+ }
+
+ input[type="email"], input[type="password"], input[type="text"] {
+ width: 223px;
+ }
+
+ .form-actions {
+ padding-right: 30px;
+ padding-left: 30px;
+ margin-right: -30px;
+ margin-left: -30px;
+ margin-bottom: 0px;
+ border-right: none;
+ border-left: none;
}
.auth-text p {
@@ -1 +1 @@
-@import url(http://fonts.googleapis.com/css?family=Vollkorn:400);
+@import url(https://fonts.googleapis.com/css?family=Vollkorn:400);
@@ -1,11 +1,11 @@
<% content_for :head do %>
<title>Reset your password</title>
<% end %>
-<section id="passwordreset">
+<section id="password-reset-change">
<%= render 'devise/brand' %>
<div class="row">
- <div class="span8 offset2">
- <%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => 'form-horizontal' }) do |f| %>
+ <div class="span4 offset4">
+ <%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
<%= render 'shared/messages' %>
<%= f.error_notification %>
<div class="well">
@@ -16,7 +16,7 @@
<%= f.input :password, :label => 'New password', :hint => "Your new password here", :required => false %>
<%= f.input :password_confirmation, :hint => "One more time for good measure", :required => false %>
<div class="form-actions">
- <%= f.button :submit, "Reset", :disable_with => "Resetting..." %>
+ <%= f.button :submit, "Reset", :disable_with => "Resetting...", :class => 'pull-right' %>
</div>
</fieldset>
</div>
@@ -1,19 +1,21 @@
<% content_for :head do %>
-<title>Forgot your password?</title>
+<title>Reset your password</title>
<% end %>
-<section id="forgotpassword">
+<section id="reset-password">
<%= render 'devise/brand' %>
<div class="row">
- <div class="span6 offset3">
+ <div class="span4 offset4">
<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
<%= render 'shared/messages' %>
<%= f.error_notification %>
<div class="well">
<fieldset>
- <legend>Forgot your password?</legend>
+ <legend>Reset password</legend>
<p>We'll send you password reset instructions</p>
<%= f.input :email, :required => false, :autofocus => true %>
- <%= f.button :submit, "Send" %>
+ <div class="form-actions">
+ <%= f.button :submit, "Send", :class => 'pull-right' %>
+ </div>
</fieldset>
</div>
<% end %>
@@ -15,7 +15,9 @@
<%= f.input :last_name, :required => false %>
<%= f.input :email, :required => false %>
<%= f.input :password, :required => false %>
- <%= f.button :submit, "Sign up", :disable_with => "Sign up..." %>
+ <div class="form-actions">
+ <%= f.button :submit, "Sign up", :disable_with => "Sign up...", :class => 'pull-right' %>
+ </div>
</fieldset>
</div>
<% end %>
@@ -12,9 +12,11 @@
<legend>Sign in</legend>
<%= f.input :email, :required => false, :autofocus => true %>
<%= f.input :password, :required => false %>
- <p><%= link_to "Forgot your password?", new_password_path(resource_name) %></p>
<%= f.input :remember_me, :as => :boolean, :label => false, :inline_label => 'Remember me' if devise_mapping.rememberable? %>
- <%= f.button :submit, "Sign in" %>
+ <div class="form-actions">
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= f.button :submit, "Sign in", :class => 'pull-right'%>
+ </div>
</fieldset>
</div>
<% end %>
View
@@ -1,5 +1,5 @@
# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
#
# To ban all spiders from the entire site uncomment the next two lines:
-User-Agent: *
-Disallow: /
+#User-Agent: *
+#Disallow: /

0 comments on commit 8db32af

Please sign in to comment.