diff mbox

[31/49] paginator: Redesign the paginator

Message ID 1443708774-26996-32-git-send-email-damien.lespiau@intel.com
State Accepted
Headers show

Commit Message

Damien Lespiau Oct. 1, 2015, 2:12 p.m. UTC 
From: Belén Barros Peña <belen.barros.pena@intel.com>

A few things:

  - Use the … glyph
  - Remove the box around the page numbers
  - Slight restyling

Signed-off-by: Belén Barros Peña <belen.barros.pena@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Acked-by: Stephen Finucane <stephen.finucane@intel.com>
---
 htdocs/css/style.css                          | 36 ++++++++-------------------
 patchwork/templates/patchwork/pagination.html |  2 +-
 patchwork/templates/patchwork/patch-list.html |  4 +--
 3 files changed, 14 insertions(+), 28 deletions(-)
diff mbox

Patch

diff --git a/htdocs/css/style.css b/htdocs/css/style.css
index 3d4bebd..6bc8ca3 100644
--- a/htdocs/css/style.css
+++ b/htdocs/css/style.css
@@ -160,24 +160,24 @@  input#reorder-change {
 }
 
 /* list pagination */
-.paginator { padding-bottom: 1em; padding-top: 1em; font-size: 80%; }
+.paginator {
+	text-align: right;
+	margin: 10px 0;
+	clear: both;
+	margin-top: 20px;
+}
 
 .paginator .prev-na,
 .paginator .next-na {
 	padding:.3em;
 	font-weight: normal;
-	border: 0.1em solid #c0c0c0;
-	background-color: #f9f9f9;
 	color: #a0a0a0;
 }
 
 .paginator .prev a, .paginator .prev a:visited,
 .paginator .next a, .paginator .next a:visited {
-	border: 0.1em solid #b0b0d0;
-	background-color: #eeeeee;
-	color: #786fb4;
 	padding: .3em;
-	font-weight: bold;
+	font-weight: normal;
 }
 
 .paginator .prev, .paginator .prev-na { margin-right:.5em; }
@@ -185,27 +185,13 @@  input#reorder-change {
 
 .paginator .page a, .paginator .page a:visited, .paginator .curr {
 	padding: .25em;
-	font-weight: bold;
-	border: 1px solid #b0b0d0;
-	background-color: #eeeeee;
+	font-weight: normal;
 	margin: 0em .25em;
-	color: #786fb4;
 }
-
 .paginator .curr {
-	background-color: #b0b0d0;
-	color:#fff;
-	border:1px solid #c0c0ff;
-	font-weight:bold;
-}
-
-.paginator .page a:hover,
-.paginator .curr a:hover,
-.paginator .prev a:hover,
-.paginator .next a:hover {
-	color: #ffffff;
-	background-color: #c0c0ff;
-	border:1px solid #234f32;
+	background-color: #2E2E70;
+	color: #fff;
+	font-weight:normal;
 }
 
 /* project list view */
diff --git a/patchwork/templates/patchwork/pagination.html b/patchwork/templates/patchwork/pagination.html
index 3e95126..7938dd8 100644
--- a/patchwork/templates/patchwork/pagination.html
+++ b/patchwork/templates/patchwork/pagination.html
@@ -27,7 +27,7 @@ 
 {% endfor %}
  
 {% if page.paginator.leading_set %}
-        ...
+        …
  {% for p in page.paginator.leading_set %}
     <span class="page"><a href="{% listurl page=p %}">{{ p }}</a></span>
  {% endfor %}
diff --git a/patchwork/templates/patchwork/patch-list.html b/patchwork/templates/patchwork/patch-list.html
index 707f63f..9de5c52 100644
--- a/patchwork/templates/patchwork/patch-list.html
+++ b/patchwork/templates/patchwork/patch-list.html
@@ -5,10 +5,10 @@ 
 
 {% load cycle from future %}
 
-{% include "patchwork/pagination.html" %}
-
 {% include "patchwork/filters.html" %}
 
+{% include "patchwork/pagination.html" %}
+
 {% if order.editable %}
 <table class="patchlist">
  <tr>