summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-02 18:38:34 +0000
committerFatih Acet <acetfatih@gmail.com>2016-09-02 18:38:34 +0000
commit9d0012418e72d2aca1e7d56c42836c228ecb47b3 (patch)
tree4c56717ab4be7bbab1e02c583a2ea6e041dc403c
parent00772f755af4ce56987fc01e107fb7b3667cb0e5 (diff)
parent10d9fa99e55be0d377ebd45cb767bccc7fd6b485 (diff)
downloadgitlab-ce-9d0012418e72d2aca1e7d56c42836c228ecb47b3.tar.gz
Merge branch 'fix-add-button-alignment' into 'master'
Align add button on repository view ## What does this MR do? Top aligns the add button to the other UI elements adjacent to it :smile: ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Fixes a UI inconsistency ## What are the relevant issue numbers? Closes #21168 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-24_at_3.53.00_PM__2_](/uploads/5d6d765bb8a1d640170805ec32956790/Screen_Shot_2016-08-24_at_3.53.00_PM__2_.png) After: ![Screen_Shot_2016-08-24_at_3.52.44_PM__2_](/uploads/1db9f0f68ef5defa4dd111d7dae1dc26/Screen_Shot_2016-08-24_at_3.52.44_PM__2_.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 !5971
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/tree.scss4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9ce58719999..be43e319151 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.12.0 (unreleased)
- Remove redundant js-timeago-pending from user activity log (ClemMakesApps)
- Ability to manage project issues, snippets, wiki, merge requests and builds access level
- Remove inconsistent font weight for sidebar's labels (ClemMakesApps)
+ - Align add button on repository view (ClemMakesApps)
- Added tests for diff notes
- Add a button to download latest successful artifacts for branches and tags !5142
- Remove redundant pipeline tooltips (ClemMakesApps)
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 538f211c65b..cdd38442550 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -11,6 +11,10 @@
}
}
+ .add-to-tree {
+ vertical-align: top;
+ }
+
.last-commit {
max-width: 506px;