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

Merge branch 'develop' into merge/csr-1856-to-develop

Browse source
This commit is contained in:
Chloe Herd 2023-12-01 11:33:52 -05:00
commit 263c233535
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/css/hop-styling.css
View file

@ -5,7 +5,7 @@
body { body {
font-family: Roboto; font-family: Roboto;
font-weight: 400; font-weight: 400;
color: #4D5151; color: #000;
margin: 0; margin: 0;
background-color: white; background-color: white;
padding: 8px; padding: 8px;
@ -33,6 +33,7 @@ body .headerlinecontainer .headerline1 {
line-height: 32px; line-height: 32px;
font-weight: 400; font-weight: 400;
margin: 24px 0; margin: 24px 0;
text-align: center;
} }
body input, body input,
body select { body select {
@ -42,6 +43,8 @@ body input {
border-radius: 8px; border-radius: 8px;
border: 1px solid #8E9292; border: 1px solid #8E9292;
padding: 16px; padding: 16px;
font-size: 16px;
color: #000;
} }
body input:focus, body input:focus-visible { body input:focus, body input:focus-visible {
box-shadow: 0 0 0 2.5px #1574a1; box-shadow: 0 0 0 2.5px #1574a1;

5
public/scss/hop-styling.scss
View file

@ -5,7 +5,7 @@
body { body {
font-family: Roboto; font-family: Roboto;
font-weight: 400; font-weight: 400;
color: #4D5151; color: #000;
margin: 0; margin: 0;
background-color: white; background-color: white;
padding: 8px; padding: 8px;
@ -39,6 +39,7 @@ body {
line-height: 32px; line-height: 32px;
font-weight: 400; font-weight: 400;
margin: 24px 0; margin: 24px 0;
text-align: center;
} }
} }
@ -51,6 +52,8 @@ body {
border-radius: 8px; border-radius: 8px;
border: 1px solid #8E9292; border: 1px solid #8E9292;
padding: 16px; padding: 16px;
font-size: 16px;
color: #000;
&:focus, &:focus,
&:focus-visible { &:focus-visible {
box-shadow: 0 0 0 2.5px #1574a1; box-shadow: 0 0 0 2.5px #1574a1;

11
src/store/index.js
View file

@ -2130,6 +2130,17 @@ export const actions = {
}, },
// Manage promo saving to ensure a promoCode never ends up in both active and inactive // Manage promo saving to ensure a promoCode never ends up in both active and inactive
saveActiveAndOrInactivePromos(context, { activePromos = null, inactivePromos = null }) { saveActiveAndOrInactivePromos(context, { activePromos = null, inactivePromos = null }) {
if (inactivePromos) {
// Clean up inactivePromos
// Remove bundle identifier
inactivePromos = inactivePromos.map((promoCode) =>
getPromoCodeWithoutBundleIdentifier(promoCode)
);
// Remove duplicates
inactivePromos = inactivePromos.filter(
(promoCode, index) => inactivePromos.indexOf(promoCode) === index
);
}
activePromos = activePromos?.slice(0); activePromos = activePromos?.slice(0);
inactivePromos = inactivePromos?.slice(0); inactivePromos = inactivePromos?.slice(0);
let activePromosToSave; let activePromosToSave;