bug fixes & bootstrap buttons

Dmitriy Zaporozhets
1 parent b7558a20
Showing 5 changed files with 18 additions and 5 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
app/views/dashboard/index.html.haml
app/views/issues/show.html.haml
app/views/merge_requests/show.html.haml
app/views/repositories/tags.html.haml
@@ -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;
   }
@@ -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
@@ -24,7 +24,7 @@
  
 .main_box
   .top_box_content
-    %h5
+    %h4
       - if @issue.closed
         .alert-message.error.status_info Closed
       - else 
@@ -24,7 +24,7 @@
  
 .main_box
   .top_box_content
-    %h5
+    %h4
       - if @merge_request.closed
         .alert-message.error.status_info Closed
       - else 
@@ -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)
...	...	@@ -118,6 +118,19 @@ table {
118	118	&.primary {
119	119	@extend .btn-primary;
120	120	}
	121	+
	122	+ &.danger,
	123	+ &.btn-danger {
	124	+ color:#fff;
	125	+ background: #DA4E49;
	126	+ border-color: #BD362F;
	127	+
	128	+ &:hover {
	129	+ color:#fff;
	130	+ background: #EE4E49;
	131	+ }
	132	+ }
	133	+
121	134	&.danger {
122	135	@extend .btn-danger;
123	136	}
...	...
...	...	@@ -19,7 +19,7 @@
19	19	%hr
20	20	.dashboard_block
21	21	.row
22		- .span4.right
	22	+ .span3.right
23	23	%div.lborder.ipadded
24	24	%h3
25	25	= pluralize current_user.projects.count, "project", "projects"
...	...	@@ -42,7 +42,7 @@
42	42	%br
43	43	= link_to profile_path, :class => "btn" do
44	44	Your Profile »
45		- .span8.left= render "dashboard/projects_feed", :projects => @active_projects
	45	+ .span9.left= render "dashboard/projects_feed", :projects => @active_projects
46	46	- if @last_push && @last_push.valid_push?
47	47	.padded.prepend-top-20
48	48	%h5
...	...
...	...	@@ -24,7 +24,7 @@
24	24
25	25	.main_box
26	26	.top_box_content
27		- %h5
	27	+ %h4
28	28	- if @issue.closed
29	29	.alert-message.error.status_info Closed
30	30	- else
...	...
...	...	@@ -6,7 +6,7 @@
6	6	%td
7	7	%strong= link_to tag.name, project_commits_path(@project, :ref => tag.name), :class => ""
8	8	%td
9		- = link_to project_commits_path(@project, tag.commit.id) do
	9	+ = link_to project_commit_path(@project, tag.commit.id) do
10	10	%code= tag.commit.id.to_s[0..10]
11	11	= image_tag gravatar_icon(Commit.new(tag.commit).author_email), :class => "", :width => 16
12	12	= truncate(Commit.new(tag.commit).safe_message, :length => 40)
...	...