From a995986558ab64625c17f956e3448f1369aa56e4 Mon Sep 17 00:00:00 2001 From: MBSchneider Date: Thu, 17 Apr 2014 14:34:21 -0700 Subject: [PATCH] Navbar updates as requested in #58 --- app/assets/stylesheets/_variables.scss | 4 ++-- app/views/site/_navbar.html.haml | 3 ++- config/locales/en.yml | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss index 812870f3..0aad43ac 100644 --- a/app/assets/stylesheets/_variables.scss +++ b/app/assets/stylesheets/_variables.scss @@ -23,7 +23,7 @@ $flash-success-text-color: #4a4; /*---[ layout ]-------------------------------------------------------------*/ -$navbar-height: 60px; +$navbar-height: 65px; $sidebar-width: 300px; $main-width: 700px; @@ -31,7 +31,7 @@ $navbar-bgcolor: #333; $navbar-bgcolor-hover: rgba(85, 85, 85, 0.4); $navbar-gradient1: #333; $navbar-gradient2: #222; -$navbar-link-color: #999; +$navbar-link-color: #d3d3d3; $navbar-link-hover: #fff; $navbar-active-bgcolor: #1a1a1a; $navbar-active-color: #fff; diff --git a/app/views/site/_navbar.html.haml b/app/views/site/_navbar.html.haml index 2bf7d6ee..19a5f2ec 100644 --- a/app/views/site/_navbar.html.haml +++ b/app/views/site/_navbar.html.haml @@ -14,9 +14,10 @@ #navbar-menu %ul %li{:class => link_class[:events]}= link_to t('.menu.events'), events_path + %li= link_to t('.menu.new_event'), new_event_path %li{:class => link_class[:organizations]}= link_to t('.menu.organizations'), organizations_path %li{:class => link_class[:venues]}= link_to t('.menu.venues'), venues_path - %li= link_to t('.menu.new_event'), new_event_path + %li= link_to t('.menu.adding-events'), 'http://activatehub.org/adding-events' #navbar-search = form_tag search_events_path, :method => :get do diff --git a/config/locales/en.yml b/config/locales/en.yml index 69da1bbb..bebe77a0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -25,6 +25,8 @@ en: organizations: "Organizations" venues: "Venues" new_event: "Add Event" + adding-events: "Adding Events Tutorial" + search: placeholder: "Search events..." welcome: