Mercurial > kallithea

changeset 3775:371898dc9a91 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed some issues with paginators on chrome, and made them look nicer
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 21 Apr 2013 23:37:56 +0200
parents 60335b702a00
children 13241a4075e9
files rhodecode/public/css/style.css rhodecode/templates/journal/journal_data.html
diffstat 2 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/style.css	Wed Apr 03 15:56:12 2013 +0200
+++ b/rhodecode/public/css/style.css	Sun Apr 21 23:37:56 2013 +0200
@@ -1565,7 +1565,8 @@
     padding: 6px;
 }
 
-#content div.box div.pagination ul.pager li a:hover, #content div.box div.pagination ul.pager li a:active {
+#content div.box div.pagination ul.pager li a:hover,
+#content div.box div.pagination ul.pager li a:active {
     background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
@@ -1574,17 +1575,25 @@
     margin: -1px;
 }
 
+#content div.box div.pagination-right {
+    float: right;
+}
+
 #content div.box div.pagination-wh {
     height: 1%;
-    clear: both;
     overflow: hidden;
     text-align: right;
     margin: 10px 0 0;
     padding: 0;
 }
 
-#content div.box div.pagination-right {
-    float: right;
+#content div.box div.pagination-wh > :first-child {
+    border-radius: 4px 0px 0px 4px;
+}
+
+#content div.box div.pagination-wh > :last-child{
+    border-radius: 0px 4px 4px 0px;
+    border-right: 1px solid #cfcfcf;
 }
 
 #content div.box div.pagination-wh a,
@@ -1598,11 +1607,9 @@
     background: #ebebeb url("../images/pager.png") repeat-x;
     border-top: 1px solid #dedede;
     border-left: 1px solid #cfcfcf;
-    border-right: 1px solid #c4c4c4;
     border-bottom: 1px solid #c4c4c4;
     color: #4A4A4A;
     font-weight: 700;
-    margin: 0 0 0 4px;
     padding: 6px;
 }
 
@@ -1612,11 +1619,9 @@
     background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
-    border-right: 1px solid #b1b1b1;
     border-bottom: 1px solid #afafaf;
     color: #515151;
     font-weight: 700;
-    margin: 0 0 0 4px;
     padding: 6px;
 }
 
@@ -1624,7 +1629,6 @@
     background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
-    border-right: 1px solid #b1b1b1;
     border-bottom: 1px solid #afafaf;
     text-decoration: none;
 }
--- a/rhodecode/templates/journal/journal_data.html	Wed Apr 03 15:56:12 2013 +0200
+++ b/rhodecode/templates/journal/journal_data.html	Sun Apr 21 23:37:56 2013 +0200
@@ -2,7 +2,7 @@
 
 %if c.journal_day_aggreagate:
     %for day,items in c.journal_day_aggreagate:
-    <div class="journal_day">${day}</div>
+     <div class="journal_day">${day}</div>
         % for user,entries in items:
             <div class="journal_container">
                 <div class="gravatar">
@@ -34,8 +34,10 @@
             </div>
         %endfor
     %endfor
-
-  <div class="pagination-wh pagination-left">
+  
+  <div class="pagination-wh pagination-left" style="padding: 0px 0px 0px 10px;">
+  ${c.journal_pager.pager('$link_previous ~2~ $link_next')}  
+  </div>
     <script type="text/javascript">
     YUE.onDOMReady(function(){
         YUE.delegate("journal","click",function(e, matchedEl, container){
@@ -47,9 +49,7 @@
             YUE.preventDefault(e);
         },'.pager_link');
     });
-    </script>
-  ${c.journal_pager.pager('$link_previous ~2~ $link_next')}
-  </div>
+    </script>  
 %else:
   <div style="padding:5px 0px 10px 10px;">
       ${_('No entries yet')}