restyled user profile

gitlabhq
1 parent 3f0d8079
Showing 6 changed files with 18 additions and 15 deletions Show diff stats
app/views/keys/_form.html.haml
app/views/keys/_show.html.haml
app/views/keys/index.html.haml
app/views/profile/password.html.haml
app/views/profile/show.html.haml
spec/requests/profile_spec.rb
@@ -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"
  
 %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
 %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
@@ -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"
-.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?
@@ -17,6 +12,14 @@
           %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
     = f.text_field :skype
@@ -29,5 +32,5 @@
     %br
     = f.text_field :twitter
   .actions
-    = f.submit 'Save', :class => "lbutton vm"
+    = f.submit 'Save', :class => "grey-button"
  
@@ -11,7 +11,6 @@ describe &quot;Profile&quot; do
     end
  
     it { page.should have_content(@user.name) }
-    it { page.should have_content(@user.email) }
   end
  
   describe "Profile update" do
...	...	@@ -12,5 +12,5 @@
12	12	= f.label :key
13	13	= f.text_area :key, :style => "width:300px; height:130px"
14	14	.form-row
15		- = f.submit 'Save', :class => "lbutton vm"
	15	+ = f.submit 'Save', :class => "grey-button"
16	16
...	...
1	1	%tr
2	2	%td= truncate key.title, :lenght => 12
3	3	%td= truncate key.key, :lenght => 1114
4		- %td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "lbutton negative delete-key", :id => "destroy_key_#{key.id}", :remote => true
	4	+ %td= link_to 'Cancel', key, :confirm => 'Are you sure?', :method => :delete, :class => "grey-button negative delete-key", :id => "destroy_key_#{key.id}", :remote => true
...	...
1	1	%div#new-key-holder
2		- = link_to "Add new", new_key_path, :remote => true, :class => "lbutton vm"
	2	+ = link_to "Add new", new_key_path, :remote => true, :class => "grey-button"
	3	+%br
3	4
4	5	%table.round-borders#keys-table
5	6	%tr
...	...
...	...	@@ -16,7 +16,7 @@
16	16	%br
17	17	= f.password_field :password_confirmation
18	18	.actions
19		- = f.submit 'Save', :class => "lbutton vm"
	19	+ = f.submit 'Save', :class => "grey-button"
20	20
21	21	%br
22	22	%br
...	...	@@ -30,4 +30,4 @@
30	30	%em.cred
31	31	keep it in secret!
32	32	.actions
33		- = f.submit 'Reset', :confirm => "Are you sure?", :class => "lbutton vm"
	33	+ = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
...	...
1		-.span-2
2		- = image_tag gravatar_icon(@user.email), :class => "left", :width => 60, :style => "padding-right:5px;"
3		-%p
4		- %b Name:
	1	+%h2.icon
	2	+ %span>
5	3	= @user.name
6		-%p
7		- %b Email:
8		- = @user.email
9	4
10		-%br
	5	+.clear
11	6
12	7	= form_for @user, :url => profile_edit_path, :method => :put do \|f\|
13	8	-if @user.errors.any?
...	...	@@ -17,6 +12,14 @@
17	12	%li= msg
18	13
19	14	.form-row
	15	+ = f.label :name
	16	+ %br
	17	+ = f.text_field :name
	18	+ .form-row
	19	+ = f.label :email
	20	+ %br
	21	+ = f.text_field :email
	22	+ .form-row
20	23	= f.label :skype
21	24	%br
22	25	= f.text_field :skype
...	...	@@ -29,5 +32,5 @@
29	32	%br
30	33	= f.text_field :twitter
31	34	.actions
32		- = f.submit 'Save', :class => "lbutton vm"
	35	+ = f.submit 'Save', :class => "grey-button"
33	36
...	...
...	...	@@ -11,7 +11,6 @@ describe "Profile" do
11	11	end
12	12
13	13	it { page.should have_content(@user.name) }
14		- it { page.should have_content(@user.email) }
15	14	end
16	15
17	16	describe "Profile update" do
...	...