From 338e40a94136b3fe2b2515bf65acbd242d7c12bf Mon Sep 17 00:00:00 2001 From: Michael Parenteau Date: Fri, 13 Aug 2010 12:52:39 -0400 Subject: [PATCH] adding the user and right-arrow icons, fixing some button styles in some forms --- app/views/apps/new.html.haml | 2 +- app/views/devise/passwords/edit.html.haml | 2 +- app/views/devise/passwords/new.html.haml | 2 +- app/views/devise/sessions/new.html.haml | 3 ++- public/stylesheets/application.css | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- public/stylesheets/images/icons/right-arrow.png | Bin 0 -> 1134 bytes public/stylesheets/images/icons/user.png | Bin 0 -> 877 bytes 7 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 public/stylesheets/images/icons/right-arrow.png create mode 100644 public/stylesheets/images/icons/user.png diff --git a/app/views/apps/new.html.haml b/app/views/apps/new.html.haml index 1044b73..3bb731a 100644 --- a/app/views/apps/new.html.haml +++ b/app/views/apps/new.html.haml @@ -5,4 +5,4 @@ = render 'fields', :f => f - %div= f.submit 'Add' \ No newline at end of file + %div.add_app= f.submit 'Add' \ No newline at end of file diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml index 4bb32e4..557e910 100644 --- a/app/views/devise/passwords/edit.html.haml +++ b/app/views/devise/passwords/edit.html.haml @@ -9,4 +9,4 @@ .required = f.label :password_confirmation, 'One more time' = f.password_field :password_confirmation - %div= f.submit "Change my password" \ No newline at end of file + %div.change_password= f.submit "Change my password" \ No newline at end of file diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index 8e22f03..2ea9284 100644 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -5,4 +5,4 @@ = f.label :email = f.text_field :email - %div= f.submit "Send me reset password instructions" \ No newline at end of file + %div.send_password= f.submit "Send me reset password instructions" \ No newline at end of file diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 2dbaf77..b644bfc 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -14,4 +14,5 @@ = f.check_box :remember_me, :tabindex => 3 = f.label :remember_me - %div= f.submit "Sign in" \ No newline at end of file + %div.sign_in + %button{:type => 'submit'}= "Sign in" \ No newline at end of file diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 8792c0f..e8351b7 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -18,7 +18,7 @@ body { /* Headings */ h1, h2, h3, h4, h5, h6 { padding: 0.2em 0; margin-bottom: 1em; border-bottom: 1px solid #E2E2E2;} -h1 { font-size: 2.0em; line-height: 1.2em; } +h1 { font-size: 2.0em; line-height: 1.2em; text-shadow: 1px 1px 0px #FFF; -webkit-text-shadow: 1px 1px 0px #FFF;} h2 { font-size: 1.7em; line-height: 1.2em; } h3 { font-size: 1.5em; line-height: 1.2em; } h4 { font-size: 1.3em; line-height: 1.2em; } @@ -115,6 +115,7 @@ a.action { float: right; font-size: 0.9em;} #nav-bar li a:hover { color: #666;} #nav-bar li.apps a { background-image: url(images/icons/briefcase.png); } #nav-bar li.errs a { background-image: url(images/icons/error.png); } +#nav-bar li.users a { background-image: url(images/icons/user.png); } #nav-bar li:hover { box-shadow: 0 0 3px #69c; -moz-box-shadow: 0 0 3px #69c; @@ -252,6 +253,52 @@ form input[type=submit] { font-size: 1.2em; line-height: 1em; text-transform: uppercase; border: none; color: #FFF; background-color: #387fc1; } +form div.send_password input[type=submit], +form div.change_password input[type=submit], +form div.add_app input[type=submit], +input#user_submit[type=submit] { + color: #666; + display: block; + padding: 0 20px 0 20px; + font-size: 12px; font-weight: bold; line-height: 30px; text-decoration: none; + text-shadow: 1px 1px 0px #FFF; + -webkit-text-shadow: 1px 1px 0px #FFF; + background: transparent no-repeat; + border: none; +} +form div.sign_in, +form div.send_password, +form div.change_password, +form div.add_app, +input#user_submit[type=submit] { + color: #666; + background: #FFF url(images/button-bg.png) 0 bottom repeat-x; + border-radius: 50px; + -moz-border-radius: 50px; + -webkit-border-radius: 50px; + border: 1px solid #bbb; + display: inline-block; +} +form div.sign_in:hover, +form div.send_password:hover, +form div.change_password:hover, +form div.add_app:hover, +input#user_submit[type=submit]:hover { + color: #666; + box-shadow: 0 0 3px #69c; + -moz-box-shadow: 0 0 3px #69c; + -webkit-box-shadow: 0 0 3px #69c; +} +form div.sign_in button { + color: #666; + display: block; + padding: 0 20px 0 40px; + font-size: 14px; font-weight: bold; line-height: 39px; text-decoration: none; + text-shadow: 1px 1px 0px #FFF; + -webkit-text-shadow: 1px 1px 0px #FFF; + background: transparent url(images/icons/right-arrow.png) 5px 5px no-repeat; + border: none; +} form > div > span { display: block; margin-top: 0.5em; font-size: 0.85em; diff --git a/public/stylesheets/images/icons/right-arrow.png b/public/stylesheets/images/icons/right-arrow.png new file mode 100644 index 0000000..5704de2 Binary files /dev/null and b/public/stylesheets/images/icons/right-arrow.png differ diff --git a/public/stylesheets/images/icons/user.png b/public/stylesheets/images/icons/user.png new file mode 100644 index 0000000..c4334a9 Binary files /dev/null and b/public/stylesheets/images/icons/user.png differ -- libgit2 0.21.2