diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-09-26 21:09:19 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-26 21:09:19 +0000 |
commit | 709c7009e5fbf67c53a9c09fe0754e605363b07b (patch) | |
tree | 68a4b2a2e5da96a28145b25bdbbf004dbc5232ed /app/assets/stylesheets | |
parent | dd1341ebbe0cc9a01dad56ab241671d434c47bb8 (diff) | |
parent | 9abd871a03ead34945f7dff050f92d7ab9225472 (diff) | |
download | gitlab-ce-709c7009e5fbf67c53a9c09fe0754e605363b07b.tar.gz |
Merge branch 'full-width-new-snippet-button' into 'master'
Added full-width new snippet button on mobile and corrected capitalization
## What does this MR do?
Adds full-width `New snippet` button to snippet mobile views and corrects `New Snippet` to `New snippet` throughout.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
@connorshea Spotted that I missed this in !6210 :)
## Screenshots (if relevant)
![Screen_Shot_2016-09-16_at_10.40.21](/uploads/ddca2da3a5ef787298bfc87e129db820/Screen_Shot_2016-09-16_at_10.40.21.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?
See merge request !6380
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/snippets.scss | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 4618687a4be..ce489f7c3de 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -336,3 +336,9 @@ box-shadow: inset 0 0 0 white; } } + +@media (max-width: $screen-xs-max) { + .btn-wide-on-xs { + width: 100%; + } +} diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 46af18580d5..efc348214c2 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -164,7 +164,7 @@ ul.content-list { } .no-comments { - opacity: 0.5; + opacity: .5; } } diff --git a/app/assets/stylesheets/pages/snippets.scss b/app/assets/stylesheets/pages/snippets.scss index 4d5df566d9b..857eb76131a 100644 --- a/app/assets/stylesheets/pages/snippets.scss +++ b/app/assets/stylesheets/pages/snippets.scss @@ -36,3 +36,7 @@ float: right; } } + +.snippet-scope-menu .btn-new { + margin-top: 15px; +} |