Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change back link text from Back to Results to Back #2736

Merged
merged 8 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default {
</script>

<style lang="scss">
@import '../scss/custom.scss';
@import '@/scss/custom.scss';
inaki marked this conversation as resolved.
Show resolved Hide resolved
#app {
-webkit-font-smoothing: antialiased;
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/components/SearchFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default {

</script>
<style lang="scss">
@import '../../scss/colors-semantic-tokens.scss';
@import '@/scss/colors-semantic-tokens.scss';

.inactiveLink {
pointer-events: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,7 @@ $interactive-active: $raw-blue-50;
// TEXT
$text-primary: $raw-gray-700;
$text-secondary: $raw-gray-600;
$text-placeholder: $raw-gray-500;
$text-placeholder: $raw-gray-500;

// LINKS
inaki marked this conversation as resolved.
Show resolved Hide resolved
$link-back: $raw-gray-500;
File renamed without changes.
File renamed without changes.
65 changes: 34 additions & 31 deletions packages/client/src/views/GrantDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="grant-details-container">
<div class="grant-details-back-link">
<router-link v-if="isFirstPageLoad" :to="{ name: 'grants' }">Browse Grants</router-link>
<a href="#" @click="$router.back()" v-else>Back to Results</a>
<a href="#" @click="$router.back()" v-else>Back</a>
</div>
<!-- Left page column: headline -->
<h2 class="grant-details-headline m-0">{{ selectedGrant.title }}</h2>
Expand Down Expand Up @@ -451,59 +451,62 @@ export default {
</script>
<style lang="css">
.grant-details-container {
padding-right: 80px;
padding-left: 80px;
padding-bottom: 80px;
display: grid;
grid-template-columns: 1fr 437px;
grid-template-rows: auto;
grid-template-rows: 50px auto auto;
grid-template-areas:
"back-link back-link"
"headline main-actions"
"content secondary-actions";
column-gap: 90px;
row-gap: 48px;
.grant-details-back-link {
margin-top: 24px;
grid-area: back-link;
margin-top: 28px;
margin-bottom: 5px;
font-size: 14px;
font-weight: 700;
color: #6D7278;
color: #6d7278;
a {
color: #6D7278;
color: #6d7278;
cursor: pointer;
&::hover {
text-decoration: underline;
}
}
}
}
.grant-details-back-link {
grid-area: back-link;
}
.grant-details-headline {
grid-area: headline;
align-self: end;
}
.grant-details-content {
grid-area: content;
}
.grant-details-main-actions {
grid-area: main-actions;
}
.grant-details-secondary-actions {
grid-area: secondary-actions;
}
.grant-details-table tr:nth-of-type(odd) {
/* Design color differs from default bootstrap, so making our own striped background here */
background-color: #F9F9F9;
}
.grants-details-table-fit-content {
/* Make a table column that's the width of its content */
white-space: nowrap;
width: 1%;
.grant-details-headline {
grid-area: headline;
align-self: start;
}
.grant-details-content {
grid-area: content;
}
.grant-details-main-actions {
grid-area: main-actions;
}
.grant-details-secondary-actions {
grid-area: secondary-actions;
}
.grant-details-table tr:nth-of-type(odd) {
/* Design color differs from default bootstrap, so making our own striped background here */
background-color: #f9f9f9;
}
.grants-details-table-fit-content {
/* Make a table column that's the width of its content */
white-space: nowrap;
width: 1%;
}
}
@media print {
Expand Down
Loading