Christmas boxes 2: change position of boxes

fairmondo · Dec 3, 2015 · 862908f · 862908f
1 parent 654172c
commit 862908f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/app/assets/stylesheets/controller/welcome.scss b/app/assets/stylesheets/controller/welcome.scss
@@ -460,11 +460,11 @@
   .teaser--filters {
     @include span(2 of 4);
 
-    &#filter-eco, &#filter-used {
+    &#filter-fair, &#filter-used {
       @include omega;
     }
 
-    &#filter-christmasgifts {
+    &#filter-eco {
       clear: right;
     }
   }
@@ -546,7 +546,7 @@
   .teaser--filters {
     @include span(2 of 6);
 
-    &#filter-christmasgifts {
+    &#filter-eco {
       @include omega;
     }
 

diff --git a/app/views/welcome/_filter_boxes.html.slim b/app/views/welcome/_filter_boxes.html.slim
@@ -1,6 +1,17 @@
 / Filter boxes
 
-.teaser.teaser--clear.teaser--filters#filter-fair
+.teaser.teaser--filters.teaser--clear#filter-christmasgifts
+  .teaser-inner
+    = link_to library_path(12732) do
+      .filter-text
+        h2= t('.christmasgifts.teaser_html')
+        p= t('.christmasgifts.description')
+      .filter-image
+        = image_tag 'welcome/filter-christmasgifts.jpg'
+        p.filter-show= t('.christmasgifts.link')
+        p.filter-label= t('.christmasgifts.label')
+
+.teaser.teaser--filters#filter-fair
   .teaser-inner
     = link_to '/articles?article_search_form[fair]=true'\
               '&pk_campaign=filterbox&pk_kwd=fair' do
@@ -24,17 +35,6 @@
         p.filter-show= t('.ecologic.link')
         p.filter-label= t('.ecologic.label')
 
-.teaser.teaser--filters#filter-christmasgifts
-  .teaser-inner
-    = link_to library_path(12732) do
-      .filter-text
-        h2= t('.christmasgifts.teaser_html')
-        p= t('.christmasgifts.description')
-      .filter-image
-        = image_tag 'welcome/filter-christmasgifts.jpg'
-        p.filter-show= t('.christmasgifts.link')
-        p.filter-label= t('.christmasgifts.label')
-
 .teaser.teaser--filters#filter-used
   .teaser-inner
    = link_to '/articles?article_search_form[condition]=old'\