Skip to content

Commit

Permalink
Revert "Add Christmas gifts box to welcome page"
Browse files Browse the repository at this point in the history
This reverts commit edf9796.
  • Loading branch information
Marc Altmann committed Jan 4, 2016
1 parent 79028cd commit 3e0daf5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
Binary file removed app/assets/images/welcome/filter-christmasgifts.jpg
Binary file not shown.
8 changes: 4 additions & 4 deletions app/assets/stylesheets/controller/welcome.scss
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@
background-color: #768749;
}

#filter-christmasgifts .filter-image p, #filter-christmasgifts .filter-text {
background-color: #c9291b;
#filter-small .filter-image p, #filter-small .filter-text {
background-color: #e47240;
}

#filter-used .filter-image p, #filter-used .filter-text {
Expand Down Expand Up @@ -464,7 +464,7 @@
@include omega;
}

&#filter-christmasgifts {
&#filter-small {
clear: right;
}
}
Expand Down Expand Up @@ -546,7 +546,7 @@
.teaser--filters {
@include span(2 of 6);

&#filter-christmasgifts {
&#filter-small {
@include omega;
}

Expand Down
15 changes: 8 additions & 7 deletions app/views/welcome/_filter_boxes.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@
p.filter-show= t('.ecologic.link')
p.filter-label= t('.ecologic.label')

.teaser.teaser--filters#filter-christmasgifts
.teaser.teaser--filters#filter-small
.teaser-inner
= link_to library_path(12732) do
= link_to '/articles?article_search_form[small_and_precious]=true'\
'&pk_campaign=filterbox&pk_kwd=small' do
.filter-text
h2= t('.christmasgifts.teaser_html')
p= t('.christmasgifts.description')
h2= t('.small.teaser_html')
p= t('.small.description')
.filter-image
= image_tag 'welcome/filter-christmasgifts.jpg'
p.filter-show= t('.christmasgifts.link')
p.filter-label= t('.christmasgifts.label')
= image_tag 'welcome/filter-small.jpg'
p.filter-show= t('.small.link')
p.filter-label= t('.small.label')

.teaser.teaser--filters#filter-used
.teaser-inner
Expand Down
8 changes: 4 additions & 4 deletions config/locales/views/welcome/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ de:
description: "Öko-Produkte auf einen Blick"
link: "Hier reinschauen"
label: "öko"
christmasgifts:
teaser_html: "100 schöne<br>Weihnachts&shy;geschenke"
description: "Perfekte Ideen"
small:
teaser_html: "Kleine Hersteller<br>–&nbsp;große Qualität."
description: "Alle Angebote auf einen Blick"
link: "Jetzt entdecken"
label: "inspirierend"
label: "klein&edel"
used:
teaser_html: "Von letzter Saison<br>bis echter Rarität."
description: "Gebrauchtes auf einen Blick"
Expand Down

0 comments on commit 3e0daf5

Please sign in to comment.