Fixed rss button graphical glitch

kkuchta · Mar 5, 2012 · 94465e0 · 94465e0
1 parent c114184
commit 94465e0
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 20 deletions.
diff --git a/app/assets/stylesheets/bits.css.scss b/app/assets/stylesheets/bits.css.scss
@@ -15,7 +15,6 @@
     .rss-link{
       display:inline-block;
       position:relative;
-      top:-18px;
       margin:20px;
     }
   }

diff --git a/app/views/bits/index.html.haml b/app/views/bits/index.html.haml
@@ -39,7 +39,7 @@
       = render partial: 'bit', locals: { bit: bit }
       %hr
   .row
-    .span8.index-pagination
+    .span12.index-pagination
       = paginate @bits
       %a.rss-link{ href:rss_link }
         %img{ src:image_path('feed-icon.svg' ), width:'36px',height:'36px'}

diff --git a/app/views/kaminari/_first_page.html.haml b/app/views/kaminari/_first_page.html.haml
@@ -5,5 +5,5 @@
 -#    num_pages:     total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
-%span.first
+%li.first
   = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote
diff --git a/app/views/kaminari/_gap.html.haml b/app/views/kaminari/_gap.html.haml
@@ -4,5 +4,6 @@
 -#    num_pages:     total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
-%span.page.gap
-  = raw(t 'views.pagination.truncate')
+%li.page.disabled
+  %a{ href: '#' }
+    = raw(t 'views.pagination.truncate')
diff --git a/app/views/kaminari/_last_page.html.haml b/app/views/kaminari/_last_page.html.haml
@@ -5,5 +5,5 @@
 -#    num_pages:     total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
-%span.last
+%li.last
   = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}
diff --git a/app/views/kaminari/_next_page.html.haml b/app/views/kaminari/_next_page.html.haml
@@ -5,5 +5,5 @@
 -#    num_pages:     total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
-%span.next
+%li.next
   = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote
diff --git a/app/views/kaminari/_page.html.haml b/app/views/kaminari/_page.html.haml
@@ -6,7 +6,7 @@
 -#    num_pages:     total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
-%span{:class => "page#{' active' if page.current?}"}
+%li{:class => "page#{' active' if page.current?}"}
   - if page.current?
     %a{href:'#'}=current_page.number
   - else

diff --git a/app/views/kaminari/_paginator.html.haml b/app/views/kaminari/_paginator.html.haml
@@ -7,12 +7,13 @@
 -#    paginator:     the paginator that renders the pagination tags inside
 = paginator.render do
   %nav.pagination
-    = first_page_tag unless current_page.first?
-    = prev_page_tag unless current_page.first?
-    - each_page do |page|
-      - if page.left_outer? || page.right_outer? || page.inside_window?
-        = page_tag page
-      - elsif !page.was_truncated?
-        = gap_tag
-    = next_page_tag unless current_page.last?
-    = last_page_tag unless current_page.last?
+    %ul
+      = first_page_tag unless current_page.first?
+      = prev_page_tag unless current_page.first?
+      - each_page do |page|
+        - if page.left_outer? || page.right_outer? || page.inside_window?
+          = page_tag page
+        - elsif !page.was_truncated?
+          = gap_tag
+      = next_page_tag unless current_page.last?
+      = last_page_tag unless current_page.last?
diff --git a/app/views/kaminari/_prev_page.html.haml b/app/views/kaminari/_prev_page.html.haml
@@ -5,5 +5,5 @@
 -#    num_pages:     total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
-%span.prev
+%li.prev
   = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote
diff --git a/public/assets/application-a1ade5530086face2e08d69509dab73f.css b/public/assets/application-a1ade5530086face2e08d69509dab73f.css
diff --git a/public/assets/application-a1ade5530086face2e08d69509dab73f.css.gz b/public/assets/application-a1ade5530086face2e08d69509dab73f.css.gz
diff --git a/public/assets/application-f3bc921357233904e961b784c93335ea.js.gz b/public/assets/application-f3bc921357233904e961b784c93335ea.js.gz
diff --git a/public/assets/application.css b/public/assets/application.css
diff --git a/public/assets/application.css.gz b/public/assets/application.css.gz
diff --git a/public/assets/application.js.gz b/public/assets/application.js.gz
diff --git a/public/assets/manifest.yml b/public/assets/manifest.yml
@@ -8,6 +8,6 @@ noise_pattern_with_crosslines.png: noise_pattern_with_crosslines-b88313242355f1b
 project_papper.png: project_papper-3c4caa995631cd9525789403f4be26fb.png
 rails.png: rails-782b548cc1ba7f898cdad2d9eb8420d2.png
 application.js: application-f3bc921357233904e961b784c93335ea.js
-application.css: application-204e39c9656311bf9c3189cedcb0ed41.css
+application.css: application-a1ade5530086face2e08d69509dab73f.css
 twitter/bootstrap/glyphicons-halflings-white.png: twitter/bootstrap/glyphicons-halflings-white-4fbb6a0b9b4e61912f486ac494a858f1.png
 twitter/bootstrap/glyphicons-halflings.png: twitter/bootstrap/glyphicons-halflings-2ed0cba6eca0f44737ab78f1e58bc11e.png