Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove text transformations when displaying character names #96

Merged
merged 10 commits into from
Nov 17, 2023
Merged

Remove text transformations when displaying character names #96

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
921b3b8
Frontend fixes and improvements (#84)
carlos-kryha Nov 10, 2023
c3af2d1
Revert "Frontend fixes and improvements" (#92)
snthtcs Nov 13, 2023
fc95af2
Frontend fixes and improvements (#93)
snthtcs Nov 13, 2023
8fbd638
remove text-transform from character title components
carlos-kryha Nov 15, 2023
a7e8af1
Merge remote-tracking branch 'origin/develop' into hotfix/frontend-re…
carlos-kryha Nov 15, 2023
a236138
update all components that use character.name
carlos-kryha Nov 15, 2023
56b2efc
yarn.lock
carlos-kryha Nov 15, 2023
aaff041
Merge remote-tracking branch 'origin/develop' into hotfix/frontend-re…
carlos-kryha Nov 15, 2023
81959a0
one more
carlos-kryha Nov 15, 2023
126906e
buy confirmation button text
carlos-kryha Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions frontend/src/components/asset-card/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ export const AssetTitleText = styled.h3`
font-weight: ${fontWeight.medium};
font-size: 16px;
line-height: 20px;
:first-letter {
text-transform: capitalize;
}
@media (max-width: ${breakpoints.mobile}) {
overflow: hidden;
white-space: nowrap;
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/containers/canvas/character-cards/character-cards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
CharacterCardsWrapper,
CharacterInfo,
CharacterInfoCharacter,
CharacterName,
} from "./styles";
import { useMyCharacters, useSelectedCharacter } from "../../../service";
import { useUserStateDispatch } from "../../../context/user";
Expand Down Expand Up @@ -81,7 +82,7 @@ const CharacterInformation: FC<CharacterInfo> = ({ character }) => {

return (
<CharacterInfo>
<ButtonText customColor={color.black}>{character.nft.name}</ButtonText>
<CharacterName customColor={color.black}>{character.nft.name}</CharacterName>
<CharacterInfoCharacter>Title: {character.nft.title}</CharacterInfoCharacter>
<CharacterInfoCharacter>Origin: {character.nft.origin}</CharacterInfoCharacter>
<AssetTag>
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/containers/canvas/character-cards/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,13 @@ export const CharacterCardContainer = styled.div<CharacterProps>`
border: 1px solid ${color.black};
}
`;

interface TextProps {
customColor?: string;
}
export const CharacterName = styled.h3<TextProps>`
font-weight: ${fontWeight.medium};
font-size: 14px;
line-height: 15px;
${({ customColor }): string => `color: ${customColor || color.black};`};
`;
5 changes: 3 additions & 2 deletions frontend/src/pages/landing/landing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { FC, useState } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import { text } from "../../assets";
import { CharacterTitle } from './styles'
import {
BaseRoute,
BoldLabel,
Expand Down Expand Up @@ -134,7 +135,7 @@ export const Landing: FC = () => {
{/* character info */}
{interactionMode === MAIN_MODE ? (
<DetailContainer>
<PageTitle>{selectedCharacter?.nft.name}</PageTitle>
<CharacterTitle>{selectedCharacter?.nft.name}</CharacterTitle>
<PageSubTitle>{selectedCharacter?.nft.title}</PageSubTitle>
<ButtonContainer>
<ButtonInfoWrap onClick={() => setShowDetails(true)}>
Expand All @@ -148,7 +149,7 @@ export const Landing: FC = () => {
</DetailContainer>
) : (
<DetailContainer>
<PageTitle>{selectedCharacter?.nft.name}</PageTitle>
<CharacterTitle>{selectedCharacter?.nft.name}</CharacterTitle>
<PageSubTitle>{selectedCharacter?.nft.title}</PageSubTitle>
<ButtonContainer>
<AssetTag>
Expand Down
9 changes: 8 additions & 1 deletion frontend/src/pages/landing/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import styled from "@emotion/styled";
import { CloseIcon, DownArrowIcon } from "../../assets";
import { disappear, fadeIn, SecondaryButton } from "../../components";
import { CharacterWrapper } from "../../components/base-character/styles";
import { color, margins } from "../../design";
import { color, fontWeight, margins } from "../../design";
import { DetailSectionWrap } from "../../containers/detail-section/styles";

interface ImageProps {
Expand Down Expand Up @@ -95,3 +95,10 @@ export const Tag = styled.div`
border-radius: ${margins.medium};
z-index: 1000;
`;

export const CharacterTitle = styled.h1`
color: ${color.black};
font-weight: ${fontWeight.medium};
font-size: 32px;
line-height: 52px;
`;
Loading