remove unnecessary %br/%hr and styles

Dmitriy Zaporozhets
1 parent 36fd4de8
Showing 10 changed files with 3 additions and 37 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
app/assets/stylesheets/sections/profile.scss
app/views/profiles/notifications/show.html.haml
app/views/profiles/show.html.haml
app/views/projects/compare/index.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/services/index.html.haml
app/views/projects/snippets/show.html.haml
app/views/projects/team_members/_form.html.haml
app/views/snippets/show.html.haml
@@ -17,9 +17,6 @@
   &.s24 { width: 24px; height: 24px; margin-right: 8px; }
   &.s26 { width: 26px; height: 26px; margin-right: 8px; }
   &.s32 { width: 32px; height: 32px; margin-right: 10px; }
+  &.s60 { width: 60px; height: 60px; margin-right: 12px; }
   &.s90 { width: 90px; height: 90px; margin-right: 15px; }
 }
-
-
-img.lil_av { padding-left: 4px; padding-right: 3px; }
-img.small { width: 80px; }
-.profile_history {
-  .event_feed {
-    min-height: 20px;
-    .avatar {
-      width: 20px;
-    }
-  }
-}
-
-.profile_avatar_holder {
-  float: left;
-  width: 60px;
-  height: 60px;
-  margin-right: 20px;
-  img {
-    width: 60px;
-    height: 60px;
-    background: #fff;
-    padding: 1px;
-    border: 1px solid #ddd;
-  }
-}
-
 .save-status-fixed {
   position: fixed;
   left: 20px;
 %h3.page-title Setup your notification level
  
-%br
-
 %p.light
   %strong Disabled
   &ndash; You will not get any notifications via email
-.profile_avatar_holder
-  = image_tag gravatar_icon(@user.email, 90), alt: ''
+= image_tag gravatar_icon(@user.email, 60), alt: '', class: 'avatar s60'
 %h3.page-title
   = @user.name
   %br
@@ -2,6 +2,5 @@
  
 %h3.page-title
   Compare View
-%hr
  
 = render "form"
@@ -2,7 +2,6 @@
  
 %h3.page-title
   Compare View
-%hr
  
 = render "form"
  
 %h3.page-title Services
-%br
  
 %ul.bordered-list
   - @services.each do |service|
@@ -8,6 +8,5 @@
       by
       = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
       = @snippet.author_name
-%br
 %div= render 'projects/snippets/blob'
 %div#notes= render "projects/notes/notes_with_form"
 %h3.page-title
   = "New Team member(s)"
-%hr
+
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
   -if @user_project_relation.errors.any?
     .alert.alert-error
@@ -12,5 +12,4 @@
       by
       = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
       = @snippet.author_name
-%br
 %div= render 'blob'
...	...	@@ -17,9 +17,6 @@
17	17	&.s24 { width: 24px; height: 24px; margin-right: 8px; }
18	18	&.s26 { width: 26px; height: 26px; margin-right: 8px; }
19	19	&.s32 { width: 32px; height: 32px; margin-right: 10px; }
	20	+ &.s60 { width: 60px; height: 60px; margin-right: 12px; }
20	21	&.s90 { width: 90px; height: 90px; margin-right: 15px; }
21	22	}
22		-
23		-
24		-img.lil_av { padding-left: 4px; padding-right: 3px; }
25		-img.small { width: 80px; }
...	...
1		-.profile_history {
2		- .event_feed {
3		- min-height: 20px;
4		- .avatar {
5		- width: 20px;
6		- }
7		- }
8		-}
9		-
10		-.profile_avatar_holder {
11		- float: left;
12		- width: 60px;
13		- height: 60px;
14		- margin-right: 20px;
15		- img {
16		- width: 60px;
17		- height: 60px;
18		- background: #fff;
19		- padding: 1px;
20		- border: 1px solid #ddd;
21		- }
22		-}
23		-
24	1	.save-status-fixed {
25	2	position: fixed;
26	3	left: 20px;
...	...
1	1	%h3.page-title Setup your notification level
2	2
3		-%br
4		-
5	3	%p.light
6	4	%strong Disabled
7	5	– You will not get any notifications via email
...	...
1		-.profile_avatar_holder
2		- = image_tag gravatar_icon(@user.email, 90), alt: ''
	1	+= image_tag gravatar_icon(@user.email, 60), alt: '', class: 'avatar s60'
3	2	%h3.page-title
4	3	= @user.name
5	4	%br
...	...
...	...	@@ -2,6 +2,5 @@
2	2
3	3	%h3.page-title
4	4	Compare View
5		-%hr
6	5
7	6	= render "form"
...	...
...	...	@@ -2,7 +2,6 @@
2	2
3	3	%h3.page-title
4	4	Compare View
5		-%hr
6	5
7	6	= render "form"
8	7
...	...
1	1	%h3.page-title Services
2		-%br
3	2
4	3	%ul.bordered-list
5	4	- @services.each do \|service\|
...	...
...	...	@@ -8,6 +8,5 @@
8	8	by
9	9	= image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
10	10	= @snippet.author_name
11		-%br
12	11	%div= render 'projects/snippets/blob'
13	12	%div#notes= render "projects/notes/notes_with_form"
...	...
1	1	%h3.page-title
2	2	= "New Team member(s)"
3		-%hr
	3	+
4	4	= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do \|f\|
5	5	-if @user_project_relation.errors.any?
6	6	.alert.alert-error
...	...
...	...	@@ -12,5 +12,4 @@
12	12	by
13	13	= image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
14	14	= @snippet.author_name
15		-%br
16	15	%div= render 'blob'
...	...