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

Jump to bottom

Font sizes updated #56

Merged
merged 9 commits into from Jul 10, 2019
Merged

Font sizes updated #56

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
93b6e81
experiments
rkzel Jul 2, 2019
65c1e99
experiments
rkzel Jul 2, 2019
67d8e8e
font sizes updates
rkzel Jul 2, 2019
40293e9
cleanup of experimental code, last font sizes fixes
rkzel Jul 2, 2019
e8d7804
keeping aragon/ui way of FE
rkzel Jul 10, 2019
cd7c66a
Merge branch 'master' of github.com:AutarkLabs/aragon-profile into 35…
rkzel Jul 10, 2019
4ecccc3
replaced clickable Texts with Link.Buttons, used aragon/ui FE styles
rkzel Jul 10, 2019
809d570
separate component for school and company names
rkzel Jul 10, 2019
9a71588
renamed SchoolCompanyName to TileHeader
rkzel Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/client/components/EducationHistoryTile.js
View file
Open in desktop
Expand Up @@ -13,14 +13,33 @@ const EducationHistoryTile = ({
}) => (
<SingleEducationItem>
<div>
<Text.Block size="large">{educationHistoryData.organization}</Text.Block>
<Text.Block size="normal">
<Text.Block
css={`
font-size: 16px;
line-height: 1.8;
font-weight: bold;
rkzel marked this conversation as resolved.
Show resolved Hide resolved
`}
>
{educationHistoryData.organization}
</Text.Block>
<Text.Block
css={`
font-size: 15px;
line-height: 1.8;
`}
>
{educationHistoryData.degree}
{educationHistoryData.fieldOfStudy
? ', ' + educationHistoryData.fieldOfStudy
: ''}
</Text.Block>
<Dates>{displayStartEndDates(educationHistoryData)}</Dates>
<Dates
css={`
font-size: 12px;
`}
>
{displayStartEndDates(educationHistoryData)}
</Dates>
</div>
<Icons>
<Button onClick={() => openModal()}>
Expand Down
8 changes: 7 additions & 1 deletion src/client/components/EducationPanel.js
View file
Open in desktop
Expand Up @@ -35,7 +35,13 @@ const EducationPanel = () => {
))
) : (
<Center>
<Text size="xlarge">You have no education</Text>
<Text
css={`
font-size: 15px;
`}
>
You have no education
</Text>
{!viewMode && (
<Text
css={`
Expand Down
8 changes: 7 additions & 1 deletion src/client/components/WorkHistoryPanel.js
View file
Open in desktop
Expand Up @@ -33,7 +33,13 @@ const WorkHistoryPanel = () => {
))
) : (
<Center>
<Text size="xlarge">You have no work history</Text>
<Text
css={`
font-size: 15px;
`}
>
You have no work history
</Text>
{!viewMode && (
<Text
css={`
Expand Down
19 changes: 13 additions & 6 deletions src/client/components/WorkHistoryTile.js
View file
Open in desktop
Expand Up @@ -10,31 +10,38 @@ const WorkHistoryTile = ({ workHistoryData, openModal, removeItem }) => (
<SingleWorkItem>
<Details>
<Text.Block
size="large"
css={`
font-weight: 700;
font-size: 16px;
line-height: 1.8;
font-weight: bold;
rkzel marked this conversation as resolved.
Show resolved Hide resolved
`}
>
{workHistoryData.workPlace}
</Text.Block>
<Text.Block
size="normal"
css={`
font-weight: 600;
font-size: 16px;
`}
>
{workHistoryData.jobTitle}
<Text
size="xsmall"
color={theme.textTertiary}
css={`
margin-left: 13px;
font-size: 12px;
`}
>
{displayStartEndDates(workHistoryData)}
</Text>
</Text.Block>
<Text.Block size="normal">{workHistoryData.description}</Text.Block>
<Text.Block
css={`
font-size: 14px;
font-weight: normal;
`}
>
{workHistoryData.description}
</Text.Block>
</Details>
<Icons>
<IconPencil
Expand Down
3 changes: 2 additions & 1 deletion src/client/components/informationPanel/InformationCard.js
View file
Open in desktop
Expand Up @@ -318,9 +318,10 @@ const Link = styled(SafeLink).attrs({
const Verified = styled(IconVerified)`
margin-left: 8px;
`
const EthAddr = styled(Text).attrs({ size: 'small' })`
const EthAddr = styled(Text)`
color: ${theme.textTertiary};
word-break: break-all;
font-size: 12px;
rkzel marked this conversation as resolved.
Show resolved Hide resolved
`
const Icons = styled.div`
position: absolute;
Expand Down