[CSS] Revert to table layout for Blame view
Change-Id: Iedb7147f9d09a3c558bca65d71c8e3f737ba5d4a
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/static/base.css b/gitiles-servlet/src/main/resources/com/google/gitiles/static/base.css
index ef25a28..2365a07 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/static/base.css
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/static/base.css
@@ -464,38 +464,9 @@
/* BlameDetail.soy */
.Blame {
- margin: 10px 0;
-}
-.Blame-region {
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
-}
-.Blame-leftCol {
+ border-collapse: collapse;
font-size: 8pt;
- width: 375px;
-}
-.Blame-rightCol {
- -webkit-flex: 1;
- -ms-flex: 1;
- flex: 1;
- font-size: 8pt;
-}
-.Blame-sha1,
-.Blame-author,
-.Blame-time,
-.Blame-regionLink {
- display: inline-block;
- font-size: 8pt;
-}
-.Blame-lineNum {
- margin-right: 10px;
- min-width: 3.5em;
- padding-right: 8px;
- text-align: right;
-}
-.Blame-lineNum:hover {
- text-decoration: underline;
+ margin: 0 auto;
}
.Blame-region--bg1 {
background: #fff;
@@ -503,6 +474,28 @@
.Blame-region--bg2 {
background: #f1f2f3;
}
+.Blame-sha1,
+.Blame-author,
+.Blame-time,
+.Blame-regionLink {
+ font-size: 8pt;
+ padding: 0 3px;
+ white-space: nowrap;
+}
+.Blame-regionLink {
+ text-align: right;
+}
+.Blame-lineNum .u-lineNum {
+ padding: 0 8px;
+ text-align: right;
+}
+.Blame-lineNum:hover {
+ text-decoration: underline;
+}
+.Blame-lineContent {
+ font-size: 9pt;
+ padding: 0 8px;
+}
/* DiffDetail.soy */
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/BlameDetail.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/BlameDetail.soy
index d69be25..a35b6e2 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/BlameDetail.soy
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/BlameDetail.soy
@@ -44,32 +44,34 @@
{call .blobHeader data="$data" /}
- <div class="Blame">
+ <table class="Blame">
{foreach $line in $data.lines}
{let $i: index($line) /}
{let $region: $regions[$i] /}
- <div class="Blame-region {$region.class}">
- <div class="Blame-leftCol">
- {if isNonnull($region.abbrevSha)}
- <span class="Blame-author">{$region.author.name}</span>
- {sp}<a class="u-sha1 u-monospace Blame-sha1" href="{$region.commitUrl}">{$region.abbrevSha}</a>
- {sp}<span class="Blame-time">{$region.author.time}</span>
- {sp}<span class="Blame-regionLink">
- [<a href="{$region.diffUrl}">{msg desc="text for diff URL"}diff{/msg}</a>]
- [<a href="{$region.blameUrl}">{msg desc="text for blame URL"}blame{/msg}</a>]
- </span>
- {/if}
- </div>
- <div class="u-pre u-monospace Blame-rightCol">
- {let $n: $i + 1 /}
- <a class="u-lineNum Blame-lineNum" href="#{$n}" name="{$n}">{$n}</a>
+ <tr class="Blame-region {$region.class}">
+ {if isNonnull($region.abbrevSha)}
+ <td class="Blame-author">{$region.author.name}</td>
+ <td class="Blame-sha1"><a class="u-sha1 u-monospace Blame-sha1" href="{$region.commitUrl}">{$region.abbrevSha}</a></td>
+ <td class="Blame-time">{$region.author.time}</span>
+ <td class="Blame-regionLink">
+ [<a href="{$region.diffUrl}">{msg desc="text for diff URL"}diff{/msg}</a>]
+ [<a href="{$region.blameUrl}">{msg desc="text for blame URL"}blame{/msg}</a>]
+ </td>
+ {else}
+ <td colspan="4"></td>
+ {/if}
+ {let $n: $i + 1 /}
+ <td class="Blame-lineNum">
+ <a class="u-monospace u-lineNum" href="#{$n}" name="{$n}">{$n}</a>
+ </td>
+ <td class="u-pre u-monospace Blame-lineContent">
{foreach $span in $line}
<span class="{$span.classes}">{$span.text}</span>
{/foreach}
- </div>
- </div>
+ </td>
+ </tr>
{/foreach}
- </div>
+ </table>
{else}
{call .header data="all" /}
{call .blobDetail data="$data" /}
