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

Merge Conflict

Browse source
This commit is contained in:
Johnny shultz 2025-08-01 13:05:31 -04:00
commit 7a9f677a4a
2 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/digital-components/date-picker/date-picker.vue
View file

@ -7,7 +7,6 @@
<textBlock <textBlock
v-show="durationTextBlockCopy" v-show="durationTextBlockCopy"
:customText="durationTextBlockCopy" :customText="durationTextBlockCopy"
justifyText="center"
typeStyle="small" typeStyle="small"
marginTopSizeOverride="0" marginTopSizeOverride="0"
class="duration-text-block" /> class="duration-text-block" />
@ -1029,6 +1028,10 @@ export default {
align-items: flex-start; align-items: flex-start;
text-align: left; text-align: left;
.duration-text-block {
text-align: left;
}
.date-picker-header { .date-picker-header {
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
} }
@ -1052,7 +1055,6 @@ export default {
} }
.calendar-grid-container { .calendar-grid-container {
margin: 0 auto 1rem auto; margin: 0 auto 1rem auto;
max-width: 360px;
position: relative; position: relative;
transition: transition:
height ease 2s, height ease 2s,
@ -1190,8 +1192,6 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
min-width: 2.5rem;
width: 2.5rem;
height: 2.5rem; height: 2.5rem;
border: 2px solid transparent; border: 2px solid transparent;
@ -1229,14 +1229,8 @@ export default {
&.selectable-day { &.selectable-day {
label { label {
background-color: $blue-100; background-color: $blue-100;
min-width: 2.75rem;
width: 2.75rem;
border-radius: 50%; border-radius: 50%;
cursor: pointer; cursor: pointer;
@include media-breakpoint-up(md) {
min-width: 3rem;
width: 3rem;
}
&:hover { &:hover {
border: 2px solid $blue; border: 2px solid $blue;
} }
@ -1415,18 +1409,13 @@ export default {
line-height: 1.2; line-height: 1.2;
justify-content: center; justify-content: center;
padding: 0.25rem; padding: 0.25rem;
margin: 0.15rem;
} }
&.selectable-day { &.selectable-day {
label { label {
color: $black; color: $black;
background-color: $blue-100; background-color: $blue-100;
min-width: 2.75rem;
width: 2.75rem;
border-radius: 0.25rem; border-radius: 0.25rem;
@include media-breakpoint-up(md) {
min-width: 3rem;
width: 3rem;
}
} }
} }
&.current-day { &.current-day {
@ -1434,7 +1423,6 @@ export default {
font-weight: 600; font-weight: 600;
font-family: "UrbanistSemibold"; font-family: "UrbanistSemibold";
color: $black; color: $black;
font-size-adjust: 0.5; // needed for Averta fonts baseline alignment
} }
} }
} }
@ -1445,7 +1433,6 @@ export default {
color: $black; color: $black;
font-weight: 400; font-weight: 400;
font-family: "UrbanistSemibold"; font-family: "UrbanistSemibold";
font-size-adjust: 0.5; // needed for Averta fonts baseline alignment
&.price { &.price {
font-weight: 400; font-weight: 400;

19
src/layouts/schedule/schedule.vue
View file

@ -44,7 +44,7 @@
alertClass="alert-success" /> alertClass="alert-success" />
</div> </div>
</div> </div>
<div class="row justify-content-left appointment-type"> <div class="row appointment-type">
<div class="col-12 col-md-10 col-lg-8 col-xl-7"> <div class="col-12 col-md-10 col-lg-8 col-xl-7">
<funnelSubHeader cmsWidgetName="ScheduleYourServiceWidget" class="mt-4" /> <funnelSubHeader cmsWidgetName="ScheduleYourServiceWidget" class="mt-4" />
<appointmentTypeQuestion <appointmentTypeQuestion
@ -83,9 +83,9 @@
modalWidgetName="ServiceZipModalWidget" /> modalWidgetName="ServiceZipModalWidget" />
</div> </div>
<div <div
class="row justify-content-left your-shop-location" class="row your-shop-location"
v-if="appointmentType && appointmentType !== appointmentTypeStrings.MOBILE"> v-if="appointmentType && appointmentType !== appointmentTypeStrings.MOBILE">
<div class="col-md-6 col-xl-4"> <div class="col-12 col-md-10 col-lg-8 col-xl-7">
<button-question <button-question
class="shop-question-button" class="shop-question-button"
ref="buttonQuestion" ref="buttonQuestion"
@ -96,9 +96,8 @@
:questionText="questionText" :questionText="questionText"
buttonTypeString="shopListButton" buttonTypeString="shopListButton"
:buttonTypeObject="shopListButton" :buttonTypeObject="shopListButton"
groupName="chooseShop" groupName="chooseShop" />
textPosition="text-start" /> <div>
<div class="text-center">
<textBlock <textBlock
v-if="mobileFeeApplies && isMobileSelected" v-if="mobileFeeApplies && isMobileSelected"
:customText="mobileFeeText" :customText="mobileFeeText"
@ -118,7 +117,7 @@
<contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" /> <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
</div> </div>
</div> </div>
<div class="row justify-content-left date-picker-wrapper"> <div class="row date-picker-wrapper">
<div class="col-12 col-md-10 col-lg-8 col-xl-7"> <div class="col-12 col-md-10 col-lg-8 col-xl-7">
<locationAlerts cmsWidgetPrefix="LocationAlert-" ref="locationAlerts" /> <locationAlerts cmsWidgetPrefix="LocationAlert-" ref="locationAlerts" />
<datePicker <datePicker
@ -1753,7 +1752,7 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.container-fluid { .container {
&.page-schedule { &.page-schedule {
padding: 0 1rem; padding: 0 1rem;
.text-link-small { .text-link-small {
@ -1790,6 +1789,10 @@ export default {
padding: 0 0.75rem; padding: 0 0.75rem;
} }
} }
.question-text > span {
display: flex;
justify-content: flex-start;
}
} }
.shop-question-button .list-button-content { .shop-question-button .list-button-content {
background: $blue-100; background: $blue-100;