Commit 515ed775 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Respect default theme settings. Fixed sign-in button on publica page

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent a67f3c39
...@@ -333,12 +333,6 @@ table { ...@@ -333,12 +333,6 @@ table {
min-height: 100px; min-height: 100px;
} }
.navbar-gitlab .navbar-inner .nav > li .btn-sign-in {
@extend .btn-new;
padding: 5px 15px;
text-shadow: none;
}
.broadcast-message { .broadcast-message {
padding: 10px; padding: 10px;
text-align: center; text-align: center;
...@@ -390,3 +384,9 @@ table { ...@@ -390,3 +384,9 @@ table {
margin-bottom: 15px; margin-bottom: 15px;
} }
} }
.btn-sign-in {
margin-top: 7px;
text-shadow: none;
}
...@@ -12,11 +12,12 @@ ...@@ -12,11 +12,12 @@
- else - else
Public Projects Public Projects
%ul.nav .pull-right
= link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in btn-new'
%ul.nav.navbar-nav
%li %li
%a %a
%div.hide.turbolink-spinner %div.hide.turbolink-spinner
%i.icon-refresh.icon-spin %i.icon-refresh.icon-spin
Loading... Loading...
%li
= link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in'
...@@ -15,7 +15,7 @@ module Gitlab ...@@ -15,7 +15,7 @@ module Gitlab
COLOR => "ui_color" COLOR => "ui_color"
} }
id ||= 1 id ||= Gitlab.config.gitlab.default_theme
return themes[id] return themes[id]
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment