Selaa lähdekoodia

Fixed some bugs

feature/706
jovan.cirkovic 3 vuotta sitten
vanhempi
commit
b104d6359c

+ 41
- 24796
package-lock.json
File diff suppressed because it is too large
Näytä tiedosto


+ 2
- 5
src/components/Cards/FilterCard/FilterDropdown/Checkbox/FilterSubDropdown/FilterSmallDropdown/FilterSmallDropdown.js Näytä tiedosto

@@ -61,12 +61,9 @@ const FilterSmallDropdown = (props) => {

return (
<>
<SmallDropdownContainer>
<SmallDropdownContainer onClick={() => setDropdownHandler()}>
<SmallDropdownText>{props.letters}</SmallDropdownText>
<SmallDropdownIcon
onClick={() => setDropdownHandler()}
dropdown={showDropdown}
/>
<SmallDropdownIcon dropdown={showDropdown} />
</SmallDropdownContainer>
<SmallDropdownContent dropdown={showDropdown}>
{dataFiltered.map((item) => {

+ 3
- 1
src/components/Cards/FilterCard/FilterDropdown/Checkbox/FilterSubDropdown/FilterSmallDropdown/FilterSmallDropdown.styled.js Näytä tiedosto

@@ -1,6 +1,7 @@
import styled from "styled-components";
import { Box, Typography } from "@mui/material";
import { ReactComponent as DropdownDown } from "../../../../../../../assets/images/svg/down-arrow.svg";
import selectedTheme from "../../../../../../../themes";

export const SmallDropdownContainer = styled(Box)`
display: flex;
@@ -9,10 +10,11 @@ export const SmallDropdownContainer = styled(Box)`
margin-top: 20px;
margin-left: -20px;
margin-bottom: 14px;
cursor: pointer;
`;

export const SmallDropdownText = styled(Typography)`
font-family: "DM Sans";
font-family: ${selectedTheme.fonts.textFont};
font-size: 12px;
`;


+ 2
- 1
src/components/Cards/FilterCard/FilterDropdown/Checkbox/FilterSubDropdown/FilterSubDropdown.styled.js Näytä tiedosto

@@ -1,6 +1,7 @@
import styled from "styled-components";
import { Box, Typography } from "@mui/material";
import { ReactComponent as DropdownDown } from "../../../../../../assets/images/svg/down-arrow.svg";
import selectedTheme from "../../../../../../themes";

export const SmallDropdownContainer = styled(Box)`
display: flex;
@@ -12,7 +13,7 @@ export const SmallDropdownContainer = styled(Box)`
`;

export const SmallDropdownText = styled(Typography)`
font-family: "DM Sans";
font-family: ${selectedTheme.fonts.textFont};
font-size: 12px;
`;


+ 5
- 0
src/components/MarketPlace/Header/Header.js Näytä tiedosto

@@ -8,6 +8,7 @@ import {
HeaderButton,
HeaderButtons,
HeaderCategoryString,
HeaderCompanyString,
HeaderContainer,
HeaderLocation,
HeaderLocationsMainString,
@@ -119,6 +120,7 @@ const Header = (props) => {
const goBack = () => {
history.goBack();
};
console.log(headerString);

return (
<>
@@ -155,6 +157,9 @@ const Header = (props) => {
<HeaderLocationsMainString component="span">
{headerString.locationsString}
</HeaderLocationsMainString>
<HeaderCompanyString>
{headerString.companiesString}
</HeaderCompanyString>
<HeaderAltLocation component="span">
{altString}
</HeaderAltLocation>

+ 12
- 0
src/components/MarketPlace/Header/Header.styled.js Näytä tiedosto

@@ -107,6 +107,18 @@ export const HeaderLocationsMainString = styled(Typography)`
padding-top: 3px;
}
`;
export const HeaderCompanyString = styled(Typography)`
font-family: ${selectedTheme.fonts.textFont};
max-width: 200px;
color: ${selectedTheme.colors.primaryPurple};
font-weight: 700;
line-height: 22px;
font-size: 16px;
@media (max-width: 600px) {
font-size: 12px;
padding-top: 3px;
}
`;
export const HeaderButton = styled(IconButton)`
padding: 2px 10px;
@media (max-width: 1500px) {

Loading…
Peruuta
Tallenna