New look

app/views/shared/_footer.html.haml

@@ -1,5 +1,6 @@
 %footer
-	%p
-		= link_to 'https://github.com/diowa/ruby2-rails4-bootstrap-heroku' do
-			%i.icon-github
-			diowa/ruby2-rails4-bootstrap-heroku
+:javascript
+	#{yield :scripts}
+	$(function(){
+		#{yield :dom_ready}
+	});

app/views/shared/_navbar.html.haml

@@ -1,37 +1,23 @@
-
-%nav.top-bar.row{ data: { :topbar => '' } }
-	#nav-inner
-		%ul.title-area
-			/ Title Area
-			%li.name
-				%h1
-					%a{href: "/"} Bike!Bike!
-			/ Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone
-			%li.toggle-topbar.menu-icon
-				%a{href: "#"}
-					%span Menu
-		%section.top-bar-section
-			/ Left Nav Section
-			%ul.left
-				%li.active
-					= link_to (_'Conferences'), :controller => :conferences
-				%li
-					= link_to (_'Organizations'), :controller =>  :organizations
-				%li
-					= link_to (_'Resources'), '/resources'
-				/ Right Nav Section
-			%ul.right
-				- if current_user
-					%li.has-form.sign-out.hide-for-small
-						= link_to (_"Sign_Out"), :logout, method: :post, :class => 'button'
-					%li.user-profile.has-dropdown
-						= link_to current_user do
-							= image_tag(current_user.avatar_url(:icon))
-							%span
-								%span.show-for-small=current_user.username
-						%ul.dropdown
-							%li= link_to 'View Profile', current_user
-							%li= link_to 'Edit Profile', edit_user_path(current_user.id)
-				- else
-					%li.has-form.sign-in
-						= link_to (_"Sign_In"), :login, :class => 'button'
+%nav#main-nav
+	= link_to '/resources', :class => ['button', 'logo'] do
+		= image_tag('logo.png', class: 'logo')
+		= image_tag('logo-text.png', class: 'logo-text')
+	= link_to (_'Conferences'), {:controller => :conferences}, {:class => ['button', 'conference']}
+	= link_to (_'Organizations'), {:controller => :organizations}, {:class => ['button', 'organization']}
+	= link_to (_'Zine'), 'http://zinezine.bikebike.org', :class => ['button', 'article']
+	%p
+		Bike!Bike! is an international annual gathering organized by and for community bicycle projects. The conference is a space for participants from shops and related advocacy groups to converge in a different city each year over a 4 day period to have workshops and strengthen our social network.
+	-#- if current_user
+	-#	%li.has-form.sign-out.hide-for-small
+	-#		= link_to (_"Sign_Out"), :logout, method: :post, :class => 'button'
+	-#	%li.user-profile.has-dropdown
+	-#		= link_to current_user do
+	-#			= image_tag(current_user.avatar_url(:icon))
+	-#			%span
+	-#				%span.show-for-small=current_user.username
+	-#		%ul.dropdown
+	-#			%li= link_to 'View Profile', current_user
+	-#			%li= link_to 'Edit Profile', edit_user_path(current_user.id)
+	-#- else
+	-#	%li.has-form.sign-in
+	-#		= link_to (_"Sign_In"), :login, :class => 'button'