Download as
Browse Code »

Commit bea14d6c28b225980b64e7fd9d92ef50756cfd36

Authored by Dmitriy Zaporozhets
1 parent 36fd4de8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

remove unnecessary %br/%hr and styles

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