diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-27 16:08:16 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-01 16:24:54 +0000 |
| commit | 69164211159ac1d4e80d53d5a9d4f3578b689454 (patch) | |
| tree | febb1b0310d5ccf673261066bdff42f0f3d5562f /app | |
| parent | 16d98f425ced770dea7701f883f64e263d962a01 (diff) | |
| download | gitlab-ce-69164211159ac1d4e80d53d5a9d4f3578b689454.tar.gz | |
Makes table pagination responsive
Media queries for medium screens
Adds entry to CHANGELOG
Rollback to previous design
Adds class for previous sibling
Fix removed class
Fixes after review
Fix scss linter
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/pagination.scss | 43 | ||||
| -rw-r--r-- | app/views/kaminari/gitlab/_gap.html.haml | 4 | ||||
| -rw-r--r-- | app/views/kaminari/gitlab/_page.html.haml | 2 |
3 files changed, 46 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/pagination.scss b/app/assets/stylesheets/framework/pagination.scss index b6f21fd8c91..2700d5db9f0 100644 --- a/app/assets/stylesheets/framework/pagination.scss +++ b/app/assets/stylesheets/framework/pagination.scss @@ -7,8 +7,51 @@ .pagination { padding: 0; } + + .gap, + .gap:hover { + background-color: $gray-light; + padding: 6px; + cursor: default; + } } .panel > .gl-pagination { margin: 0; } + +/** + * Small screen pagination + */ + +@media (max-width: $screen-xs) { + .gl-pagination { + .pagination li a { + padding: 6px 14px; + } + + .page { + display: none; + + &.active { + display: inline; + } + } + } +} + +/** + * Medium screen pagination + */ +@media (min-width: $screen-xs) and (max-width: $screen-md-max) { + .gl-pagination { + .page { + display: none; + + &.active, + &.sibling { + display: inline; + } + } + } +} diff --git a/app/views/kaminari/gitlab/_gap.html.haml b/app/views/kaminari/gitlab/_gap.html.haml index 80ca30f36e6..889514c4755 100644 --- a/app/views/kaminari/gitlab/_gap.html.haml +++ b/app/views/kaminari/gitlab/_gap.html.haml @@ -4,6 +4,6 @@ -# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote -%li{class: "page"} - %span.page.gap +%li + %span.gap = raw(t 'views.pagination.truncate') diff --git a/app/views/kaminari/gitlab/_page.html.haml b/app/views/kaminari/gitlab/_page.html.haml index 522e4d1d05f..750aed8f329 100644 --- a/app/views/kaminari/gitlab/_page.html.haml +++ b/app/views/kaminari/gitlab/_page.html.haml @@ -6,5 +6,5 @@ -# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote -%li{class: "page#{' active' if page.current?}"} +%li{class: "page#{' active' if page.current?}#{' sibling' if page.next? || page.prev?}"} = link_to page, url, {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil} |