zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-30 17:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix the monospace font so the screendiff tests work correctly

Browse source 
see b/34094769 for context

The webdriver tests don't choose a correct font when we specify "monospace". As a result, we don't render correctly pages that use monospace.

Here we instead explicitly reference a monospace font we know exists in the webdriver: Courier New.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=226233831
This commit is contained in:
guyben 2018-12-19 14:26:35 -08:00 • committed by Michael Muller
parent 2cc4a9fb2f
commit 7ade0f0adb
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
java/google/registry/ui/css/registry.css
View file

@ -22,7 +22,7 @@ h1 {
} }
pre { pre {
font-family: monospace; font-family: "Courier New", Courier, monospace;
white-space: pre-wrap; white-space: pre-wrap;
} }
@ -49,7 +49,7 @@ input[readonly], textarea[readonly] {
textarea { textarea {
margin-bottom: 1em; margin-bottom: 1em;
font-family: monospace; font-family: "Courier New", Courier, monospace;
font-size: 13px; font-size: 13px;
border: solid 1px #ddd; border: solid 1px #ddd;
} }

10
java/google/registry/ui/soy/registrar/SecuritySettings.soy
View file

@ -86,7 +86,7 @@
<textarea <textarea
name="clientCertificate" name="clientCertificate"
rows="16" rows="16"
cols="64" cols="68"
{if $readonly}readonly{/if}>{$clientCertificate}</textarea> {if $readonly}readonly{/if}>{$clientCertificate}</textarea>
{elseif isNonnull($clientCertificateHash)} {elseif isNonnull($clientCertificateHash)}
{if $readonly} {if $readonly}
@ -100,7 +100,7 @@
<span class="{css('description')}">Existing certificate SHA256 base64 hash:</span> <span class="{css('description')}">Existing certificate SHA256 base64 hash:</span>
{$clientCertificateHash} {$clientCertificateHash}
{else} {else}
<textarea name="clientCertificate" rows="16" cols="64"></textarea> <textarea name="clientCertificate" rows="16" cols="68"></textarea>
{/if} {/if}
{else} {else}
{if $readonly} {if $readonly}
@ -109,10 +109,10 @@
<p>No certificate on file. Please enter your certificate below. <p>No certificate on file. Please enter your certificate below.
<textarea id="clientCertificate" <textarea id="clientCertificate"
name="clientCertificate" name="clientCertificate"
rows="16" cols="64"></textarea> rows="16" cols="68"></textarea>
<div class="{css('description')}"> <div class="{css('description')}">
Example format: Example format:
<textarea id="exampleCert" rows="17" cols="64" readonly> <textarea id="exampleCert" rows="17" cols="68" readonly>
-----BEGIN CERTIFICATE-----{\n} -----BEGIN CERTIFICATE-----{\n}
MIIDvTCCAqWgAwIBAgIJAK/PgPT0jTwRMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV{\n} MIIDvTCCAqWgAwIBAgIJAK/PgPT0jTwRMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV{\n}
BAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazERMA8GA1UEBwwITmV3IFlvcmsxDzAN{\n} BAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazERMA8GA1UEBwwITmV3IFlvcmsxDzAN{\n}
@ -157,7 +157,7 @@
<textarea id="failoverClientCertificate" <textarea id="failoverClientCertificate"
name="failoverClientCertificate" name="failoverClientCertificate"
rows="16" rows="16"
cols="64" cols="68"
{if $readonly}readonly{/if}> {if $readonly}readonly{/if}>
{$failoverClientCertificate ?: ''} {$failoverClientCertificate ?: ''}
</textarea> </textarea>