kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2022-01-03 15:15:38 +00:00
parent 631e759c19
commit afe9c6fd0f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/repository/index.js
View File

@ -163,7 +163,7 @@ export default function setupVueRepositoryList() {
}`,
// Ideally passing this class to `props` should work
// But it doesn't work here. :(
class: 'btn btn-default btn-md gl-button ml-sm-0',
class: 'btn btn-default btn-md gl-button',
},
},
[__('History')],

7
app/assets/stylesheets/utilities.scss
View File

@ -58,6 +58,13 @@
}
}
.gl-first-child-ml-sm-0 > a:first-child,
.gl-first-child-ml-sm-0 > button:first-child {
@include media-breakpoint-up(sm) {
@include gl-ml-0;
}
}
.mh-50vh { max-height: 50vh; }
.min-width-0 {

2
app/views/projects/tree/_tree_header.html.haml
View File

@ -6,7 +6,7 @@
#js-blob-controls
.tree-controls
.d-block.d-sm-flex.flex-wrap.align-items-start.gl-children-ml-sm-3<
.d-block.d-sm-flex.flex-wrap.align-items-start.gl-children-ml-sm-3.gl-first-child-ml-sm-0<
= render_if_exists 'projects/tree/lock_link'
#js-tree-history-link{ data: { history_link: project_commits_path(@project, @ref) } }