summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom <tw201207@gmail.com>2014-10-29 14:50:52 +0100
committerTom <tw201207@gmail.com>2014-11-06 18:06:47 +0100
commit599827eff1cedf6141b15f7fdbbcfed4b23ae86a (patch)
treeccdd260d0fc2cad1c5967f0c7a1360a89c4c71c1 /src
parentf0ebfe6152959fda74bf7a5436bd765a0a231f6b (diff)
downloadgitblit-599827eff1cedf6141b15f7fdbbcfed4b23ae86a.tar.gz
gitblit-599827eff1cedf6141b15f7fdbbcfed4b23ae86a.zip
CSS changes.
- As discussed: - gutter a little lighter, context lines nearly but not quite white. - 2px left (and right) padding in the code column. - I also noticed that somehow all lines were spaced vertically a little wider than on dev.gitblit. Added cellpadding='0' to get the old line height again.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java4
-rw-r--r--src/main/resources/gitblit.css8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
index b18093ff..5de9e50a 100644
--- a/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
+++ b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
@@ -210,7 +210,7 @@ public class GitBlitDiffFormatter extends DiffFormatter {
}
StringBuilder sb = new StringBuilder(MessageFormat.format("<div class='header'><div class=\"diffHeader\" id=\"n{0}\"><i class=\"icon-file\"></i> ", id));
sb.append(StringUtils.escapeForHtml(path, false)).append("</div></div>");
- sb.append("<div class=\"diff\"><table><tbody>\n");
+ sb.append("<div class=\"diff\"><table cellpadding='0'><tbody>\n");
os.write(sb.toString().getBytes());
}
// Keep formatting, but if off, don't produce anything anymore. We just keep on counting.
@@ -459,7 +459,7 @@ public class GitBlitDiffFormatter extends DiffFormatter {
sb.append(MessageFormat.format("<div class='header'><div class='diffHeader'>{0}</div></div>",
StringUtils.escapeForHtml(getMsg("gb.diffTruncated", "Diff truncated after the above file"), false)));
// List all files not shown. We can be sure we do have at least one path in skipped.
- sb.append("<div class='diff'><table><tbody><tr><td class='diff-cell' colspan='4'>");
+ sb.append("<div class='diff'><table cellpadding='0'><tbody><tr><td class='diff-cell' colspan='4'>");
String deletedSuffix = StringUtils.escapeForHtml(getMsg("gb.diffDeletedFileSkipped", "(deleted)"), false);
boolean first = true;
for (DiffEntry entry : skipped) {
diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index f3982449..65248086 100644
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -1363,7 +1363,7 @@ span.diff.hunk_section {
.diff-cell {
margin: 0px;
- padding: 0px;
+ padding: 0 2px;
border: 0;
border-left: 1px solid #bbb;
}
@@ -1377,7 +1377,7 @@ span.diff.hunk_section {
}
.context2 {
- background-color: #fbfbfb;
+ background-color: #FEFEFE;
}
.trailingws-add {
@@ -1396,7 +1396,7 @@ div.diff > table {
}
.diff-line {
- background-color: #f0f0f0;
+ background-color: #fbfbfb;
text-align: center;
color: #999;
padding-left: 2px;
@@ -1409,7 +1409,7 @@ div.diff > table {
}
.diff-state {
- background-color: #f0f0f0;
+ background-color: #fbfbfb;
text-align: center;
color: #999;
padding-left: 2px;