From 70af6d0c3549aa7f33487bf068816abf9b15867e Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 17 Nov 2015 16:04:58 +0900 Subject: [PATCH 1/3] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 612bc439f..4bb3a82d1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) ========= -GitBucket is the easily installable GitHub clone powered by Scala. - +GitBucket is a GitHub clone powered by Scala which has easy installation and high extendability. Features -------- From 495d8069f51235ece7fb057a0bcb78d5633ae556 Mon Sep 17 00:00:00 2001 From: uli-heller Date: Tue, 17 Nov 2015 09:51:50 +0100 Subject: [PATCH 2/3] extensibility is probably the right word? --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4bb3a82d1..82fb68596 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) ========= -GitBucket is a GitHub clone powered by Scala which has easy installation and high extendability. +GitBucket is a GitHub clone powered by Scala which has easy installation and high extensibility. Features -------- From 121110aedebf5c413e3fbbe992870184bcd5eed9 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 17 Nov 2015 23:19:08 +0900 Subject: [PATCH 3/3] Fix markdown header style --- src/main/twirl/gitbucket/core/repo/blob.scala.html | 2 +- src/main/twirl/gitbucket/core/repo/editor.scala.html | 2 +- src/main/twirl/gitbucket/core/repo/files.scala.html | 2 +- src/main/webapp/assets/common/css/gitbucket.css | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html index 9b3beade8..596a74ade 100644 --- a/src/main/twirl/gitbucket/core/repo/blob.scala.html +++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html @@ -69,7 +69,7 @@ @if(content.viewType == "text"){ @defining(isRenderable(pathList.reverse.head)){ isRrenderable => @if(!isBlame && isRrenderable) { -
+
@renderMarkup(pathList, content.content.get, branch, repository, false, false, true)
} else { diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html index fc5b7c6a8..0bbc1f00f 100644 --- a/src/main/twirl/gitbucket/core/repo/editor.scala.html +++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html @@ -130,7 +130,7 @@ $(function(){ enableTaskList : false }, function(data){ $('#preview').empty().append( - $('
').html(data)); + $('
').html(data)); prettyPrint(); }); } else { diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index dbfaec242..3f1c7e390 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -127,7 +127,7 @@ @readme.map { case(filePath, content) =>
@filePath.reverse.head
-
@renderMarkup(filePath, content, branch, repository, false, false, true)
+
@renderMarkup(filePath, content, branch, repository, false, false, true)
} } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index cc9f069c2..570230e61 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -1690,15 +1690,13 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child { } .markdown-head { - left: -18px; - padding-left: 18px; position: relative; line-height: 1.7; } a.markdown-anchor-link { position: absolute; - left: 0px; + left: -18px; display: none; color: #999; /* From octicon style */