jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2781 from Safelite/nation/cleanup

Browse source 
fix merge conflict issue from last week
This commit is contained in:
CarlNation 2025-08-20 06:55:45 -04:00 committed by GitHub
commit 587418d99d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/layouts/estimate/estimate.vue
View file

@ -266,13 +266,13 @@ export default {
<style lang="scss" scoped>
.header-copy {
font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
<style lang="scss">
}
.vinlookupquestion p {
font-size: 1.25rem;
}
.header-sub-copy {
font-size: 0.875rem;
}
.select-an-option {
font-family: UrbanistSemibold;
font-weight: 600;

4
src/styles/ux-variables.scss
View file

@ -123,8 +123,8 @@ $body-color: $gray-600;
//Fonts
$font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
$font-family-monospace:
UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
monospace;
// stylelint-enable value-keyword-case
$font-family-base: $font-family-sans-serif;
$font-family-code: $font-family-monospace;