summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-26 22:06:40 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-26 22:06:40 +0200
commit065c200c33f68c2bb781e35a43f9dc8138a893b5 (patch)
treee945cf0fedee2bbbb14c35f6f12410415a8b9b10
parent1e8b111be85df0db6c8000ef9a710bc0221eae83 (diff)
downloadgitlab-ce-065c200c33f68c2bb781e35a43f9dc8138a893b5.tar.gz
removed unnecessary hr tags & titles
-rw-r--r--app/assets/stylesheets/common.scss2
-rw-r--r--app/views/commits/_head.html.haml6
-rw-r--r--app/views/commits/index.html.haml7
-rw-r--r--app/views/issues/index.html.haml2
-rw-r--r--app/views/merge_requests/index.html.haml2
-rw-r--r--app/views/notes/_form.html.haml2
-rw-r--r--app/views/projects/graph.html.haml2
-rw-r--r--app/views/projects/show.html.haml2
8 files changed, 12 insertions, 13 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 2ae0217abf7..1f78c6be55c 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -42,7 +42,7 @@ a {
float:left;
}
.right {
- float:right;
+ float:right !important;
}
.width-50p{
width:50%;
diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml
index a8648ccf61c..6d541bbdd15 100644
--- a/app/views/commits/_head.html.haml
+++ b/app/views/commits/_head.html.haml
@@ -21,6 +21,12 @@
%span.number= @project.repo.tags.count
+ - if current_page?(project_commits_path(@project)) && current_user.private_token
+ %li.right
+ %span
+ = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :class => "btn" do
+ feed
+ = image_tag "Rss-UI.PNG", :width => 14, :title => "feed"
:javascript
diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml
index 048ee733cb5..6cc6ba5fdeb 100644
--- a/app/views/commits/index.html.haml
+++ b/app/views/commits/index.html.haml
@@ -1,11 +1,4 @@
= render "head"
-%h3
- Commits
- - if current_user.private_token
- %span.rss-icon
- = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }) do
- = image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
-%hr
- if params[:path]
%ul.breadcrumb
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 7a8f4873b79..297eab259be 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -8,7 +8,7 @@
- if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do
New Issue
- %hr
+ %br
%div#issues-table-holder.ui-box
.title
.row
diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml
index 3a23d67321f..9ced7a86938 100644
--- a/app/views/merge_requests/index.html.haml
+++ b/app/views/merge_requests/index.html.haml
@@ -4,7 +4,7 @@
= link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
New Merge Request
-%hr
+%br
.ui-box
.title
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 4ba75550bac..0d20bb15835 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -21,7 +21,7 @@
= label_tag :notify_author do
= check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
%span Commit author
- .span4.right
+ .span4
%h5 Attachment:
.clearfix
= f.label :attachment, "Any file, < 10 MB"
diff --git a/app/views/projects/graph.html.haml b/app/views/projects/graph.html.haml
index 7f001c6333e..394a11fdc47 100644
--- a/app/views/projects/graph.html.haml
+++ b/app/views/projects/graph.html.haml
@@ -1,5 +1,5 @@
%h3 Network Graph
-%hr
+%br
#holder.graph.well
:javascript
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 04ffa53b68e..5fbed303da8 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -6,7 +6,7 @@
.back_link
= link_to projects_path do
&larr; To projects list
-%hr
+%br
.alert-message.block-message.warning
.input
.input-prepend