diff options
| author | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-10-26 14:33:41 +0100 |
|---|---|---|
| committer | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-10-26 14:33:41 +0100 |
| commit | 837f41d664c5e092bf946a1d1d81bdf7f136f2ef (patch) | |
| tree | 93aa9956805d44816e21fda5b3cd891cb6850f23 | |
| parent | d4facdd8ea9e263a0b358ae7f4702820ac9d5fac (diff) | |
add logo to navbar
| -rw-r--r-- | source/_navigation.html.haml | 2 | ||||
| -rw-r--r-- | source/images/sublab-logo-trans-small.png | bin | 0 -> 4315 bytes | |||
| -rw-r--r-- | source/index.html.haml | 2 | ||||
| -rw-r--r-- | source/layouts/layout.haml | 8 | ||||
| -rw-r--r-- | source/stylesheets/custom.scss | 12 |
5 files changed, 18 insertions, 6 deletions
diff --git a/source/_navigation.html.haml b/source/_navigation.html.haml index d46e7ec..c64f629 100644 --- a/source/_navigation.html.haml +++ b/source/_navigation.html.haml @@ -2,7 +2,7 @@ %nav.top-bar{"role" => "navigation", "data-topbar" => true, "data-options" => "is_hover: false"} %ul.title-area %li.name - = link_to("sublab-logo", "/") + = link_to("", "/") %li.toggle-topbar.menu-icon %a{href: '#'} %span diff --git a/source/images/sublab-logo-trans-small.png b/source/images/sublab-logo-trans-small.png Binary files differnew file mode 100644 index 0000000..02c40e4 --- /dev/null +++ b/source/images/sublab-logo-trans-small.png diff --git a/source/index.html.haml b/source/index.html.haml index 947653e..f05a832 100644 --- a/source/index.html.haml +++ b/source/index.html.haml @@ -3,7 +3,7 @@ title: sublab - Ein Hackerspace in Leipzig --- .row .columns - %h2 Ein Hackerspace in Leipzig + %h2 sublab - Ein Hackerspace in Leipzig %p.lead Das sublab ist ein = succeed "." do diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml index cd62804..610d537 100644 --- a/source/layouts/layout.haml +++ b/source/layouts/layout.haml @@ -12,10 +12,10 @@ = javascript_include_tag "modernizr", "all" %body{:class => page_classes} / header - %header - #logo - - link_to '/index.html' do - = image_tag 'sublab-logo.png', class: "img-responsive" + -#%header + -# #logo + -# - link_to '/index.html' do + -# = image_tag 'sublab-logo.png', class: "img-responsive" / main navigation = partial "navigation" / content diff --git a/source/stylesheets/custom.scss b/source/stylesheets/custom.scss index a9f195f..df1504a 100644 --- a/source/stylesheets/custom.scss +++ b/source/stylesheets/custom.scss @@ -6,3 +6,15 @@ @include grid-column($columns: 1.7); } } + +// sublab logo +.top-bar .name a:before { + background-image: url('../images/sublab-logo-trans-small.png'); + background-repeat: no-repeat; + content: ""; + display: inline-block; + height: 48px; + margin-right: 10px; + position: relative; + width: 60px; +} |
