Commit 515ed7755e2419955b069c33da878efadbbff6c2
1 parent
a67f3c39
Exists in
spb-stable
and in
3 other branches
Respect default theme settings. Fixed sign-in button on publica page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
3 changed files
with
11 additions
and
10 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -333,12 +333,6 @@ table { | @@ -333,12 +333,6 @@ table { | ||
| 333 | min-height: 100px; | 333 | min-height: 100px; |
| 334 | } | 334 | } |
| 335 | 335 | ||
| 336 | -.navbar-gitlab .navbar-inner .nav > li .btn-sign-in { | ||
| 337 | - @extend .btn-new; | ||
| 338 | - padding: 5px 15px; | ||
| 339 | - text-shadow: none; | ||
| 340 | -} | ||
| 341 | - | ||
| 342 | .broadcast-message { | 336 | .broadcast-message { |
| 343 | padding: 10px; | 337 | padding: 10px; |
| 344 | text-align: center; | 338 | text-align: center; |
| @@ -390,3 +384,9 @@ table { | @@ -390,3 +384,9 @@ table { | ||
| 390 | margin-bottom: 15px; | 384 | margin-bottom: 15px; |
| 391 | } | 385 | } |
| 392 | } | 386 | } |
| 387 | + | ||
| 388 | +.btn-sign-in { | ||
| 389 | + margin-top: 7px; | ||
| 390 | + text-shadow: none; | ||
| 391 | +} | ||
| 392 | + |
app/views/layouts/_public_head_panel.html.haml
| @@ -12,11 +12,12 @@ | @@ -12,11 +12,12 @@ | ||
| 12 | - else | 12 | - else |
| 13 | Public Projects | 13 | Public Projects |
| 14 | 14 | ||
| 15 | - %ul.nav | 15 | + .pull-right |
| 16 | + = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in btn-new' | ||
| 17 | + | ||
| 18 | + %ul.nav.navbar-nav | ||
| 16 | %li | 19 | %li |
| 17 | %a | 20 | %a |
| 18 | %div.hide.turbolink-spinner | 21 | %div.hide.turbolink-spinner |
| 19 | %i.icon-refresh.icon-spin | 22 | %i.icon-refresh.icon-spin |
| 20 | Loading... | 23 | Loading... |
| 21 | - %li | ||
| 22 | - = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in' |
lib/gitlab/theme.rb