Permalink
Browse files

more styling, mostly forms and buttons

  • Loading branch information...
1 parent 22f29f9 commit d4bd6cd73bbbc78658d2956d2a6f82990e4fe89b @helenaut helenaut committed May 1, 2012
@@ -132,3 +132,26 @@ label {
#calendar-links {
margin-bottom: 40px; }
+
+input {
+ border: 1px;
+ font-family: 'Open Sans', sans-serif;
+ background-color: #e4e3e3;
+ margin: 10px 5px 10px 5px;
+ border-radius: 3px;
+ padding: 3px; }
+
+input[type="submit"] {
+ border-radius: 5px;
+ width: auto;
+ padding: 6px 10px;
+ background-color: #cd3301;
+ color: white;
+ border: none;
+ font-weight: bold;
+ text-transform: uppercase;
+ font-size: 85%;
+ display: block; }
+ input[type="submit"]:hover {
+ background-color: #a62900;
+ cursor: pointer; }
@@ -54,7 +54,21 @@ body {
padding-left: 7px;
padding-right: 7px; }
#login #signup input.submit:hover {
- background-color: #410140; }
+ background-color: #410140;
+ cursor: pointer; }
+#login input.submit {
+ border-radius: 5px;
+ width: auto;
+ padding: 0 10px;
+ background-color: #cd3301;
+ color: white;
+ border: none;
+ font-weight: bold;
+ text-transform: uppercase;
+ font-size: 85%; }
+ #login input.submit:hover {
+ background-color: #a62900;
+ cursor: pointer; }
.left {
float: left; }
@@ -88,6 +102,24 @@ a {
a:hover {
color: #410140; }
+.login-links {
+ font-size: 80%;
+ padding-left: 20px; }
+
+.flash-msg {
+ font-weight: bold;
+ color: #cd3301;
+ background-color: #e4e3e3;
+ border: 1px solid #cd3301;
+ border-radius: 5px;
+ padding: 5px 10px;
+ margin: 8px 0;
+ font-size: 90%;
+ text-transform: uppercase; }
+ .flash-msg ul {
+ list-style-type: none;
+ padding: 0px; }
+
.remember-left {
float: left;
width: 30px; }
@@ -105,6 +105,8 @@ a {
}
}
+
+
table {
width: 95%;
margin: 0 auto;
@@ -170,3 +172,31 @@ label {
#calendar-links{
margin-bottom:40px;
}
+input {
+ border: 1px;
+ font-family: 'Open Sans', sans-serif;
+ background-color: $off-white;
+ margin: 10px 5px 10px 5px;
+ border-radius: 3px;
+ padding: 3px;
+}
+
+
+
+input[type="submit"] {
+ border-radius: 5px;
+ width: auto;
+ padding: 6px 10px;
+ background-color: $orange;
+ color: $white;
+ border: none;
+ font-weight: bold;
+ text-transform: uppercase;
+ font-size: 85%;
+ display: block;
+ &:hover {
+ background-color: $dark-orange;
+ cursor: pointer;
+ }
+}
+
@@ -9,6 +9,7 @@ $dark-orange: #a62900;
$white: #ffffff;
$lite-purple: #410140;
$purple: #310030;
+$off-white: #e4e3e3;
body {
background-color: $lite-gray;
@@ -76,6 +77,22 @@ body {
}
input.submit:hover {
background-color: $lite-purple;
+ cursor: pointer;
+ }
+ }
+ input.submit {
+ border-radius: 5px;
+ width: auto;
+ padding: 0 10px;
+ background-color: $orange;
+ color: $white;
+ border: none;
+ font-weight: bold;
+ text-transform: uppercase;
+ font-size: 85%;
+ &:hover {
+ background-color: $dark-orange;
+ cursor: pointer;
}
}
}
@@ -122,6 +139,26 @@ a {
}
}
+.login-links {
+ font-size: 80%;
+ padding-left: 20px;
+}
+.flash-msg {
+ font-weight: bold;
+ color: $orange;
+ background-color: $off-white;
+ border: 1px solid $orange;
+ border-radius: 5px;
+ padding: 5px 10px;
+ margin: 8px 0;
+ font-size: 90%;
+ text-transform: uppercase;
+ ul {
+ list-style-type: none;
+ padding: 0px;
+ }
+}
+
.remember-left {
float: left;
width: 30px;
@@ -1,19 +1,19 @@
- if controller_name != 'sessions'
- = link_to "Sign in", new_session_path(resource_name)
+ = link_to "Go Back To Sign In", new_session_path(resource_name), :class=>'login-links'
%br/
- if devise_mapping.registerable? && controller_name != 'registrations'
- = link_to "Sign up", new_registration_path(resource_name)
+ = link_to "Sign up", new_registration_path(resource_name), :class=>'login-links'
%br/
- if devise_mapping.recoverable? && controller_name != 'passwords'
- = link_to "Forgot your password?", new_password_path(resource_name)
+ = link_to "Forgot your password?", new_password_path(resource_name), :class=>'login-links'
%br/
- if devise_mapping.confirmable? && controller_name != 'confirmations'
- = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+ = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), :class=>'login-links'
%br/
- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
- = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
+ = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), :class=>'login-links'
%br/
- if devise_mapping.omniauthable?
- resource_class.omniauth_providers.each do |provider|
- = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+ = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class=>'login-links'
%br/
@@ -3,11 +3,9 @@
= devise_error_messages!
#form
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
- .left
- = f.label :email
- = f.email_field :email
-
- .right
- %div= f.submit "Reset password", :class => 'submit'
- .clear
+ = f.label :email
+ = f.email_field :email
+ %br
+ = f.submit "Reset password", :class => 'submit'
= render "links"
+

0 comments on commit d4bd6cd

Please sign in to comment.