From f63f9863c5f6988f44ee343d207cc469912e0508 Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Tue, 5 Aug 2025 14:20:35 -0400 Subject: [PATCH 1/5] Making Roboto secondary font --- public/index.html | 1 + public/scss/hop-styling.scss | 2 +- src/styles/ux-variables.scss | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/index.html b/public/index.html index ae1b046e..d3c8d677 100644 --- a/public/index.html +++ b/public/index.html @@ -12,6 +12,7 @@ + <%= htmlWebpackPlugin.options.title %> diff --git a/public/scss/hop-styling.scss b/public/scss/hop-styling.scss index eab65544..26aec47e 100644 --- a/public/scss/hop-styling.scss +++ b/public/scss/hop-styling.scss @@ -4,7 +4,7 @@ /* IMPORTANT: READ README.md in this folder! Do not edit .css file directly! */ @import url("https://fonts.googleapis.com/css2?family=Urbanist:ital,wght@0,100..900;1,100..900&display=swap"); body { - font-family: Urbanist, Arial, Helvetica, sans-serif; + font-family: Urbanist, Roboto, Arial, sans-serif; font-weight: 400; color: #000; margin: 0; diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index 2d78a6dc..e0db0d3e 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -117,11 +117,10 @@ $theme-colors: ( $body-color: $gray-600; //Fonts -$font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; // stylelint-enable value-keyword-case -$font-family-base: $font-family-sans-serif; +$font-family-base: UrbanistRegular, Roboto, Arial, sans-serif; $font-family-code: $font-family-monospace; $font-size-base: 1rem; // Assumes the browser default, typically `16px` From 4d54e16ad3621a630aedaaea61cf91c96eb82524 Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Tue, 5 Aug 2025 14:20:51 -0400 Subject: [PATCH 2/5] Deleting unused component --- .../nav-button/nav-button.spec.js | 30 ----------- src/iss-components/nav-button/nav-button.vue | 50 ------------------- 2 files changed, 80 deletions(-) delete mode 100644 src/iss-components/nav-button/nav-button.spec.js delete mode 100644 src/iss-components/nav-button/nav-button.vue diff --git a/src/iss-components/nav-button/nav-button.spec.js b/src/iss-components/nav-button/nav-button.spec.js deleted file mode 100644 index 3f5ace6e..00000000 --- a/src/iss-components/nav-button/nav-button.spec.js +++ /dev/null @@ -1,30 +0,0 @@ -import { shallowMount } from '@vue/test-utils'; -import navButton from '@/iss-components/nav-button/nav-button.vue'; - -describe('NavButton', () => { - it('should display input when type is button', () => { - const wrapper = shallowMount(navButton, { - propsData: { - text: 'Hello', - scenario: 'test', - type: 'button' - } - }); - - expect(wrapper.find('input').exists()).toBe(true); - expect(wrapper.find('p').exists()).toBe(false); - }); - - it('should display p element when type is text', () => { - const wrapper = shallowMount(navButton, { - propsData: { - text: 'Hello', - scenario: 'test', - type: 'text' - } - }); - - expect(wrapper.find('input').exists()).toBe(false); - expect(wrapper.find('p').exists()).toBe(true); - }); -}); diff --git a/src/iss-components/nav-button/nav-button.vue b/src/iss-components/nav-button/nav-button.vue deleted file mode 100644 index 8bc801bb..00000000 --- a/src/iss-components/nav-button/nav-button.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - From f581e4f943c32fcdb0af4061e85f7f46774a7d35 Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Tue, 5 Aug 2025 14:26:29 -0400 Subject: [PATCH 3/5] Running scss to css converter --- public/css/hop-styling.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/hop-styling.css b/public/css/hop-styling.css index b6524f00..b6ce2c08 100644 --- a/public/css/hop-styling.css +++ b/public/css/hop-styling.css @@ -4,7 +4,7 @@ /* IMPORTANT: READ README.md in this folder! Do not edit .css file directly! */ @import url("https://fonts.googleapis.com/css2?family=Urbanist:ital,wght@0,100..900;1,100..900&display=swap"); body { - font-family: Urbanist, Arial, Helvetica, sans-serif; + font-family: Urbanist, Roboto, Arial, sans-serif; font-weight: 400; color: #000; margin: 0; From e9b4149503a2fa013bc7c005953bc3869276432d Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Wed, 6 Aug 2025 09:31:07 -0400 Subject: [PATCH 4/5] Replacing var --- src/styles/ux-variables.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index e0db0d3e..df5fbbac 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -117,10 +117,11 @@ $theme-colors: ( $body-color: $gray-600; //Fonts +$font-family-sans-serif: "UrbanistRegular", Roboto, Arial, sans-serif; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; // stylelint-enable value-keyword-case -$font-family-base: UrbanistRegular, Roboto, Arial, sans-serif; +$font-family-base: $font-family-sans-serif; $font-family-code: $font-family-monospace; $font-size-base: 1rem; // Assumes the browser default, typically `16px` From 94fdc89f90197b99119cf08aa9cbf885b8158eab Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Wed, 6 Aug 2025 09:37:46 -0400 Subject: [PATCH 5/5] Tweaks --- src/styles/ux-variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index df5fbbac..0d7a6d0c 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -117,11 +117,11 @@ $theme-colors: ( $body-color: $gray-600; //Fonts -$font-family-sans-serif: "UrbanistRegular", Roboto, Arial, sans-serif; +$font-family-sans-serif: UrbanistRegular, Roboto, Arial, sans-serif; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; // stylelint-enable value-keyword-case -$font-family-base: $font-family-sans-serif; +$font-family-base: $font-family-sans-serif; $font-family-code: $font-family-monospace; $font-size-base: 1rem; // Assumes the browser default, typically `16px`