diff options
| -rw-r--r-- | app/assets/javascripts/main.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/files.scss | 37 | ||||
| -rw-r--r-- | app/views/projects/blob/_text.html.haml | 13 |
3 files changed, 25 insertions, 27 deletions
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 9cf4dba815b..3f7656de5c8 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -59,6 +59,8 @@ $ -> # Click a .one_click_select field, select the contents $(".one_click_select").on 'click', -> $(@).select() + hljs.initHighlightingOnLoad() + $('.remove-row').bind 'ajax:success', -> $(this).closest('li').fadeOut() diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss index 11bb715f7b5..121bb8c9138 100644 --- a/app/assets/stylesheets/generic/files.scss +++ b/app/assets/stylesheets/generic/files.scss @@ -144,7 +144,7 @@ &.code { padding: 0; - table.lines { + .highlighted-data { border: none; box-shadow: none; margin: 0px; @@ -158,47 +158,34 @@ font-size: 12px !important; line-height: 16px !important; margin: 0; - padding: 10px 0; } - td { - border: none; - margin: 0; - padding: 0; - vertical-align: top; - &:first-child { - background: #eee; - width: 50px; - } - &:last-child { - } - } - tr:hover { - background: none; + .hljs { + padding: 0; } - pre.line_numbers { - color: #666; - padding: 10px 6px 10px 0; + .line-numbers { + padding: 10px; text-align: right; - background: #EEE; + float: left; + width: 60px; a { - color: #666; + display: block; + font-size: 12px !important; + line-height: 16px !important; i { display: none; - font-size: 14px; - line-height: 14px; } + &:hover i { - display: inherit; + display: inline; } } } .highlight { - border-left: 1px solid #DEE2E3; overflow: auto; overflow-y: hidden; diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml index d03b53888ae..d0c9a09dd40 100644 --- a/app/views/projects/blob/_text.html.haml +++ b/app/views/projects/blob/_text.html.haml @@ -8,7 +8,16 @@ - else .file-content.code - unless blob.empty? - %div{class: user_color_scheme_class} - = raw blob.colorize(formatter: :gitlab) + %div.highlighted-data{class: user_color_scheme_class} + .line-numbers + - blob.data.lines.size.times do |index| + - i = index + 1 + = link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do + %i.icon-link + = i + .highlight + %pre + %code + = raw blob.data - else %p.nothing_here_message Empty file |