Ott 308 adaptive player page (#148)

keep-around/af30b88d367751c9e05a735e4a0467a96238ef47
Sergiu 5 years ago committed by GitHub
parent 3f63e2fc80
commit 264a7acab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/features/Header/index.tsx
  2. 3
      src/features/MatchCard/styled.tsx
  3. 41
      src/features/ProfileCard/styled.tsx
  4. 6
      src/features/Register/components/SubscriptionsStep/index.tsx
  5. 1
      src/features/Register/components/SubscriptionsStep/styled.tsx
  6. 5
      src/features/Search/styled.tsx

@ -56,6 +56,12 @@ export const Header = () => (
<SearchWrapper> <SearchWrapper>
<Search /> <Search />
</SearchWrapper> </SearchWrapper>
<FilterWrapper>
<DateFilter />
</FilterWrapper>
<FilterWrapper>
<MatchStatusFilter />
</FilterWrapper>
</Fragment> </Fragment>
</Switch> </Switch>
</Wrapper> </Wrapper>

@ -171,6 +171,9 @@ export const CardHoverWrapper = styled(CardWrapper)`
@media ${devices.laptop} { @media ${devices.laptop} {
height: 279px; height: 279px;
} }
@media ${devices.tablet} {
height: 299px;
}
` `
export const CardHoverInner = styled.div` export const CardHoverInner = styled.div`

@ -1,11 +1,24 @@
import styled from 'styled-components/macro' import styled from 'styled-components/macro'
import { devices } from 'config/devices'
import { ProfileTypes } from 'config' import { ProfileTypes } from 'config'
export const Wrapper = styled.div` export const Wrapper = styled.div`
display: flex; display: flex;
margin-left: 70px; margin-left: 70px;
margin-bottom: 50px; margin-bottom: 50px;
@media ${devices.laptop} {
margin-top: 30px;
margin-left: 23px;
}
@media ${devices.laptop} {
margin-top: 14px;
margin-left: 20px;
margin-bottom: 20px;
}
` `
export const Name = styled.h1` export const Name = styled.h1`
@ -15,6 +28,11 @@ export const Name = styled.h1`
font-weight: bold; font-weight: bold;
letter-spacing: 0.02em; letter-spacing: 0.02em;
color: #fff; color: #fff;
@media ${devices.tablet} {
font-size: 22px;
line-height: 21px;
}
` `
export const Logo = styled.img<{ profileType: number }>` export const Logo = styled.img<{ profileType: number }>`
@ -58,6 +76,14 @@ export const AddToFavButton = styled.button`
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
@media ${devices.tablet} {
line-height: 13px;
svg {
display: none;
}
}
` `
export const InFavorites = styled(AddToFavButton)` export const InFavorites = styled(AddToFavButton)`
@ -70,6 +96,15 @@ export const InfoItems = styled.div`
margin-left: 20px; margin-left: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
@media ${devices.laptop} {
flex-direction: column;
align-items: flex-start;
}
@media ${devices.tablet} {
margin-left: 10px;
}
` `
export const InfoItem = styled.div` export const InfoItem = styled.div`
@ -77,4 +112,10 @@ export const InfoItem = styled.div`
font-size: 16px; font-size: 16px;
letter-spacing: 0.02em; letter-spacing: 0.02em;
color: rgba(255, 255, 255, 0.5); color: rgba(255, 255, 255, 0.5);
margin-right: 5px;
@media ${devices.tablet} {
font-size: 11px;
line-height: 10px;
}
` `

@ -54,15 +54,15 @@ export const SubscriptionStep = () => {
</PricesBlock> </PricesBlock>
</SubscriptionsBlock> </SubscriptionsBlock>
<ButtonsBlock forSubsPage> <ButtonsBlock forSubsPage>
<ButtonSolid>
<T9n t='subscription_done' />
</ButtonSolid>
<TotalInfoBlock> <TotalInfoBlock>
<TotalInfoText>Базовая + 2 дополнительно <T9n t='subscription_for' /> <TotalInfoText>Базовая + 2 дополнительно <T9n t='subscription_for' />
<TotalPriceAmmount>6997</TotalPriceAmmount> <TotalPriceAmmount>6997</TotalPriceAmmount>
<TotalPriceDetails> / МЕС</TotalPriceDetails> <TotalPriceDetails> / МЕС</TotalPriceDetails>
</TotalInfoText> </TotalInfoText>
</TotalInfoBlock> </TotalInfoBlock>
<ButtonSolid>
<T9n t='subscription_done' />
</ButtonSolid>
</ButtonsBlock> </ButtonsBlock>
</Fragment> </Fragment>
) )

@ -145,7 +145,6 @@ export const TotalInfoBlock = styled.div`
@media ${devices.tablet} { @media ${devices.tablet} {
position: static; position: static;
order: -1;
margin-bottom: 10px; margin-bottom: 10px;
width: 100%; width: 100%;
} }

@ -31,9 +31,6 @@ export const Form = styled.form<{isMatch: boolean}>`
margin-top: 25px; margin-top: 25px;
background-color: transparent; background-color: transparent;
} }
@media${devices.mobile} {
margin-top: 20px;
}
} }
@media ${devices.desktop} { @media ${devices.desktop} {
@ -87,7 +84,7 @@ export const Form = styled.form<{isMatch: boolean}>`
margin-right: 0; margin-right: 0;
} }
@media ${devices.tablet} { @media ${devices.tablet} {
margin-right: 0; margin-bottom: 2px;
background-image: url(/images/search-mob.svg); background-image: url(/images/search-mob.svg);
} }
} }

Loading…
Cancel
Save