diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb new file mode 100644 index 000000000..c1877373c --- /dev/null +++ b/app/views/layouts/_navbar.html.erb @@ -0,0 +1,30 @@ + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 76428da4e..11a4d8cc7 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,6 +1,9 @@ - + + + + <%= "software.opensuse.org: #{@page_title}" %> @@ -9,6 +12,8 @@ <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "/chameleon/css/app.css" %> + <%= javascript_include_tag "/chameleon/js/app.js" %> <%= javascript_include_tag "application" %> <%= javascript_include_tag "/themes/bento/js/l10n/global-navigation-data-#{@lang || "en"}.js" %> @@ -54,19 +59,7 @@ - + <%= render :partial => "layouts/navbar" %> <% unless flash.blank? %> <%= render(:partial => "layouts/flash", :object => flash) %> diff --git a/public/chameleon b/public/chameleon index f2f0d9976..6bd4d5f1a 160000 --- a/public/chameleon +++ b/public/chameleon @@ -1 +1 @@ -Subproject commit f2f0d997652a75883b2c0f4753073df063ba3204 +Subproject commit 6bd4d5f1af63b9a90193bcc154f0b3af34e2e384