Skip to content

Commit

Permalink
Implements gifts billboard and cleans up billboards CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Altmann committed Dec 8, 2014
1 parent 74bf4ca commit 5795bf7
Show file tree
Hide file tree
Showing 16 changed files with 241 additions and 298 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/welcome/billboard_vintage_big.jpg
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion app/assets/javascripts/visual/slides.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
createSliders = ->
$("#js-billboardslides").slidesjs
#start: Math.floor(Math.random() * 2) + 1 # random number between 1 and 2
#start: 3
width: 205
height: 410
play:
Expand Down
32 changes: 20 additions & 12 deletions app/assets/stylesheets/billboards/_billboard-books.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,32 @@


// General stuff
#billboard-books > article > ul a > p {
text-align: left;
font-weight: 600;
font-size: 14px;
color: #428fbd;
text-decoration: underline;
#billboard-books > article h2 {
font-weight : 400;
text-transform : uppercase;
text-align : center;
color : $white;
}

#billboard-books > article h3 {
font-size: 14px;
color: #74a3c2;
font-weight : 400;
font-size : 14px;
text-align : center;
color : #74a3c2;
}

#billboard-books > article > ul a > p {
font-weight : 600;
font-size : 14px;
text-align : left;
text-decoration : underline;
color : #428fbd;
}

#billboard-books > article > a {
position: absolute;
font-size: 18px;
font-weight: 600;
color: $white;
font-weight : 600;
font-size : 18px;
color : $white;
}


Expand Down
30 changes: 14 additions & 16 deletions app/assets/stylesheets/billboards/_billboard-ecobookstore.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,29 @@

// General stuff
#billboard-ecobookstore > article h2 {
font-weight: 600;
color: #2b4b5e;
text-transform: none;
text-align: left;
font-weight : 600;
text-transform : none;
color : #2b4b5e;
text-align : left;
}

#billboard-ecobookstore > article h3 {
text-indent: -1000em;
text-indent : -1000em;
}

#billboard-ecobookstore > article > a > p {
position: absolute;
font-weight: 600;
color: $white;
font-weight : 600;
color : $white;
}

#billboard-ecobookstore > article > p {
position: absolute;
font-weight: 600;
line-height: 1.2em;
color: $white;
font-weight : 600;
line-height : 1.2em;
color : $white;
}

#billboard-ecobookstore > article > p > span {
color: #e57a61;
color : #e57a61;
}


Expand All @@ -48,7 +46,7 @@
}

#billboard-ecobookstore > article > a > p {
@include static-position($top: 260px, $left: 40px, $height: 25px, $width: 129px);
@include static-position($top: 276px, $left: 40px, $height: 25px, $width: 129px);
font-size: 16px;
padding: 4px 0 0 15px;
}
Expand Down Expand Up @@ -97,7 +95,7 @@
}

#billboard-ecobookstore > article > a > p {
@include static-position($top: 337px, $left: 298px, $height: 27px, $width: 127px);
@include static-position($top: 354px, $left: 298px, $height: 27px, $width: 127px);
font-size: 16px;
padding: 4px 0 0 15px;
}
Expand Down Expand Up @@ -145,7 +143,7 @@
}

#billboard-ecobookstore > article > a > p {
@include static-position($top: 333px, $left: 528px, $height: 30px, $width: 146px);
@include static-position($top: 351px, $left: 528px, $height: 30px, $width: 146px);
font-size: 18px;
padding: 4px 0 0 17px;
}
Expand Down
113 changes: 113 additions & 0 deletions app/assets/stylesheets/billboards/_billboard-gifts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/**
* Gifts billboard
*/


// General stuff
#billboard-gifts > article h2 {
text-transform : uppercase;
color : $white;
text-align : left;
}

#billboard-gifts-gifts {
color : #0a744d;
}

#billboard-gifts-price {
position : absolute;
color : #d23727;
}

#billboard-gifts > article > ul > li p {
font-size : 18px;
font-weight : 600;
color : $white;
}


// Responsive code: small version
@include till-breakpoint($bp-tablet) {
#billboard-gifts {
background-image: image-url('welcome/billboard_gifts_small.jpg');
}

#billboard-gifts > article h2 {
@include static-position($top: 12px, $left: 6px, $width: 130px);
font-size : 20px;
font-weight : 700;
}

#billboard-gifts-price {
@include static-position($top: 11px, $right: -77px, $width: 80px);
font-size : 36px;
font-weight : 600;
}

#billboard-gifts > article > ul > li#billboard-gifts-link1 div {
@include static-position($top: 88px, $left: 5px, $bottom: 15px, $right: 5px);
}

#billboard-gifts > article > ul > li#billboard-gifts-link1 p {
@include static-position($top: 369px, $left: 46px, $height: 29px, $width: 143px);
padding: 4px 0 0 14px;
}
}


// Responsive code: medium version
@include between-breakpoints($bp-tablet, $bp-tablet-horizontal) {
#billboard-gifts {
background-image: image-url('welcome/billboard_gifts_medium.jpg');
}

#billboard-gifts > article h2 {
@include static-position($top: 17px, $left: 10px, $width: 340px);
font-size : 26px;
font-weight : 600;
}

#billboard-gifts-price {
@include static-position($top: -8px, $right: -81px, $width: 80px);
font-size : 38px;
font-weight : 600;
}

#billboard-gifts > article > ul > li#billboard-gifts-link1 div {
@include static-position($top: 62px, $left: 13px, $bottom: 10px, $right: 13px);
}

#billboard-gifts > article > ul > li#billboard-gifts-link1 p {
@include static-position($top: 360px, $left: 276px, $height: 31px, $width: 144px);
padding: 4px 0 0 14px;
}
}


// Responsive code: big version
@include at-breakpoint($bp-tablet-horizontal) {
#billboard-gifts {
background-image: image-url('welcome/billboard_gifts_big.jpg');
}

#billboard-gifts > article h2 {
@include static-position($top: 29px, $left: 37px, $width: 400px);
font-size : 30px;
font-weight : 600;
}

#billboard-gifts-price {
@include static-position($top: -1px, $right: -193px, $width: 70px);
font-size : 32px;
font-weight : 700;
}

#billboard-gifts > article > ul > li#billboard-gifts-link1 div {
@include static-position($top: 80px, $left: 8px, $bottom: 10px, $right: 8px);
}

#billboard-gifts > article > ul > li#billboard-gifts-link1 p {
@include static-position($top: 365px, $left: 529px, $height: 29px, $width: 144px);
padding: 4px 0 0 14px;
}
}
27 changes: 15 additions & 12 deletions app/assets/stylesheets/billboards/_billboard-gourmet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,25 @@


// General stuff
//#billboard-gourmet > article > ul a p {
// text-align: left;
// font-size: 14px;
//}

#billboard-gourmet > article h2 {
font-weight : 400;
text-transform : uppercase;
text-align : center;
color : $white;
}

#billboard-gourmet > article > ul > li p {
text-align: left;
font-weight: 600;
font-size: 18px;
color: #428fbd;
font-weight : 600;
font-size : 18px;
text-align : left;
color : #428fbd;
}

#billboard-gourmet > article > a {
position: absolute;
font-size: 18px;
font-weight: 600;
color: $white;
font-weight : 600;
font-size : 18px;
color : $white;
}


Expand Down Expand Up @@ -129,6 +131,7 @@

#billboard-gourmet > article > h2 {
@include static-position($top: 127px, $left: 7px);
font-size: 30px;
}

#billboard-gourmet > article > a {
Expand Down
Loading

0 comments on commit 5795bf7

Please sign in to comment.