diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 21 | ||||
| -rw-r--r-- | app/assets/images/hypestore-logo.png | bin | 0 -> 13315 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/_color_scheme.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/hmno_header.scss | 36 | ||||
| -rw-r--r-- | app/views/refinery/_header.html.erb | 4 |
6 files changed, 46 insertions, 29 deletions
@@ -24,9 +24,7 @@ group :deployment do gem 'capistrano', '~> 3.3.4' gem 'capistrano-bundler' gem 'capistrano-rails' - gem 'capistrano-postgresql', - :git => 'https://github.com/capistrano-plugins/capistrano-postgresql.git', - :branch => 'feature/psql_without_sudo' #'~>4.0' + gem 'capistrano-postgresql', '~> 4.6.1' end # Gems used only for assets and not required diff --git a/Gemfile.lock b/Gemfile.lock index a385121..ec3b52a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,14 +7,6 @@ GIT refinerycms-pages (~> 2.1.0) GIT - remote: https://github.com/capistrano-plugins/capistrano-postgresql.git - revision: fcdd992993c146e382bdd86ec6e31cf97b5db387 - branch: feature/psql_without_sudo - specs: - capistrano-postgresql (4.6.0) - capistrano (>= 3.0) - -GIT remote: https://github.com/refinery/refinerycms-acts-as-indexed.git revision: 47cd0b6427a1ee7c513124c7a56c7cb5f93716f6 branch: 1-0-stable @@ -87,6 +79,8 @@ GEM capistrano-bundler (1.1.2) capistrano (~> 3.0) sshkit (~> 1.2) + capistrano-postgresql (4.6.1) + capistrano (>= 3.0) capistrano-rails (1.1.1) capistrano (~> 3.1) capistrano-bundler (~> 1.1) @@ -109,7 +103,7 @@ GEM multi_json (~> 1.0) rack erubis (2.7.0) - execjs (2.0.2) + execjs (2.7.0) filters_spam (0.3) friendly_id (4.0.10.1) activerecord (>= 3.0, < 4.0) @@ -122,7 +116,7 @@ GEM jquery-rails (2.3.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (1.8.6) lorem (0.1.2) mail (2.5.4) mime-types (~> 1.16) @@ -254,9 +248,8 @@ GEM polyglot (>= 0.3.1) truncate_html (0.9.3) tzinfo (0.3.46) - uglifier (2.0.1) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.0.2) + execjs (>= 0.3.0, < 3) warden (1.2.3) rack (>= 1.0) will_paginate (3.0.7) @@ -270,7 +263,7 @@ DEPENDENCIES bcrypt-ruby (~> 3.0.0) capistrano (~> 3.3.4) capistrano-bundler - capistrano-postgresql! + capistrano-postgresql (~> 4.6.1) capistrano-rails coffee-rails (~> 3.2) jquery-rails (~> 2.3.0) diff --git a/app/assets/images/hypestore-logo.png b/app/assets/images/hypestore-logo.png Binary files differnew file mode 100644 index 0000000..26e8f4f --- /dev/null +++ b/app/assets/images/hypestore-logo.png diff --git a/app/assets/stylesheets/_color_scheme.scss b/app/assets/stylesheets/_color_scheme.scss index 63e3058..c64d2bf 100644 --- a/app/assets/stylesheets/_color_scheme.scss +++ b/app/assets/stylesheets/_color_scheme.scss @@ -19,11 +19,11 @@ $link-fg: $primary-5; //lighten($primary-4, 5%); $link-visited-fg: $link-fg; $link-hover-fg: lighten($link-fg, 5%); -$selected-menu-bg: $primary-4; -$selected-menu-fg: $primary-2; -$hover-menu-bg: $selected-menu-bg; -$hover-menu-fg: $selected-menu-fg; -$menu-bg: $primary-1; +$hover-menu-bg: $primary-4; +$hover-menu-fg: $primary-2; +$selected-menu-bg: darken($hover-menu-bg, 10%); +$selected-menu-fg: $hover-menu-fg; +$menu-bg: rgba(0,0,0,0.4); $menu-fg: $primary-5; $header-bg: black; 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; diff --git a/app/views/refinery/_header.html.erb b/app/views/refinery/_header.html.erb index 8b0c424..7215e57 100644 --- a/app/views/refinery/_header.html.erb +++ b/app/views/refinery/_header.html.erb @@ -1,4 +1,8 @@ <div id='logo'> <%= link_to image_tag("logo.png", :alt => "Heavymetal.no"), refinery.root_path %> </div> +<div id="merchlink"> + <%= link_to image_tag("hypestore-logo.png", alt: "Hypestore", size: '197x75'), 'https://hypestore.no/collections/artistmerch-1' %> + <%= link_to "HMNO Merch!", 'https://hypestore.no/collections/artistmerch-1' %> +</div> <%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %> |
