mirror of https://github.com/go-gitea/gitea.git
Merge remote-tracking branch 'origin/master'
Conflicts: public/js/app.jspull/197/head
commit
7f1fdf441f
|
@ -647,6 +647,9 @@ html, body {
|
|||
padding: 30px 30px 50px;
|
||||
border: none;
|
||||
background-color: #FFF;
|
||||
overflow: auto;
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
}
|
||||
|
||||
.file-content .file-body pre {
|
||||
|
|
|
@ -74,15 +74,13 @@ var Gogits = {
|
|||
var $lineNums = $pre.parent().siblings('.lines-num');
|
||||
if($lineNums.length > 0){
|
||||
var nums = $pre.find('ol.linenums > li').length;
|
||||
for (var i = 1; i <= nums; i++) {
|
||||
$lineNums.append('<span id="L' + i + '" rel=".L' + i + '">' + i + '</span>');
|
||||
for(var i=0;i < nums;i++){
|
||||
$lineNums.append('<span id="L'+i+'" rel=".L'+i+'">'+(i+1)+'</span>');
|
||||
}
|
||||
|
||||
var last;
|
||||
$(document).on('click', '.lines-num span', function(){
|
||||
var $e = $(this);
|
||||
console.log($e.parent().siblings('.lines-code').find('ol.linenums > ' + $e.attr('rel')));
|
||||
console.log('ol.linenums > ' + $e.attr('rel'));
|
||||
if(last){
|
||||
last.removeClass('active');
|
||||
}
|
||||
|
@ -183,7 +181,6 @@ function initUserSetting() {
|
|||
}
|
||||
|
||||
function initRepository() {
|
||||
(function () {
|
||||
var $guide = $('.guide-box');
|
||||
if ($guide.length) {
|
||||
var $url = $('#guide-clone-url');
|
||||
|
@ -198,7 +195,6 @@ function initRepository() {
|
|||
}).eq(0).trigger("click");
|
||||
// todo copy to clipboard
|
||||
}
|
||||
})();
|
||||
}
|
||||
|
||||
(function ($) {
|
||||
|
|
Loading…
Reference in New Issue