Skip to content
Snippets Groups Projects
Commit b1b10892 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files

Merge branch '28230-new-mr-spacing' into 'master' 

consistent padding on new MR panels

Closes #28230

See merge request !9568
parents e714d569 591f0e22
No related branches found
No related tags found
1 merge request!9568consistent padding on new MR panels
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 66 additions and 92 deletions
app/assets/stylesheets/framework/lists.scss
+ 0
− 38
View file @ b1b10892
@@ -229,44 +229,6 @@ ul.content-list {
}
}
 
// Table list
.table-list {
display: table;
width: 100%;
.table-list-row {
display: table-row;
}
.table-list-cell {
display: table-cell;
vertical-align: top;
padding: 10px 16px;
border-bottom: 1px solid $gray-darker;
&.avatar-cell {
width: 36px;
padding-right: 0;
img {
margin-right: 0;
}
}
}
&.table-wide {
.table-list-cell {
&:last-of-type {
padding-right: 0;
}
&:first-of-type {
padding-left: 0;
}
}
}
}
.panel > .content-list > li {
padding: $gl-padding-top $gl-padding;
}
app/assets/stylesheets/framework/panels.scss
+ 0
− 8
View file @ b1b10892
@@ -48,11 +48,3 @@
line-height: inherit;
}
}
.panel-default {
.table-list-row:last-child {
.table-list-cell {
border-bottom: 0;
}
}
}
app/assets/stylesheets/pages/commits.scss
+ 30
− 2
View file @ b1b10892
@@ -78,6 +78,7 @@
padding: 5px 10px;
background-color: $gray-light;
border-bottom: 1px solid $gray-darker;
border-top: 1px solid $gray-darker;
font-size: 14px;
 
&:first-child {
@@ -117,10 +118,37 @@
}
}
 
