Merge branch 'issue-19467' into 'master'
Style of import project buttons were fixed in the new project page. ## What does this MR do? I have fixed style of import project buttons in the new project page. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Because the buttons area hasn't looked well. Before this, it was scattered. ## What are the relevant issue numbers? Fixes #19467 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_17.12.11](/uploads/35918f16b1b4d671ad33faf6caf530a2/Screen_Shot_2016-07-11_at_17.12.11.png) ![Screen_Shot_2016-07-11_at_17.11.24](/uploads/3030e1ecb7d109fbf4552987b4bfb242/Screen_Shot_2016-07-11_at_17.11.24.png) ![Screen_Shot_2016-07-11_at_17.11.50](/uploads/eb8ede86c256a2356b0210f3876c0143/Screen_Shot_2016-07-11_at_17.11.50.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5183
This commit is contained in:
commit
238f7c6709
2 changed files with 13 additions and 5 deletions
|
@ -75,6 +75,7 @@ v 8.10.0 (unreleased)
|
|||
- Add min value for project limit field on user's form !3622 (jastkand)
|
||||
- Add reminder to not paste private SSH keys !4399 (Ingo Blechschmidt)
|
||||
- Remove duplicate `description` field in `MergeRequest` entities (Ben Boeckel)
|
||||
- Style of import project buttons were fixed in the new project page. !5183 (rdemirbay)
|
||||
|
||||
v 8.9.6 (unreleased)
|
||||
- Fix importing of events under notes for GitLab projects
|
||||
|
|
|
@ -340,23 +340,30 @@ a.deploy-project-label {
|
|||
|
||||
.project-import {
|
||||
.form-group {
|
||||
margin-bottom: 0;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.import-buttons {
|
||||
padding-left: 0;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
-webkit-flex-wrap: wrap;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.btn {
|
||||
margin-right: 10px;
|
||||
padding: 8px 12px;
|
||||
margin: 0 10px 10px 0;
|
||||
padding: 8px;
|
||||
}
|
||||
&> div {
|
||||
margin-bottom: 14px;
|
||||
|
||||
> div {
|
||||
padding-left: 0;
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
|
||||
.btn {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue