diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2017-12-16 14:22:00 +0100 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@anduin.net> | 2017-12-16 14:22:00 +0100 |
| commit | 302aadd8bfd4030d9b2a71d5121fd650c0918338 (patch) | |
| tree | 104a780a180e93dce09b435c0d5c5908e81a4b1c /app/assets/stylesheets/hmno_header.scss | |
| parent | 3c4b7f712d61a9006f90960273fdefcb0c7ca371 (diff) | |
| parent | 734c8519b5cc7d69541726d6a7e15b917217756d (diff) | |
| download | hmnoweb-302aadd8bfd4030d9b2a71d5121fd650c0918338.tar.gz hmnoweb-302aadd8bfd4030d9b2a71d5121fd650c0918338.tar.bz2 hmnoweb-302aadd8bfd4030d9b2a71d5121fd650c0918338.zip | |
Merge branch 'permanent-merch-link'
Diffstat (limited to 'app/assets/stylesheets/hmno_header.scss')
| -rw-r--r-- | app/assets/stylesheets/hmno_header.scss | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/app/assets/stylesheets/hmno_header.scss b/app/assets/stylesheets/hmno_header.scss index f35eea0..8d822c0 100644 --- a/app/assets/stylesheets/hmno_header.scss +++ b/app/assets/stylesheets/hmno_header.scss @@ -1,19 +1,41 @@ @import "color_scheme"; #header { + background: { + color: $header-bg; + image: image_url("header-metal-bg.jpg"); + repeat: repeat-y; + } + + height: 100px; + border-bottom: 1px solid $fg; + margin-bottom: $spacing; + #logo { - background: { - color: $header-bg; - image: image_url("header-metal-bg.jpg"); - repeat: no-repeat; + width: 200px; + float: left; + } + + #merchlink { + width: 200px; + float: right; + text-align: center; + + img { + display: block; + margin-top: 0; + } + + a { + color: #ddf; + font-weight: bold; } - border-bottom: 1px solid $fg; } #menu { - position: relative; text-align: center; - top: -2em; + font-size: 120%; + font-weight: bold; ul { padding: 0; |