.commit.flex-list {
display: flex;
}
.avatar-cell {
width: 46px;
padding-left: 10px;
img {
margin-right: 0;
}
}
.commit-detail {
display: flex;
justify-content: space-between;
align-items: flex-start;
flex-grow: 1;
padding-left: 10px;
.merge-request-branches & {
flex-direction: column;
}
}
.commit-content {
padding-right: 10px;
}
.commit-actions {
@media (min-width: $screen-sm-min) {
width: 300px;
text-align: right;
font-size: 0;
}
 
app/assets/stylesheets/pages/merge_requests.scss
+ 2
− 3
View file @ b1b10892
@@ -240,8 +240,7 @@
 
.commit {
margin: 0;
padding-top: 2px;
padding-bottom: 2px;
padding: 10px 0;
list-style: none;
 
&:hover {
@@ -409,7 +408,7 @@
}
 
.panel-footer {
padding: 5px 10px;
padding: 0;
 
.btn {
min-width: auto;
app/assets/stylesheets/pages/tree.scss
+ 1
− 9
View file @ b1b10892
@@ -139,18 +139,10 @@
.blob-commit-info {
list-style: none;
background: $gray-light;
padding: 6px 0;
padding: 16px 16px 16px 6px;
border: 1px solid $border-color;
border-bottom: none;
margin: 0;
.table-list-cell {
border-bottom: none;
}
.commit-actions {
width: 260px;
}
}
 
#modal-remove-blob > .modal-dialog { width: 850px; }
app/views/projects/blob/_blob.html.haml
+ 1
− 1
View file @ b1b10892
@@ -18,7 +18,7 @@
- else
= link_to title, '#'
 
%ul.blob-commit-info.table-list.hidden-xs
%ul.blob-commit-info.hidden-xs
- blob_commit = @repository.last_commit_for_path(@commit.id, blob.path)
= render blob_commit, project: @project, ref: @ref
 
app/views/projects/commits/_commit.html.haml
+ 26
− 25
View file @ b1b10892
@@ -9,33 +9,34 @@
- cache_key.push(commit.status(ref)) if commit.status(ref)
 
= cache(cache_key, expires_in: 1.day) do
%li.commit.table-list-row.js-toggle-container{ id: "commit-#{commit.short_id}" }
%li.commit.flex-list.js-toggle-container{ id: "commit-#{commit.short_id}" }
 
.table-list-cell.avatar-cell.hidden-xs
.avatar-cell.hidden-xs
= author_avatar(commit, size: 36)
 
.table-list-cell.commit-content
= link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message item-title"
%span.commit-row-message.visible-xs-inline
·
= commit.short_id
- if commit.status(ref)
.visible-xs-inline
= render_commit_status(commit, ref: ref)
- if commit.description?
%a.text-expander.hidden-xs.js-toggle-button ...
.commit-detail
.commit-content
= link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message item-title"
%span.commit-row-message.visible-xs-inline
·
= commit.short_id
- if commit.status(ref)
.visible-xs-inline
= render_commit_status(commit, ref: ref)
- if commit.description?
%a.text-expander.hidden-xs.js-toggle-button ...
 
- if commit.description?
%pre.commit-row-description.js-toggle-content
= preserve(markdown(commit.description, pipeline: :single_line, author: commit.author))
.commiter
= commit_author_link(commit, avatar: false, size: 24)
committed
#{time_ago_with_tooltip(commit.committed_date)}
- if commit.description?
%pre.commit-row-description.js-toggle-content
= preserve(markdown(commit.description, pipeline: :single_line, author: commit.author))
.commiter
= commit_author_link(commit, avatar: false, size: 24)
committed
#{time_ago_with_tooltip(commit.committed_date)}
 
.table-list-cell.commit-actions.hidden-xs
- if commit.status(ref)
= render_commit_status(commit, ref: ref)
= clipboard_button(clipboard_text: commit.id, title: "Copy commit SHA to clipboard")
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent"
= link_to_browse_code(project, commit)
.commit-actions.flex-row.hidden-xs
- if commit.status(ref)
= render_commit_status(commit, ref: ref)
= clipboard_button(clipboard_text: commit.id, title: "Copy commit SHA to clipboard")
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent"
= link_to_browse_code(project, commit)
app/views/projects/commits/_commit_list.html.haml
+ 1
− 1
View file @ b1b10892
@@ -11,4 +11,4 @@
%li.warning-row.unstyled
#{number_with_delimiter(hidden)} additional commits have been omitted to prevent performance issues.
- else
%ul.content-list.table-list= render commits, project: @project, ref: @ref
%ul.content-list= render commits, project: @project, ref: @ref
app/views/projects/commits/_commits.html.haml
+ 1
− 1
View file @ b1b10892
@@ -4,7 +4,7 @@
- commits.chunk { |c| c.committed_date.in_time_zone.to_date }.each do |day, commits|
%li.commit-header #{day.strftime('%d %b, %Y')} #{pluralize(commits.count, 'commit')}
%li.commits-row
%ul.content-list.commit-list.table-list.table-wide
%ul.content-list.commit-list
= render commits, project: project, ref: ref
 
- if hidden > 0
app/views/projects/merge_requests/_new_compare.html.haml
+ 3
− 3
View file @ b1b10892
@@ -21,7 +21,7 @@
selected: f.object.source_project_id
.merge-request-select.dropdown
= f.hidden_field :source_branch
= dropdown_toggle f.object.source_branch || "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" }
= dropdown_toggle local_assigns.fetch(f.object.source_branch, "Select source branch"), { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" }
.dropdown-menu.dropdown-menu-selectable.dropdown-source-branch
= dropdown_title("Select source branch")
= dropdown_filter("Search branches")
@@ -30,7 +30,7 @@
branches: @merge_request.source_branches,
selected: f.object.source_branch
.panel-footer
= icon('spinner spin', class: 'js-source-loading')
.text-center= icon('spinner spin', class: 'js-source-loading')
%ul.list-unstyled.mr_source_commit
 
.col-md-6
@@ -60,7 +60,7 @@
branches: @merge_request.target_branches,
selected: f.object.target_branch
.panel-footer
= icon('spinner spin', class: "js-target-loading")
.text-center= icon('spinner spin', class: "js-target-loading")
%ul.list-unstyled.mr_target_commit
 
- if @merge_request.errors.any?
app/views/search/_results.html.haml
+ 1
− 1
View file @ b1b10892
@@ -11,7 +11,7 @@
 
.results.prepend-top-10
- if @scope == 'commits'
%ul.content-list.commit-list.table-list.table-wide
%ul.content-list.commit-list
= render partial: "search/results/commit", collection: @search_objects
- else
.search-results
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment