You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2012/12/19 17:25:53 UTC
[16/48] git commit: [#5389] ticket:235 fix side-by-side diff styles
for different browsers
[#5389] ticket:235 fix side-by-side diff styles for different browsers
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dc977913
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dc977913
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dc977913
Branch: refs/heads/db/4790
Commit: dc977913db547fadc101c8b4f9861d24d0e48abf
Parents: 427b5c1
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Dec 11 12:57:19 2012 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Mon Dec 17 22:21:17 2012 +0000
----------------------------------------------------------------------
Allura/allura/lib/diff.py | 6 ++++--
Allura/allura/public/nf/css/forge/diff.css | 12 +++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dc977913/Allura/allura/lib/diff.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/diff.py b/Allura/allura/lib/diff.py
index 50d83a3..f5e9249 100644
--- a/Allura/allura/lib/diff.py
+++ b/Allura/allura/lib/diff.py
@@ -6,8 +6,10 @@ class HtmlSideBySideDiff(object):
table_tmpl = '''
<table class="side-by-side-diff">
<thead>
- <th colspan="2">%s</th>
- <th colspan="2">%s</th>
+ <th class="lineno"></th>
+ <th>%s</th>
+ <th class="lineno"></th>
+ <th>%s</th>
</thead>
%s
</table>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dc977913/Allura/allura/public/nf/css/forge/diff.css
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/forge/diff.css b/Allura/allura/public/nf/css/forge/diff.css
index 9b1ef15..a17c756 100644
--- a/Allura/allura/public/nf/css/forge/diff.css
+++ b/Allura/allura/public/nf/css/forge/diff.css
@@ -4,13 +4,13 @@ table.side-by-side-diff {
background: #f8f8f8;
margin: 0 !important;
width: 100% !important;
+ table-layout: fixed;
}
-.inline-diff-body table.side-by-side-diff thead { display: none; }
-
table.side-by-side-diff,
table.side-by-side-diff tr,
-table.side-by-side-diff td {
+table.side-by-side-diff td,
+table.side-by-side-diff th {
border: 0;
color: gray;
margin: 0;
@@ -30,12 +30,14 @@ table.side-by-side-diff td { padding: 0 .2em; }
/* line number */
table.side-by-side-diff td.lineno {
background-color: #ebebeb;
- display:inline-block;
padding: 0 .5em;
border-width: 0 1px 0 0;
border-style: solid;
border-color: #ddd;
- height: 100%;
+ width: 2em;
+}
+table.side-by-side-diff th.lineno {
+ padding: 0 .5em;
width: 2em;
}