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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fc10870
Change back link text
inaki Mar 8, 2024
79d769a
Merge remote-tracking branch 'upstream/main' into inaki-fix-back-text
inaki Mar 8, 2024
fedcaa4
Fix margins and change the title style to align to the top
inaki Mar 11, 2024
9e45178
Fix linting
inaki Mar 12, 2024
fc91f47
Merge remote-tracking branch 'upstream/main' into inaki-fix-back-text
inaki Mar 12, 2024
cd7d107
Change text to back
inaki Mar 12, 2024
99f7ca2
Merge branch 'main' into inaki-fix-back-text
inaki Mar 12, 2024
db567e1
Merge branch 'main' into inaki-fix-back-text
inaki Mar 12, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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
0 packages/client/scss/colors-base-tokens.scss → ...s/client/src/scss/colors-base-tokens.scss
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion ...s/client/scss/colors-semantic-tokens.scss → ...ient/src/scss/colors-semantic-tokens.scss
View file
Open in desktop
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;
0 packages/client/scss/custom.scss → packages/client/src/scss/custom.scss
View file
Open in desktop
File renamed without changes.
0 packages/client/scss/fonts.scss → packages/client/src/scss/fonts.scss
View file
Open in desktop
File renamed without changes.
9 changes: 5 additions & 4 deletions packages/client/src/views/GrantDetails.vue
View file
Open in desktop
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 @@ -444,7 +444,8 @@ export default {
};
</script>

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

.grant-details-container {
padding-right: 80px;
Expand All @@ -463,9 +464,9 @@ export default {
margin-top: 24px;
font-size: 14px;
font-weight: 700;
color: #6D7278;
color: $link-back;
a {
color: #6D7278;
color: $link-back;
cursor: pointer;
&::hover {
text-decoration: underline;
Expand Down
Loading