From ad7cca067cc3c6ace8da2433bee9d8cecd2b6f42 Mon Sep 17 00:00:00 2001 From: Rasim Demirbay Date: Mon, 11 Jul 2016 17:32:01 +0300 Subject: [PATCH 1/2] Style of import project buttons were fixed in the new project page. --- app/assets/stylesheets/pages/projects.scss | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index bce4aac3334..5be911dc562 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -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; + } } } } From 3d16a50ee3d67c49ecfd4b997829c029c958105d Mon Sep 17 00:00:00 2001 From: Rasim Demirbay Date: Mon, 11 Jul 2016 18:12:25 +0300 Subject: [PATCH 2/2] CHANGELOG was updated. --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 0000e288b19..d1bf5d0ef9e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -66,6 +66,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.5 - Add more debug info to import/export and memory killer. !5108