Skip to content

Commit 10c68fb

Browse files
authored
Merge branch 'master' into input-fix
2 parents be0d8c9 + 3637ce8 commit 10c68fb

2 files changed

Lines changed: 19 additions & 15 deletions

File tree

src/components/Pricing/PricingAddons/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
175175
const enterpriseUserSeats = enterpriseUsers > 0 ? ` and ${enterpriseUsers} enterprise user${enterpriseUsers > 1 ? "s" : ""}` : "";
176176
return {
177177
link: matchingPlanLink.link,
178-
name: "Subscribe For Add-on"
178+
name: "Subscribe"
179179
};
180180
}
181181

@@ -189,7 +189,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
189189

190190
return {
191191
link: "#",
192-
name: "Subscribe For Add-on"
192+
name: "Subscribe For"
193193
};
194194
};
195195

@@ -507,7 +507,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
507507
}
508508
return formatPrice(0);
509509
}
510-
})()} /{isYearly ? "yearly" : "monthly"}
510+
})()}/{isYearly ? "yearly" : "monthly"}
511511
</Typography>
512512
</Box>
513513

src/sections/Pricing/index.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,26 @@ import { Currencies } from "../../utils/currencies";
1313

1414
export const CurrencySelect = ({ currency, setCurrency }) => {
1515
return (
16-
<FormControl variant="outlined" size="small" sx={{
17-
minWidth: 150,
18-
"& .MuiInputLabel-root": { color: "white" }, // label
19-
"& .MuiOutlinedInput-notchedOutline": { borderColor: "white" }, // outline
20-
"& .MuiSelect-icon": { color: "white" }, // dropdown arrow
21-
"& .MuiSelect-select": { color: "white" }, // selected text
22-
"&:hover .MuiOutlinedInput-notchedOutline": { borderColor: "white" },
23-
"&.Mui-focused .MuiOutlinedInput-notchedOutline": { borderColor: "white" },
24-
25-
}}>
16+
<FormControl
17+
variant="outlined"
18+
size="small"
19+
sx={{
20+
minWidth: 150,
21+
"& .MuiInputLabel-root": { color: "white" },
22+
"& .MuiInputLabel-root.Mui-focused": { color: '#00B39F' },
23+
"& .MuiOutlinedInput-notchedOutline": { borderColor: "white" },
24+
"& .MuiSelect-icon": { color: "white" },
25+
"& .MuiSelect-select": { color: "white" },
26+
"&:hover .MuiOutlinedInput-notchedOutline": { borderColor: "white" },
27+
}}
28+
>
2629
<InputLabel>Currency</InputLabel>
2730
<Select
2831
value={currency}
2932
sx={{
30-
31-
33+
"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
34+
borderColor: "#00B39F",
35+
},
3236
}}
3337
onChange={(e) => setCurrency(e.target.value)}
3438
label="Currency"

0 commit comments

Comments
 (0)