diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-10 13:58:52 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-10 13:58:52 +0200 |
| commit | 515ed7755e2419955b069c33da878efadbbff6c2 (patch) | |
| tree | 2f38737271221084928a50b4b9d7e070038aa39b /app | |
| parent | a67f3c393f223114a8682f5409700a80a5ee7cc4 (diff) | |
| download | gitlab-ce-515ed7755e2419955b069c33da878efadbbff6c2.tar.gz | |
Respect default theme settings. Fixed sign-in button on publica page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/common.scss | 12 | ||||
| -rw-r--r-- | app/views/layouts/_public_head_panel.html.haml | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 4fb12d923d1..2675c1545c6 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -333,12 +333,6 @@ table { min-height: 100px; } -.navbar-gitlab .navbar-inner .nav > li .btn-sign-in { - @extend .btn-new; - padding: 5px 15px; - text-shadow: none; -} - .broadcast-message { padding: 10px; text-align: center; @@ -390,3 +384,9 @@ table { margin-bottom: 15px; } } + +.btn-sign-in { + margin-top: 7px; + text-shadow: none; +} + diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml index 3c4bd857c22..7d188fb28e4 100644 --- a/app/views/layouts/_public_head_panel.html.haml +++ b/app/views/layouts/_public_head_panel.html.haml @@ -12,11 +12,12 @@ - else 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 %a %div.hide.turbolink-spinner %i.icon-refresh.icon-spin Loading... - %li - = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in' |