diff options
| -rw-r--r-- | app/helpers/nav_helper.rb | 1 | ||||
| -rw-r--r-- | app/views/peek/views/_pg.html.haml | 19 | ||||
| -rw-r--r-- | vendor/assets/stylesheets/peek.scss | 10 |
3 files changed, 20 insertions, 10 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 88dfe78c90c..833d3c36b28 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -27,6 +27,7 @@ module NavHelper def nav_header_class class_name = '' class_name << " with-horizontal-nav" if defined?(nav) && nav + class_name << " with-peek" if peek_enabled? class_name end diff --git a/app/views/peek/views/_pg.html.haml b/app/views/peek/views/_pg.html.haml index e789e0c5cb5..7a1901eb7d2 100644 --- a/app/views/peek/views/_pg.html.haml +++ b/app/views/peek/views/_pg.html.haml @@ -1,15 +1,14 @@ %strong %a#peek-show-queries{ href: '#' } %span{ data: { defer_to: "#{view.defer_key}-duration" }}... - / + \/ %span{ data: { defer_to: "#{view.defer_key}-calls" }}... - / - #modal-peek-pg-queries.modal{ tabindex: -1 } - .modal-dialog - #modal-peek-pg-queries-content.modal-content - .modal-header - %a.close{ href: "#", "data-dismiss" => "modal" } × - %h4 - SQL queries - .modal-body{ data: { defer_to: "#{view.defer_key}-queries" }}... +#modal-peek-pg-queries.modal{ tabindex: -1 } + .modal-dialog + #modal-peek-pg-queries-content.modal-content + .modal-header + %a.close{ href: "#", "data-dismiss" => "modal" } × + %h4 + SQL queries + .modal-body{ data: { defer_to: "#{view.defer_key}-queries" }}... pg diff --git a/vendor/assets/stylesheets/peek.scss b/vendor/assets/stylesheets/peek.scss index b4b4f6d158f..224ecc4245e 100644 --- a/vendor/assets/stylesheets/peek.scss +++ b/vendor/assets/stylesheets/peek.scss @@ -1,6 +1,10 @@ //= require peek/views/performance_bar //= require peek/views/rblineprof +header.navbar-gitlab.with-peek { + top: 35px; +} + #peek { background: #000; height: 35px; @@ -57,6 +61,12 @@ color: #fff; } + table { + strong { + color: #000; + } + } + .view { margin-right: 15px; float: left; |