diff options
| -rw-r--r-- | app/assets/stylesheets/sections/graph.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/projects.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/network/_head.html.haml | 1 | ||||
| -rw-r--r-- | app/views/public/projects/index.html.haml | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/sections/graph.scss b/app/assets/stylesheets/sections/graph.scss index dd5d638b721..cdf3a23c608 100644 --- a/app/assets/stylesheets/sections/graph.scss +++ b/app/assets/stylesheets/sections/graph.scss @@ -4,7 +4,8 @@ h4 { - padding: 0 10px; + margin: 0; + padding: 10px; border-bottom: 1px solid #bbb; @include bg-gray-gradient; } diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index 3430e7cdbc3..e4df01324bf 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -86,7 +86,7 @@ ul.nav.nav-projects-tabs { border-bottom: 1px solid #eee; .description { - margin-left: 22px; + margin-left: 15px; color: #aaa; } } diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 0750057c762..01378d99c99 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -14,7 +14,7 @@ %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge" for instructions .accept_group - = f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request" + = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" - unless @project.root_ref? @merge_request.source_branch .remove_branch_holder = label_tag :should_remove_source_branch, class: "checkbox" do diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml index e75b85c7ade..d59e82406fd 100644 --- a/app/views/projects/network/_head.html.haml +++ b/app/views/projects/network/_head.html.haml @@ -1,5 +1,4 @@ %h3.page-title Project Network Graph -%hr .clearfix .pull-left diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml index 69d86e18f3f..4bc67d8c6ae 100644 --- a/app/views/public/projects/index.html.haml +++ b/app/views/public/projects/index.html.haml @@ -17,7 +17,7 @@ %ul.unstyled - @projects.each do |project| %li.clearfix - %h5 + %div %i.icon-share - if current_user = link_to_project project @@ -25,7 +25,7 @@ = project.name_with_namespace .pull-right %pre.dark.tiny git clone #{project.http_url_to_repo} - %p.description + %div.description = project.description - unless @projects.present? %h3.nothing_here_message No public projects |