Skip to content

Navbar updates as requested in #58 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MBSchneider wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Navbar updates as requested in #58 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/assets/stylesheets/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ $flash-success-text-color: #4a4;

/*---[ layout ]-------------------------------------------------------------*/

$navbar-height: 60px;
$navbar-height: 65px;
$sidebar-width: 300px;
$main-width: 700px;

$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;
Expand Down
3 changes: 2 additions & 1 deletion app/views/site/_navbar.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ en:
organizations: "Organizations"
venues: "Venues"
new_event: "Add Event"
adding-events: "Adding Events Tutorial"

search:
placeholder: "Search events..."
welcome:
Expand Down