deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bug fixes & bootstrap buttons

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-11 23:32:45 +03:00
parent b7558a2063
commit e7add858cf
5 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/gitlab_bootstrap.scss
View file

@ -118,6 +118,19 @@ table {
&.primary { &.primary {
@extend .btn-primary; @extend .btn-primary;
} }
&.danger,
&.btn-danger {
color:#fff;
background: #DA4E49;
border-color: #BD362F;
&:hover {
color:#fff;
background: #EE4E49;
}
}
&.danger { &.danger {
@extend .btn-danger; @extend .btn-danger;
} }

4
app/views/dashboard/index.html.haml
View file

@ -19,7 +19,7 @@
%hr %hr
.dashboard_block .dashboard_block
.row .row
.span4.right .span3.right
%div.lborder.ipadded %div.lborder.ipadded
%h3 %h3
= pluralize current_user.projects.count, "project", "projects" = pluralize current_user.projects.count, "project", "projects"
@ -42,7 +42,7 @@
%br %br
= link_to profile_path, :class => "btn" do = link_to profile_path, :class => "btn" do
Your Profile » 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? - if @last_push && @last_push.valid_push?
.padded.prepend-top-20 .padded.prepend-top-20
%h5 %h5

2
app/views/issues/show.html.haml
View file

@ -24,7 +24,7 @@
.main_box .main_box
.top_box_content .top_box_content
%h5 %h4
- if @issue.closed - if @issue.closed
.alert-message.error.status_info Closed .alert-message.error.status_info Closed
- else - else

2
app/views/merge_requests/show.html.haml
View file

@ -24,7 +24,7 @@
.main_box .main_box
.top_box_content .top_box_content
%h5 %h4
- if @merge_request.closed - if @merge_request.closed
.alert-message.error.status_info Closed .alert-message.error.status_info Closed
- else - else

2
app/views/repositories/tags.html.haml
View file

@ -6,7 +6,7 @@
%td %td
%strong= link_to tag.name, project_commits_path(@project, :ref => tag.name), :class => "" %strong= link_to tag.name, project_commits_path(@project, :ref => tag.name), :class => ""
%td %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] %code= tag.commit.id.to_s[0..10]
= image_tag gravatar_icon(Commit.new(tag.commit).author_email), :class => "", :width => 16 = image_tag gravatar_icon(Commit.new(tag.commit).author_email), :class => "", :width => 16
= truncate(Commit.new(tag.commit).safe_message, :length => 40) = truncate(Commit.new(tag.commit).safe_message, :length => 40)