diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-15 06:02:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-15 06:02:12 +0000 |
| commit | dbb7610365782e1d780903d88e8b804e89262a02 (patch) | |
| tree | d9b55d4525cd23436063612f31e1bf07cd49995e /app/views/dashboard | |
| parent | 8000fb44b7d0eb2312011cf6e21a2cc406dd103b (diff) | |
| parent | 204fee4f41cafedbb30d4c68793985a9e3ea84e4 (diff) | |
| download | gitlab-ce-dbb7610365782e1d780903d88e8b804e89262a02.tar.gz | |
Merge branch 'responsive-sidebar' into 'master'
Responsive sidebar fixes
This fixes two major issues with the responsive sidebar
1. Overlapping content by the label:
The label and sidebar is now always on the right side of the screen. This makes it always easy to find (better UX) and prevents it from overlapping most content. Additionally, on xs screens, instead of the side-attached label, for some pages it will show an extra button in the head instead of a buttons that overlaps.
2. Pop up of sidebar on changing pages.
Diffstat (limited to 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 4 | ||||
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 4 | ||||
| -rw-r--r-- | app/views/dashboard/show.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 670755b8996..9888da2f7f2 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -7,9 +7,9 @@ %hr .row - .left.sidebar-expand-button.hidden-lg.hidden-md + .fixed.sidebar-expand-button.hidden-lg.hidden-md %i.icon-list.icon-2x - .col-md-3.responsive-side-left + .col-md-3.responsive-side = render 'shared/filter', entity: 'issue' .col-md-9 = render 'shared/issues' diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 0a87eedaecc..ee3bec2849d 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -7,9 +7,9 @@ List all merge requests from all projects you have access to. %hr .row - .left.sidebar-expand-button.hidden-lg.hidden-md + .fixed.sidebar-expand-button.hidden-lg.hidden-md %i.icon-list.icon-2x - .col-md-3.responsive-side-left + .col-md-3.responsive-side = render 'shared/filter', entity: 'merge_request' .col-md-9 = render 'shared/merge_requests' diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index b81eed76001..306b71717ef 100644 --- a/app/views/dashboard/show.html.haml +++ b/app/views/dashboard/show.html.haml @@ -5,7 +5,7 @@ .side.col-md-4.left.responsive-side = render 'sidebar' - .sidebar-expand-button.hidden-lg.hidden-md + .fixed.sidebar-expand-button.hidden-lg.hidden-md %i.icon-list.icon-2x - else |