diff --git a/app/views/keys/_form.html.haml b/app/views/keys/_form.html.haml
index a49164cf3786e2a510d2116e2e616a3820b061d9..1cc7e336b5ff3d66838362e3c52f92f6d8b8c01e 100644
--- a/app/views/keys/_form.html.haml
+++ b/app/views/keys/_form.html.haml
@@ -12,5 +12,5 @@
= f.label :key
= f.text_area :key, :style => "width:300px; height:130px"
.form-row
- = f.submit 'Save', :class => "lbutton vm"
+ = f.submit 'Save', :class => "grey-button"
diff --git a/app/views/keys/_show.html.haml b/app/views/keys/_show.html.haml
index a4e236256d3118616e6aaa07ffecf3328fa11d56..fb3599896af59c297fa2963d6a3d1dee87d8cf7d 100644
--- a/app/views/keys/_show.html.haml
+++ b/app/views/keys/_show.html.haml
@@ -1,4 +1,4 @@
%tr
%td= truncate key.title, :lenght => 12
%td= truncate key.key, :lenght => 1114
- %td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "lbutton negative delete-key", :id => "destroy_key_#{key.id}", :remote => true
+ %td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "grey-button negative delete-key", :id => "destroy_key_#{key.id}", :remote => true
diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml
index 279b125f53c68e7680500f38f543dedfec85017d..8c43ce9b2a53f95c930e41844ce104bcd4e8ff3f 100644
--- a/app/views/keys/index.html.haml
+++ b/app/views/keys/index.html.haml
@@ -1,5 +1,6 @@
%div#new-key-holder
- = link_to "Add new", new_key_path, :remote => true, :class => "lbutton vm"
+ = link_to "Add new", new_key_path, :remote => true, :class => "grey-button"
+%br
%table.round-borders#keys-table
%tr
diff --git a/app/views/profile/password.html.haml b/app/views/profile/password.html.haml
index 41e6df5cb50c1003e2c8db13fecc75f5b71d92f7..18bae4b6af08da896f1afca07d31abea9b523be5 100644
--- a/app/views/profile/password.html.haml
+++ b/app/views/profile/password.html.haml
@@ -16,7 +16,7 @@
%br
= f.password_field :password_confirmation
.actions
- = f.submit 'Save', :class => "lbutton vm"
+ = f.submit 'Save', :class => "grey-button"
%br
%br
@@ -30,4 +30,4 @@
%em.cred
keep it in secret!
.actions
- = f.submit 'Reset', :confirm => "Are you sure?", :class => "lbutton vm"
+ = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml
index bf45f4400a47973485e026ded0ade9e3d42ed9f5..375883fe75bfec8147d22e94733b38651b485532 100644
--- a/app/views/profile/show.html.haml
+++ b/app/views/profile/show.html.haml
@@ -1,13 +1,8 @@
-.span-2
- = image_tag gravatar_icon(@user.email), :class => "left", :width => 60, :style => "padding-right:5px;"
-%p
- %b Name:
+%h2.icon
+ %span>
= @user.name
-%p
- %b Email:
- = @user.email
-%br
+.clear
= form_for @user, :url => profile_edit_path, :method => :put do |f|
-if @user.errors.any?
@@ -16,6 +11,14 @@
- @user.errors.full_messages.each do |msg|
%li= msg
+ .form-row
+ = f.label :name
+ %br
+ = f.text_field :name
+ .form-row
+ = f.label :email
+ %br
+ = f.text_field :email
.form-row
= f.label :skype
%br
@@ -29,5 +32,5 @@
%br
= f.text_field :twitter
.actions
- = f.submit 'Save', :class => "lbutton vm"
+ = f.submit 'Save', :class => "grey-button"
diff --git a/spec/requests/profile_spec.rb b/spec/requests/profile_spec.rb
index 5d2c01d10630962ecb1d98652ea17a223ce5437e..ea88a651f8ffe190b75defa77acd7365fbece6b7 100644
--- a/spec/requests/profile_spec.rb
+++ b/spec/requests/profile_spec.rb
@@ -11,7 +11,6 @@ describe "Profile" do
end
it { page.should have_content(@user.name) }
- it { page.should have_content(@user.email) }
end
describe "Profile update" do