Skip to content

Commit

Permalink
Add hi-res logos
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Altmann committed Jan 12, 2015
1 parent 24eba87 commit e25ba63
Show file tree
Hide file tree
Showing 13 changed files with 51 additions and 50 deletions.
Binary file added app/assets/images/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logo_small.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/sprites.png
View file
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/sprites/logo.png
View file
Binary file not shown.
Binary file removed app/assets/images/sprites/logo_small.png
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions app/assets/stylesheets/layout/_footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
}
}

// Hi-res logo
#l-footer-logo img {
width : 120px;
height : 23px;
}

// Main navigation section
#l-footer-nav-main {
width: 100%;
Expand Down
13 changes: 8 additions & 5 deletions app/assets/stylesheets/layout/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,19 @@ p.l-header-rename {
}


.l-header-logo,.l-header-nav {
.l-header-logo, .l-header-nav {
display: inline-block;
span.sprite_logo {
display: block;
margin-right:2em;
}
}

.l-header-logo {
float: left;
margin-right: 2em;
}

// Hi-res logo
.l-header-logo img {
width : 170px;
height : 43px;
}

.l-header-nav {
Expand Down
66 changes: 27 additions & 39 deletions app/assets/stylesheets/sprites.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,25 @@
app/assets/images/sprites/sueddeutsche.png (200x30)
app/assets/images/sprites/taz.png (195x30)
app/assets/images/sprites/logo.png (170x43)
app/assets/images/sprites/hochschulanzeiger.png (154x30)
app/assets/images/sprites/logo_small.png (120x23)
app/assets/images/sprites/tagesspiegel.png (116x30)
app/assets/images/sprites/get_share.png (96x96)
app/assets/images/sprites/arte.png (90x30)
app/assets/images/sprites/deutschlandfunk.png (90x30)
app/assets/images/sprites/negative.png (60x60)
app/assets/images/sprites/positive.png (60x60)
app/assets/images/sprites/neutral.png (60x60)
app/assets/images/sprites/positive.png (60x60)
app/assets/images/sprites/negative.png (60x60)
app/assets/images/sprites/pioneerbutton.png (60x59)
app/assets/images/sprites/positive_small.png (30x30)
app/assets/images/sprites/negative_small.png (30x30)
app/assets/images/sprites/positive_small.png (30x30)
app/assets/images/sprites/neutral_small.png (30x30)
app/assets/images/sprites/right_arrow--hover.png (21x28)
app/assets/images/sprites/right_arrow.png (21x28)
app/assets/images/sprites/left_arrow.png (21x28)
app/assets/images/sprites/left_arrow--hover.png (21x28)
app/assets/images/sprites/up_arrow.png (28x21)
app/assets/images/sprites/down_arrow.png (28x21)
app/assets/images/sprites/up_arrow.png (28x21)
app/assets/images/sprites/openbox.png (23x21)
app/assets/images/sprites/box.png (23x20)
app/assets/images/sprites/paper.png (22x18)
app/assets/images/sprites/helper--hover.png (20x20)
app/assets/images/sprites/helper.png (20x20)
app/assets/images/sprites/helper--hover.png (20x20)
app/assets/images/sprites/pencil.png (17x17)
app/assets/images/sprites/briefcase.png (14x12)
app/assets/images/sprites/user.png (13x12)
Expand All @@ -38,37 +32,31 @@
app/assets/stylesheets/sprites.css.scss
Output size:
296x246
296x210
*/
span.sprite_sueddeutsche { width: 200px; height: 30px; background: image-url('sprites.png') 0px 0px no-repeat; }
span.sprite_taz { width: 195px; height: 30px; background: image-url('sprites.png') 0px -30px no-repeat; }
span.sprite_logo { width: 170px; height: 43px; background: image-url('sprites.png') 0px -60px no-repeat; }
span.sprite_hochschulanzeiger { width: 154px; height: 30px; background: image-url('sprites.png') 0px -103px no-repeat; }
span.sprite_logo_small { width: 120px; height: 23px; background: image-url('sprites.png') 0px -133px no-repeat; }
span.sprite_tagesspiegel { width: 116px; height: 30px; background: image-url('sprites.png') 0px -156px no-repeat; }
span.sprite_hochschulanzeiger { width: 154px; height: 30px; background: image-url('sprites.png') 0px -60px no-repeat; }
span.sprite_tagesspiegel { width: 116px; height: 30px; background: image-url('sprites.png') 0px -90px no-repeat; }
span.sprite_get_share { width: 96px; height: 96px; background: image-url('sprites.png') -200px 0px no-repeat; }
span.sprite_arte { width: 90px; height: 30px; background: image-url('sprites.png') -200px -96px no-repeat; }
span.sprite_deutschlandfunk { width: 90px; height: 30px; background: image-url('sprites.png') -200px -126px no-repeat; }
span.sprite_negative { width: 60px; height: 60px; background: image-url('sprites.png') 0px -186px no-repeat; }
span.sprite_positive { width: 60px; height: 60px; background: image-url('sprites.png') -60px -186px no-repeat; }
span.sprite_neutral { width: 60px; height: 60px; background: image-url('sprites.png') -120px -186px no-repeat; }
span.sprite_pioneerbutton { width: 60px; height: 59px; background: image-url('sprites.png') -180px -186px no-repeat; }
span.sprite_positive_small { width: 30px; height: 30px; background: image-url('sprites.png') -200px -156px no-repeat; }
span.sprite_negative_small { width: 30px; height: 30px; background: image-url('sprites.png') -230px -156px no-repeat; }
span.sprite_neutral_small { width: 30px; height: 30px; background: image-url('sprites.png') -260px -156px no-repeat; }
span.sprite_right_arrow:hover { width: 21px; height: 28px; background: image-url('sprites.png') -170px -60px no-repeat; }
span.sprite_right_arrow { width: 21px; height: 28px; background: image-url('sprites.png') -154px -103px no-repeat; }
span.sprite_left_arrow { width: 21px; height: 28px; background: image-url('sprites.png') -175px -103px no-repeat; }
span.sprite_left_arrow:hover { width: 21px; height: 28px; background: image-url('sprites.png') -116px -156px no-repeat; }
span.sprite_up_arrow { width: 28px; height: 21px; background: image-url('sprites.png') -120px -133px no-repeat; }
span.sprite_down_arrow { width: 28px; height: 21px; background: image-url('sprites.png') -148px -133px no-repeat; }
span.sprite_openbox { width: 23px; height: 21px; background: image-url('sprites.png') -176px -133px no-repeat; }
span.sprite_box { width: 23px; height: 20px; background: image-url('sprites.png') -137px -156px no-repeat; }
span.sprite_paper { width: 22px; height: 18px; background: image-url('sprites.png') -160px -156px no-repeat; }
span.sprite_helper:hover { width: 20px; height: 20px; background: image-url('sprites.png') -240px -186px no-repeat; }
span.sprite_helper { width: 20px; height: 20px; background: image-url('sprites.png') -260px -186px no-repeat; }
span.sprite_pencil { width: 17px; height: 17px; background: image-url('sprites.png') -182px -156px no-repeat; }
span.sprite_briefcase { width: 14px; height: 12px; background: image-url('sprites.png') -170px -88px no-repeat; }
span.sprite_user { width: 13px; height: 12px; background: image-url('sprites.png') -184px -88px no-repeat; }
span.sprite_arte { width: 90px; height: 30px; background: image-url('sprites.png') 0px -120px no-repeat; }
span.sprite_deutschlandfunk { width: 90px; height: 30px; background: image-url('sprites.png') -90px -120px no-repeat; }
span.sprite_neutral { width: 60px; height: 60px; background: image-url('sprites.png') 0px -150px no-repeat; }
span.sprite_positive { width: 60px; height: 60px; background: image-url('sprites.png') -60px -150px no-repeat; }
span.sprite_negative { width: 60px; height: 60px; background: image-url('sprites.png') -120px -150px no-repeat; }
span.sprite_pioneerbutton { width: 60px; height: 59px; background: image-url('sprites.png') -180px -150px no-repeat; }
span.sprite_negative_small { width: 30px; height: 30px; background: image-url('sprites.png') -154px -60px no-repeat; }
span.sprite_positive_small { width: 30px; height: 30px; background: image-url('sprites.png') -116px -90px no-repeat; }
span.sprite_neutral_small { width: 30px; height: 30px; background: image-url('sprites.png') -146px -90px no-repeat; }
span.sprite_down_arrow { width: 28px; height: 21px; background: image-url('sprites.png') -200px -96px no-repeat; }
span.sprite_up_arrow { width: 28px; height: 21px; background: image-url('sprites.png') -228px -96px no-repeat; }
span.sprite_openbox { width: 23px; height: 21px; background: image-url('sprites.png') -256px -96px no-repeat; }
span.sprite_box { width: 23px; height: 20px; background: image-url('sprites.png') -176px -90px no-repeat; }
span.sprite_paper { width: 22px; height: 18px; background: image-url('sprites.png') -180px -120px no-repeat; }
span.sprite_helper { width: 20px; height: 20px; background: image-url('sprites.png') -240px -150px no-repeat; }
span.sprite_helper:hover { width: 20px; height: 20px; background: image-url('sprites.png') -260px -150px no-repeat; }
span.sprite_pencil { width: 17px; height: 17px; background: image-url('sprites.png') -279px -96px no-repeat; }
span.sprite_briefcase { width: 14px; height: 12px; background: image-url('sprites.png') -184px -60px no-repeat; }
span.sprite_user { width: 13px; height: 12px; background: image-url('sprites.png') -184px -72px no-repeat; }
3 changes: 2 additions & 1 deletion app/views/layouts/application.html.slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ html<> class='no-js' lang=I18n.locale
= render '/layouts/partials/news_header'
.l-header
.l-header-top
/ Fairmondo logo
.l-header-logo
a href='/'
span.sprite_logo
= image_tag 'logo.png', alt: t('common.fairmondo')

/ Temporary rename message
p.l-header-rename
Expand Down
8 changes: 5 additions & 3 deletions app/views/layouts/application_reduced.html.slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ html<> class='no-js' lang=I18n.locale
- if msg && type != "timedout" && !msg.empty?
= render layout: "notice_layout", locals: { type: type } do
= msg
/= render "/layouts/partials/news_header"

.l-header
.l-header-top
/ Fairmondo logo
.l-header-logo
a href="/"
span.sprite_logo
a href='/'
= image_tag 'logo.png', alt: t('common.fairmondo')

.l-main role="main"
= yield

Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/partials/_footer.html.slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#l-footer-nav-left
/ Logo
a#l-footer-logo href='/'
span.sprite_logo_small
= image_tag 'logo_small.png', alt: t('common.fairmondo_name')

/ Social media buttons
- if local_assigns.has_key?(:with_social_media_buttons) && with_social_media_buttons
Expand Down
2 changes: 1 addition & 1 deletion app/views/styleguides/2.html.slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
= kss_specimen
= kss_block 'Sprites', background: "white" do |modifier|
p
span.sprite_logo
span.sprite_pioneerbutton
1 change: 1 addition & 0 deletions config/locales/de.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ de:
common:
brand: "www.fairmondo.de"
fairmondo: "Fairmondo – Gutes einfach entdecken"
fairmondo_name: "Fairmondo"
claim: "dreh' das Spiel um"
fn_footer_greeting: "Dein Fairmondo-Team"
fn_legal_footer:
Expand Down

0 comments on commit e25ba63

Please sign in to comment.