Skip to content

Commit

Permalink
chore(arpa): fix headings and color contrast issues
Browse files Browse the repository at this point in the history
  • Loading branch information
lsr-explore committed Dec 16, 2024
1 parent 698c351 commit 5dd82b9
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<a
download
:href="href"
class="btn btn-primary"
class="btn usdr-btn-primary"
:class="computedClasses"
@click="setLoadingState"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ export default {
},
navLinkClass(to) {
if (this.$route.path === to) {
return 'nav-link usdr-tab-nav-link active';
return 'nav-link usdr-link active';
}
return 'nav-link usdr-tab-nav-link';
return 'nav-link usdr-link';
},
dateFormat(d) {
return moment(d)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<div class="col-sm-2" />
<div class="col-sm-10">
<button
class="btn btn-primary"
class="btn usdr-btn-primary"
:disabled="disabled"
@click="validateAndSave()"
>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/arpa_reporter/scss/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ hr {
color: $positive-default;
}

.usdr-tab-nav-link {
.usdr-link {
color: #305CE0;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/arpa_reporter/views/AgenciesView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="mb-4">
<router-link
to="/agencies/new"
class="btn btn-primary"
class="btn usdr-btn-primary"
>
Create New Agency
</router-link>
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/arpa_reporter/views/LoginView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- eslint-disable vuejs-accessibility/no-autofocus -->
<template>
<div class="my-3">
<h2>ARPA Reporter Login</h2>
<h1>ARPA Reporter Login</h1>
<form @submit="login">
<div class="form-group">
<input
Expand All @@ -16,7 +16,7 @@
</div>
<div class="form-group">
<button
class="btn btn-primary"
class="btn usdr-btn-primary"
type="Submit"
@click="login"
>
Expand Down
6 changes: 3 additions & 3 deletions packages/client/src/arpa_reporter/views/NewTemplateView.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<h2>Upload Period Template</h2>
<h1>Upload Period Template</h1>

<p>
This upload will be used as the template for period <em>{{ reportingPeriod.name }}</em>
Expand All @@ -24,15 +24,15 @@
</div>
<div class="form-group">
<button
class="btn btn-primary"
class="btn usdr-btn-primary"
type="submit"
:disabled="uploadDisabled"
@click.prevent="uploadTemplate"
>
{{ uploadButtonLabel }}
</button>
<a
class="ml-3"
class="ml-3 usdr-link"
href="#"
@click="cancelUpload"
>Cancel</a>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/arpa_reporter/views/NewUploadView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default {
name: 'submit',
type: 'submit',
label: 'Submit',
inputClass: ['btn', 'btn-primary'],
inputClass: ['btn', 'usdr-btn-primary'],
},
{
type: 'button',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="mb-4">
<router-link
to="/reporting_periods/new"
class="btn btn-primary"
class="btn usdr-btn-primary"
>
Create New Reporting Period
</router-link>
Expand Down Expand Up @@ -36,14 +36,15 @@
<router-link
v-if="!p.certified_at"
:to="`/new_template/${p.id}`"
class="usdr-link"
>
Upload Template
</router-link>
</td>
<td>
<span v-if="isCurrentReportingPeriod(p)">
<button
class="btn btn-primary"
class="btn usdr-btn-primary"
data-toggle="modal"
data-target="#certify-reporting-period"
:disabled="certifying"
Expand Down Expand Up @@ -97,7 +98,7 @@
<div class="modal-footer">
<button
type="button"
class="btn btn-primary"
class="btn usdr-btn-primary"
@click="handleCertify"
>
Certify
Expand Down
6 changes: 3 additions & 3 deletions packages/client/src/arpa_reporter/views/UploadView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
class="float-right"
>
<button
class="btn btn-primary ml-2"
class="btn usdr-btn-primary ml-2"
:disabled="validating"
@click="validateUpload"
>
Expand Down Expand Up @@ -178,7 +178,7 @@
Invalidate
</button>
<button
class="btn btn-primary ml-2"
class="btn usdr-btn-primary ml-2"
:disabled="validating"
@click="validateUpload"
>
Expand All @@ -187,7 +187,7 @@
</span>

<!--
<button class="btn btn-primary ml-2" @click="validateUpload" :disabled="validating">
<button class="btn usdr-btn-primary ml-2" @click="validateUpload" :disabled="validating">
<span v-if="validating">Validating...</span>
<span v-else-if="upload.validated_at">Re-validate</span>
<span v-else>Validate</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/arpa_reporter/views/UploadsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<router-link
to="/new_upload"
class="btn btn-primary ml-2"
class="btn usdr-btn-primary ml-2"
>
Submit Workbook
</router-link>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/arpa_reporter/views/UsersView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="mb-4">
<router-link
to="/users/new"
class="btn btn-primary"
class="btn usdr-btn-primary"
>
Create New User
</router-link>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/arpa_reporter/views/ValidationView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export default {
computed: {
revalidateBtnClass() {
return {
'btn-primary': !this.commit,
'usdr-btn-primary': !this.commit,
'btn-danger': this.commit,
};
},
Expand Down

0 comments on commit 5dd82b9

Please sign in to comment.