Skip to content
Snippets Groups Projects
Commit 3ad1d320 authored by Douwe Maan's avatar Douwe Maan
Browse files

Remove duplicated styling for center top menus

parent 0159d78a
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -108,16 +108,3 @@
z-index: 2;
}
}
.commit-ci-menu {
padding: 0;
margin: 0;
list-style: none;
margin-top: 5px;
height: 56px;
margin: -16px;
padding: 16px;
text-align: center;
margin-top: 0px;
margin-bottom: 2px;
}
Loading
Loading
@@ -4,7 +4,6 @@
*/
.mr-state-widget {
background: #F7F8FA;
margin-bottom: 20px;
color: $gl-gray;
border: 1px solid #dce0e6;
@include border-radius(2px);
Loading
Loading
@@ -116,26 +115,8 @@
}
}
 
.merge-request .merge-request-tabs {
@include nav-menu;
margin: -$gl-padding;
padding: $gl-padding;
text-align: center;
margin-bottom: 1px;
}
// Mobile
@media (max-width: 480px) {
.merge-request .merge-request-tabs {
margin: 0;
padding: 0;
li {
a {
padding: 0;
}
}
}
.merge-request-details {
margin-bottom: $gl-padding;
}
 
.mr_source_commit,
Loading
Loading
%ul.center-top-menu.commit-ci-menu
%ul.center-top-menu.no-top.no-bottom.commit-ci-menu
= nav_link(path: 'commit#show') do
= link_to namespace_project_commit_path(@project.namespace, @project, @commit.id) do
Changes
Loading
Loading
Loading
Loading
@@ -3,7 +3,7 @@
 
- diff_files = safe_diff_files(diffs)
 
.gray-content-block.second-block.oneline-block
.gray-content-block.middle-block.oneline-block
.inline-parallel-buttons
.btn-group
= inline_diff_btn
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@
 
= render 'shared/show_aside'
 
.gray-content-block.second-block.oneline-block
.gray-content-block.middle-block.oneline-block
.row
.col-md-9
.votes-holder.pull-right
Loading
Loading
Loading
Loading
@@ -19,7 +19,7 @@
= f.hidden_field :target_branch
 
.mr-compare.merge-request
%ul.merge-request-tabs
%ul.merge-request-tabs.center-top-menu.no-top.no-bottom
%li.commits-tab
= link_to url_for(params), data: {target: '#commits', action: 'commits', toggle: 'tab'} do
Commits
Loading
Loading
@@ -31,7 +31,7 @@
 
.tab-content
#commits.commits.tab-pane
= render "projects/commits/commits", project: @project
= render "projects/merge_requests/show/commits"
#diffs.diffs.tab-pane.active
- if @diffs.present?
= render "projects/diffs/diffs", diffs: @diffs, project: @project
Loading
Loading
@@ -57,4 +57,3 @@
diffs_loaded: true,
commits_loaded: true
});
Loading
Loading
@@ -40,7 +40,7 @@
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
 
- if @commits.present?
%ul.merge-request-tabs
%ul.merge-request-tabs.center-top-menu.no-top.no-bottom
%li.notes-tab
= link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#notes', action: 'notes', toggle: 'tab'} do
Discussion
Loading
Loading
.gray-content-block.second-block.oneline-block
.gray-content-block.middle-block.oneline-block
= icon("sort-amount-desc")
Most recent commits displayed first
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment