From 071de30f80ea471c48f52ff1f5d728089b75a8c0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 29 Nov 2013 13:31:57 +0200 Subject: [PATCH] Fix app theme being ignored for public projects Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/common.scss | 1 + app/views/layouts/public.html.haml | 2 +- app/views/layouts/public_projects.html.haml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index ce897292c37..b57fe826b09 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -350,6 +350,7 @@ table { .navbar-gitlab .navbar-inner .nav > li .btn-sign-in { @extend .btn-new; padding: 5px 15px; + text-shadow: none; } .broadcast-message { diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index f922dcc4203..8f490f61a9c 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -1,7 +1,7 @@ !!! 5 %html{ lang: "en"} = render "layouts/head", title: "Public Projects" - %body{class: "ui_mars application", :'data-page' => body_data_page} + %body{class: "#{app_theme} application", :'data-page' => body_data_page} - if current_user = render "layouts/head_panel", title: "Public Projects" - else diff --git a/app/views/layouts/public_projects.html.haml b/app/views/layouts/public_projects.html.haml index cfe6a63055a..1e8814134f5 100644 --- a/app/views/layouts/public_projects.html.haml +++ b/app/views/layouts/public_projects.html.haml @@ -1,7 +1,7 @@ !!! 5 %html{ lang: "en"} = render "layouts/head", title: @project.name_with_namespace - %body{class: "ui_mars application", :'data-page' => body_data_page} + %body{class: "#{app_theme} application", :'data-page' => body_data_page} = render "layouts/public_head_panel" %nav.main-nav .container= render 'layouts/nav/project'