diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-02 15:40:27 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-02 15:40:27 +0000 |
commit | 9f7349f6e5d9d8c03f9bef41f1a8c1d72dac39b8 (patch) | |
tree | c5e85b386f8d1dd0142666817a66a1ece137b17c /app/assets/stylesheets/pages/builds.scss | |
parent | ece30b70ca3545e396963974aa0f27f37512bf97 (diff) | |
parent | c369738e78570d4c951765728c3c5510f0d68b68 (diff) | |
download | gitlab-ce-9f7349f6e5d9d8c03f9bef41f1a8c1d72dac39b8.tar.gz |
Merge branch '21122-move-list-of-builds-to-bottom-of-sidebar' into 'master'
Moved builds panel to the bottom of the builds sidemenu (and change retry link colour)
## What does this MR do?
Moves the builds panel to the bottom of the builds sidemenu.
Changes the `Retry` link to look more _linky_. :paperclips:
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
On small screens, the builds panel must be scrolled through before you can get to the details of the build you're looking at.
## What are the relevant issue numbers?
Closes #21122
## Screenshots (if relevant)
![Screen_Shot_2016-08-20_at_17.41.51](/uploads/84f10c43011da514ef8ac1b1d20eb5d5/Screen_Shot_2016-08-20_at_17.41.51.png)
## Does this MR meet the acceptance criteria?
- [ ] [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
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
Closes #21122
See merge request !5923
Diffstat (limited to 'app/assets/stylesheets/pages/builds.scss')
-rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index cee198691c2..23255f34710 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -108,7 +108,7 @@ } .blocks-container { - padding: $gl-padding; + padding: 0 $gl-padding; } .block { @@ -123,6 +123,13 @@ } } + .retry-link { + color: $gl-link-color; + &:hover { + text-decoration: underline; + } + } + .stage-item { cursor: pointer; @@ -132,7 +139,7 @@ } .build-dropdown { - padding: 0 $gl-padding; + padding: $gl-padding 0; .dropdown-menu-toggle { margin-top: 8px; @@ -146,7 +153,6 @@ } .builds-container { - margin-top: $gl-padding; background-color: $white-light; border-top: 1px solid $border-color; border-bottom: 1px solid $border-color; |