summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-10-27 16:08:16 +0100
committerFilipa Lacerda <filipa@gitlab.com>2016-11-01 16:24:54 +0000
commit69164211159ac1d4e80d53d5a9d4f3578b689454 (patch)
treefebb1b0310d5ccf673261066bdff42f0f3d5562f
parent16d98f425ced770dea7701f883f64e263d962a01 (diff)
downloadgitlab-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
-rw-r--r--CHANGELOG.md34
-rw-r--r--app/assets/stylesheets/framework/pagination.scss43
-rw-r--r--app/views/kaminari/gitlab/_gap.html.haml4
-rw-r--r--app/views/kaminari/gitlab/_page.html.haml2
4 files changed, 80 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cef3997c7d4..2f675d1e7ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,40 @@ Please view this file on the master branch, on stable branches it's out of date.
- Fix and improve `Sortable.highest_label_priority`. !7165
- Fixed sticky merge request tabs when sidebar is pinned. !7167
- Only remove right connector of first build of last stage. !7179
+ - Backups do not fail anymore when using tar on annex and custom_hooks only. !5814
+ - Adds user project membership expired event to clarify why user was removed (Callum Dryden)
+ - Trim leading and trailing whitespace on project_path (Linus Thiel)
+ - Prevent award emoji via notes for issues/MRs authored by user (barthc)
+ - Adds an optional path parameter to the Commits API to filter commits by path (Luis HGO)
+ - Fix extra space on Build sidebar on Firefox !7060
+ - Fix mobile layout issues in admin user overview page !7087
+ - Fix HipChat notifications rendering (airatshigapov, eisnerd)
+ - Add hover to trash icon in notes !7008 (blackst0ne)
+ - Fix sidekiq stats in admin area (blackst0ne)
+ - Removed delete branch tooltip !6954
+ - Escape ref and path for relative links !6050 (winniehell)
+ - Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose)
+ - Fix filtering of milestones with quotes in title (airatshigapov)
+ - Refactor less readable existance checking code from CoffeeScript !6289 (jlogandavison)
+ - Update mail_room and enable sentinel support to Reply By Email (!7101)
+ - Simpler arguments passed to named_route on toggle_award_url helper method
+ - Fix typo in framework css class. !7086 (Daniel Voogsgerd)
+ - New issue board list dropdown stays open after adding a new list
+ - Fix: Backup restore doesn't clear cache
+ - API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh)
+ - Replace jquery.cookie plugin with js.cookie !7085
+ - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method
+ - Fix Sign in page 'Forgot your password?' link overlaps on medium-large screens
+ - Show full status link on MR & commit pipelines
+ - Fix documents and comments on Build API `scope`
+ - Fix applying labels for GitHub-imported MRs
+ - Fix importing MR comments from GitHub
+ - Fix table pagination to be responsive
+ - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov)
+ - Shortened merge request modal to let clipboard button not overlap
+
+## 8.13.2
+ - Fix builds dropdown overlapping bug !7124
## 8.13.1 (2016-10-25)
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}