diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-13 10:46:40 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-13 10:46:40 +0000 |
commit | 4b996a98194b79b4b3dd080c29ea766c27a92d9e (patch) | |
tree | 91a1a3ebd94b9d52d12eda869ece96853274a9b4 /app/assets | |
parent | f7be904afa2edf731e87f1f60918c0d82234eff4 (diff) | |
parent | 0dcfc899d124bb618c84b6e25393a3c36939d633 (diff) | |
download | gitlab-ce-4b996a98194b79b4b3dd080c29ea766c27a92d9e.tar.gz |
Merge branch '21877-no-mr-branch-title-link-in-issue-on-mobile' into 'master'
Fixed issue merge-request-info missing on mobile
## What does this MR do?
Removed media query declaration relating to `.merge-request-info` and `.issue-info`.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Mobile UX
## Screenshots (if relevant)
![Screen_Shot_2016-09-07_at_19.10.39](/uploads/6dc39b72459087826071ba9fbd06da17/Screen_Shot_2016-09-07_at_19.10.39.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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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)
## What are the relevant issue numbers?
Closes #21877
See merge request !6250
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/mobile.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss index 367c7d01944..76b93b23b95 100644 --- a/app/assets/stylesheets/framework/mobile.scss +++ b/app/assets/stylesheets/framework/mobile.scss @@ -79,10 +79,6 @@ padding-left: 15px !important; } - .issue-info, .merge-request-info { - display: none; - } - .nav-links, .nav-links { li a { font-size: 14px; diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 7a26b7ad497..60a0d50ba73 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -37,6 +37,15 @@ form.edit-issue { margin: 0; } +ul.related-merge-requests > li { + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + .merge-request-id { + flex-shrink: 0; + } +} + .merge-requests-title, .related-branches-title { font-size: 16px; font-weight: 600; |