Use Source Code Pro as the monospace font Change-Id: I574ebe43f869db03e2d1a6211f02b643d60d15b2
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 b8cba07..ef25a28 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
@@ -17,7 +17,7 @@ /* Common styles and definitions. */ @import "//fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic-ext,greek-ext,cyrillic,greek,vietnamese,latin-ext"; - +@import "//fonts.googleapis.com/css?family=Source+Code+Pro"; *, *::after, *::before { @@ -51,12 +51,10 @@ .u-sha1 { background-color: #f1f2f3; color: #000; - font-family: monospace; font-size: 13px; } .u-pre { font-size: 10pt; - font-family: monospace; font-weight: 500; white-space: pre; } @@ -73,6 +71,9 @@ -ms-user-select: none; user-select: none; } +.u-monospace { + font-family: 'Source Code Pro', monospace; +} /* Common.soy */ @@ -198,7 +199,6 @@ } .Footer-formatsItem { display: inline-block; - font-family: monospace; } .Footer-formatsItem:first-child { margin-right: 20px; @@ -270,7 +270,6 @@ border-radius: 4px; display: block; font-size: inherit; - font-family: monospace; padding: 10px; width: 100%; } @@ -353,7 +352,6 @@ /* ObjectDetail.soy */ .Metadata { - font-family: monospace; margin-bottom: 15px; } .Metadata-title {
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/static/doc.css b/gitiles-servlet/src/main/resources/com/google/gitiles/static/doc.css index 983ea30..464e8a6 100644 --- a/gitiles-servlet/src/main/resources/com/google/gitiles/static/doc.css +++ b/gitiles-servlet/src/main/resources/com/google/gitiles/static/doc.css
@@ -155,7 +155,7 @@ border-radius: 4px; } .doc .code { - font-family: monospace; + font-family: 'Source Code Pro', monospace; } .doc dl dt { margin-top: 1em;
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 5ccd8c3..d69be25 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
@@ -52,7 +52,7 @@ <div class="Blame-leftCol"> {if isNonnull($region.abbrevSha)} <span class="Blame-author">{$region.author.name}</span> - {sp}<a class="u-sha1 Blame-sha1" href="{$region.commitUrl}">{$region.abbrevSha}</a> + {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>] @@ -60,7 +60,7 @@ </span> {/if} </div> - <div class="u-pre Blame-rightCol"> + <div class="u-pre u-monospace Blame-rightCol"> {let $n: $i + 1 /} <a class="u-lineNum Blame-lineNum" href="#{$n}" name="{$n}">{$n}</a> {foreach $span in $line}
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy index 7d523f6..97b5786 100644 --- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy +++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/Common.soy
@@ -111,9 +111,9 @@ Powered by <a href="https://code.google.com/p/gitiles/">Gitiles</a> </span> <span class="Footer-formats"> - <a class="Footer-formatsItem" href="?format=TEXT">{msg desc="text format"}txt{/msg}</a> + <a class="u-monospace Footer-formatsItem" href="?format=TEXT">{msg desc="text format"}txt{/msg}</a> {sp} - <a class="Footer-formatsItem" href="?format=JSON">{msg desc="JSON format"}json{/msg}</a> + <a class="u-monospace Footer-formatsItem" href="?format=JSON">{msg desc="JSON format"}json{/msg}</a> </span> </div> </footer>
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/DiffDetail.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/DiffDetail.soy index 9f41298..d800d2e 100644 --- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/DiffDetail.soy +++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/DiffDetail.soy
@@ -44,7 +44,7 @@ * @param fileIndex position of the file within the difference. */ {template .diffHeader} -<pre class="u-pre Diff"> +<pre class="u-pre u-monospace Diff"> <a name="F{$fileIndex}" class="Diff-fileIndex"></a> {foreach $part in $firstParts} {if not isFirst($part)}{sp}{/if}
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/LogDetail.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/LogDetail.soy index b5f1e08..9e7c21b 100644 --- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/LogDetail.soy +++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/LogDetail.soy
@@ -108,7 +108,7 @@ * @param diffTree unused in this variant. */ {deltemplate gitiles.logEntry variant="'oneline'"} -<a class="u-sha1 CommitLog-sha1" href="{$url}">{$abbrevSha}</a> +<a class="u-sha1 u-monospace CommitLog-sha1" href="{$url}">{$abbrevSha}</a> {sp}<a href="{$url}">{$shortMessage}</a> {sp}<span class="CommitLog-author" title="{$author.email}">{msg desc="commit author name"}by {$author.name}{/msg}</span> {sp}<span class="CommitLog-time" title="{$author.time}">· {$author.relativeTime}</span> @@ -164,7 +164,7 @@ * @param diffTree unused in this variant. */ {deltemplate gitiles.logEntry variant="'full'"} -<div class="Metadata"> +<div class="u-monospace Metadata"> <table> <tr> <th class="Metadata-title">{msg desc="Header for commit SHA entry"}commit{/msg}</th>
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/ObjectDetail.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/ObjectDetail.soy index 242f14b..70ad21f 100644 --- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/ObjectDetail.soy +++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/ObjectDetail.soy
@@ -41,7 +41,7 @@ * @param archiveType type of the archive to download. */ {template .commitDetail} -<div class="Metadata"> +<div class="u-monospace Metadata"> <table> <tr> <th class="Metadata-title">{msg desc="Header for commit SHA entry"}commit{/msg}</th> @@ -86,7 +86,7 @@ </table> </div> {call .message_} - {param className: 'u-pre MetadataMessage' /} + {param className: 'u-pre u-monospace MetadataMessage' /} {param message: $message /} {/call} @@ -162,7 +162,7 @@ */ {template .treeDetail} <div class="TreeDetail"> - <div class="u-sha1 TreeDetail-sha1"> + <div class="u-sha1 u-monospace TreeDetail-sha1"> {msg desc="SHA-1 for the path's tree"}tree: {$sha}{/msg} {if $logUrl}{sp}[<a href="{$logUrl}">{msg desc="history for a path"}path history{/msg}</a>]{/if} {if $archiveUrl} @@ -230,7 +230,7 @@ * @param? docUrl optional URL to view rendered file. */ {template .blobHeader} -<div class="u-sha1 BlobSha1"> +<div class="u-sha1 u-monospace BlobSha1"> {msg desc="SHA-1 for the file's blob"}blob: {$sha}{/msg} {if $fileUrl}{sp}[<a href="{$fileUrl}">{msg desc="detail view of a file"}file{/msg}</a>]{/if} {if $logUrl}{sp}[<a href="{$logUrl}">{msg desc="history for a file"}log{/msg}</a>]{/if} @@ -258,7 +258,7 @@ <table class="FileContents"> {foreach $line in $lines} {let $n: index($line) + 1 /} - <tr class="u-pre FileContents-line"> + <tr class="u-pre u-monospace FileContents-line"> <td class="u-lineNum u-noSelect FileContents-lineNum" data-line-number="{$n}" onclick="window.location.hash='#{$n}'"></td> <td class="FileContents-lineContents"> @@ -290,7 +290,7 @@ * @param message tag message. */ {template .tagDetail} -<div class="Metadata"> +<div class="u-monospace Metadata"> <table> <tr> <th class="Metadata-title">{msg desc="Header for tag SHA entry"}tag{/msg}</th> @@ -313,7 +313,7 @@ </div> {if $message and length($message)} {call .message_} - {param className: 'u-pre MetadataMessage' /} + {param className: 'u-pre u-monospace MetadataMessage' /} {param message: $message /} {/call} {/if}
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/RepositoryIndex.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/RepositoryIndex.soy index 787c15f..19461bf 100644 --- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/RepositoryIndex.soy +++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/RepositoryIndex.soy
@@ -64,7 +64,7 @@ <div class="CloneRepo"> <div class="CloneRepo-title">Clone this repo:</div> - <input type="text" class="CloneRepo-command" + <input type="text" class="u-monospace CloneRepo-command" onclick="this.focus();this.select();" readonly="readonly" value="git clone {$cloneUrl}"> </div>