diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-18 20:12:38 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-20 19:16:31 +0300 |
| commit | 4b7343f7acc5fe183eeffae3015f1ec50cd9e049 (patch) | |
| tree | 96ed5f3400d56fe61bc9d6e628b262e2146e0ec9 | |
| parent | 0d57e944779512941491e8c754f804e85ecd4178 (diff) | |
Merge branch 'star-fork-mobile' into 'master'
Display Star and Fork on mobile, fix #18537.
## What does this MR do?
Displays the Star and Fork buttons on mobile devices.
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
I wanted to star and/or fork projects while on my phone, I couldn't do that before.
## What are the relevant issue numbers?
#18537
## Screenshots (if relevant)
cc: @jschatz1
See merge request !4714
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/mobile.scss | 13 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 490d065a344..cd648ff44ec 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 8.9.0 (unreleased) - Add more information into RSS feed for issues (Alexander Matyushentsev) - Bulk assign/unassign labels to issues. - Ability to prioritize labels !4009 / !3205 (Thijs Wouters) + - Show Star and Fork buttons on mobile. - Fix endless redirections when accessing user OAuth applications when they are disabled - Allow enabling wiki page events from Webhook management UI - Bump rouge to 1.11.0 diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss index d4e5cc819a4..c74682dfef4 100644 --- a/app/assets/stylesheets/framework/mobile.scss +++ b/app/assets/stylesheets/framework/mobile.scss @@ -52,6 +52,19 @@ .git-clone-holder { display: none; } + + // Display Star and Fork buttons without counters on mobile. + .project-action-buttons { + display: block; + + .count-buttons .btn { + margin: 0 10px; + } + + .count-buttons .count-with-arrow { + display: none; + } + } } .project-stats { diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index f6bfa567fd0..86ea08dd229 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -21,7 +21,7 @@ = link_to project_path(forked_from_project) do = forked_from_project.namespace.try(:name) - .project-repo-buttons + .project-repo-buttons.project-action-buttons .count-buttons = render 'projects/buttons/star' = render 'projects/buttons/fork' |