diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 1e5ee51eee30c97f5bad0bed2c5b29497f9b6128..85672ab9ade72aedf77e98e7bb843c7249e585ef 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 8985d5c693551f89585ce85f838baca501d43e2f..882bb58c547bb86ba7fbd91bc4bc2d5275adec0f 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 14d49305a541ddc3226f22238cee8db87fe641a7..266b111c26191fde432625f8263b81bfdc8d2e10 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 95274f4241eb007c206d05777726b651d3f99f63..8402a66ed196386190bef3bfaacff1b8d815318d 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 7e1442d9b9d8e0d79f5728b2d1c1b49c2ed24928..92883892228a636742f7a6d95a726399a6851fb8 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)