2016 design

app/views/layouts/application.html.haml

@@ -20,19 +20,18 @@
 	%body{ class: page_style }
 		= render 'shared/navbar'
 		%main#main
+			- if content_for?(:side_bar)
+				%nav#side-bar
+					= yield :side_bar
 			- flash.each do |key, msg|
 				= content_tag :div, msg, :id => key
-			%header#banner
-				= yield :banner
+			%header#banner=yield :banner
 			- if @submenu
 				=row do
 					= columns(medium: 12) do
 						%nav.sub-menu
 							- @submenu.each do |href,key|
 								%a{href: href, class: request.fullpath.start_with?(href) ? 'current' : nil}=_"menu.submenu.#{key}"
-			- if content_for?(:side_bar)
-				%aside#side-bar
-					= yield :side_bar
 			- if has_content?
 				#content=yield
 			- else