Merge branch 'master' into demo-fixes

This commit is contained in:
Patrick Smith 2018-09-28 09:55:43 -04:00
commit 6400e85664
2 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@
<img class="login-banner__logo" src="/static/img/ccpo-logo.svg" alt="Cloud Computing Program Office Logo">
<a class="usa-button usa-button-big login-banner__button" href='{{ config.get('CAC_URL','https://cac.atat.codes') }}'><span>Sign in with CAC card</span></a>
<a class="usa-button usa-button-big login-banner__button" href='{{ config.get('CAC_URL','https://cac.atat.codes') }}'><span>Sign in with CAC</span></a>
{% if g.dev %}
<a class="usa-button usa-button-big usa-button-secondary" href='/login-dev'><span>DEV Login</span></a>

View File

@ -17,7 +17,7 @@
<div class="panel">
<div class="panel__heading">
<h1>Request Details</h1>
<h2><span class="subtitle">{{ jedi_request.displayname }}</span> <span class="label label--info">{{ jedi_request.status_displayname }}</span></h2>
<div class="subtitle"><h2>Request: {{ jedi_request.displayname }}</h2><span class="label label--info">{{ jedi_request.status_displayname }}</span></div>
</div>
<div class="panel__content">