From bea14d6c28b225980b64e7fd9d92ef50756cfd36 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 13 Jul 2013 09:05:28 +0300
Subject: [PATCH] remove unnecessary %br/%hr and styles

---
 .../stylesheets/gitlab_bootstrap/avatar.scss  |  5 +---
 app/assets/stylesheets/sections/profile.scss  | 23 -------------------
 .../profiles/notifications/show.html.haml     |  2 --
 app/views/profiles/show.html.haml             |  3 +--
 app/views/projects/compare/index.html.haml    |  1 -
 app/views/projects/compare/show.html.haml     |  1 -
 app/views/projects/services/index.html.haml   |  1 -
 app/views/projects/snippets/show.html.haml    |  1 -
 .../projects/team_members/_form.html.haml     |  2 +-
 app/views/snippets/show.html.haml             |  1 -
 10 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
index 0b147faf59e..c23970c13eb 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
@@ -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; }
diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss
index c34cd23a9c9..06a4046f916 100644
--- a/app/assets/stylesheets/sections/profile.scss
+++ b/app/assets/stylesheets/sections/profile.scss
@@ -1,26 +1,3 @@
-.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;
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index c69955ae309..43b1cf6f8df 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -1,7 +1,5 @@
 %h3.page-title Setup your notification level
 
-%br
-
 %p.light
   %strong Disabled
   &ndash; You will not get any notifications via email
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 3eaa54a299c..dd1186fd37c 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,5 +1,4 @@
-.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
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 9d491e72a5b..8f108ed0b08 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -2,6 +2,5 @@
 
 %h3.page-title
   Compare View
-%hr
 
 = render "form"
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 24be291bde2..2e75f8441e3 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -2,7 +2,6 @@
 
 %h3.page-title
   Compare View
-%hr
 
 = render "form"
 
diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml
index 2aa2a069943..80d17880f2e 100644
--- a/app/views/projects/services/index.html.haml
+++ b/app/views/projects/services/index.html.haml
@@ -1,5 +1,4 @@
 %h3.page-title Services
-%br
 
 %ul.bordered-list
   - @services.each do |service|
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index d5b334c9e90..564c2e8b72c 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -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"
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index 2c6d9d892d0..0eb106ee93f 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -1,6 +1,6 @@
 %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
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index fd837624dc9..b112511a880 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -12,5 +12,4 @@
       by
       = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
       = @snippet.author_name
-%br
 %div= render 'blob'