From e7add858cf99d11aa6f93cc42c6d00628ca5538c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 11 Apr 2012 23:32:45 +0300
Subject: [PATCH] bug fixes & bootstrap buttons

---
 app/assets/stylesheets/gitlab_bootstrap.scss | 13 +++++++++++++
 app/views/dashboard/index.html.haml          |  4 ++--
 app/views/issues/show.html.haml              |  2 +-
 app/views/merge_requests/show.html.haml      |  2 +-
 app/views/repositories/tags.html.haml        |  2 +-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index 1e5ee51e..85672ab9 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -118,6 +118,19 @@ table {
   &.primary { 
     @extend .btn-primary;
   }
+
+  &.danger,
+  &.btn-danger { 
+    color:#fff;
+    background: #DA4E49;
+    border-color: #BD362F;
+
+    &:hover { 
+      color:#fff;
+      background: #EE4E49;
+    }
+  }
+
   &.danger { 
     @extend .btn-danger;
   }
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index 8985d5c6..882bb58c 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -19,7 +19,7 @@
   %hr
   .dashboard_block
     .row
-      .span4.right
+      .span3.right
         %div.lborder.ipadded
           %h3
             = pluralize current_user.projects.count, "project", "projects"
@@ -42,7 +42,7 @@
                 %br
                 = link_to profile_path, :class => "btn" do 
                   Your Profile » 
-      .span8.left= render "dashboard/projects_feed", :projects => @active_projects
+      .span9.left= render "dashboard/projects_feed", :projects => @active_projects
     - if @last_push && @last_push.valid_push?
       .padded.prepend-top-20
         %h5
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 14d49305..266b111c 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -24,7 +24,7 @@
 
 .main_box
   .top_box_content
-    %h5
+    %h4
       - if @issue.closed
         .alert-message.error.status_info Closed
       - else 
diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml
index 95274f42..8402a66e 100644
--- a/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@@ -24,7 +24,7 @@
 
 .main_box
   .top_box_content
-    %h5
+    %h4
       - if @merge_request.closed
         .alert-message.error.status_info Closed
       - else 
diff --git a/app/views/repositories/tags.html.haml b/app/views/repositories/tags.html.haml
index 7e1442d9..92883892 100644
--- a/app/views/repositories/tags.html.haml
+++ b/app/views/repositories/tags.html.haml
@@ -6,7 +6,7 @@
         %td
           %strong= link_to tag.name, project_commits_path(@project, :ref => tag.name), :class => ""
         %td
-          = link_to project_commits_path(@project, tag.commit.id) do
+          = link_to project_commit_path(@project, tag.commit.id) do
             %code= tag.commit.id.to_s[0..10]
           = image_tag gravatar_icon(Commit.new(tag.commit).author_email), :class => "", :width => 16
           = truncate(Commit.new(tag.commit).safe_message, :length => 40)