Skip to content

Commit 3c35726

Browse files
authored
Merge pull request #1161 from ethereum/rc-1149
Fixed #1149
2 parents c6fa454 + 22f0aae commit 3c35726

File tree

3 files changed

+29
-5
lines changed

3 files changed

+29
-5
lines changed

src/components/Footer.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,14 @@ const ListItem = styled.li`
6262

6363
const FooterLink = styled(Link)`
6464
color: ${(props) => props.theme.colors.text200};
65+
&:after {
66+
color: ${(props) => props.theme.colors.text200};
67+
}
6568
&:hover {
6669
color: ${(props) => props.theme.colors.primary};
70+
&:after {
71+
color: ${(props) => props.theme.colors.primary};
72+
}
6773
}
6874
`
6975

src/components/Link.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { languageMetadata } from "../utils/translations"
88
// TODO set globally to apply to markdown files
99
const ExternalLink = styled.a`
1010
&:after {
11+
color: ${(props) => props.theme.colors.primary};
1112
margin-left: 0.125em;
1213
margin-right: 0.3em;
1314
display: inline-block;

src/components/MeetupList.js

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,14 @@ const Table = styled.div`
246246
`
247247

248248
const Item = styled(Link)`
249+
display: flex;
250+
justify-content: space-between;
249251
color: ${(props) => props.theme.colors.text} !important;
250252
box-shadow: 0 1px 1px ${(props) => props.theme.colors.tableItemBoxShadow};
251253
margin-bottom: 1px;
252254
padding: 1rem;
253255
width: 100%;
254256
color: #000;
255-
display: flex;
256257
257258
&:hover {
258259
border-radius: 4px;
@@ -268,10 +269,25 @@ const ItemNumber = styled.div`
268269
const ItemTitle = styled.div``
269270
const ItemDesc = styled.p`
270271
margin-bottom: 0;
271-
margin-left: auto;
272+
opacity: 0.6;
273+
`
274+
275+
const Flag = styled(Twemoji)`
276+
margin-right: 0.5rem;
277+
`
278+
279+
const RightContainer = styled.div`
280+
display: flex;
281+
align-items: right;
282+
align-content: flex-start;
283+
width: 25%;
284+
margin-right: 1rem;
285+
flex-wrap: wrap;
272286
`
273287
const LeftContainer = styled.div`
274288
display: flex;
289+
width: 75%;
290+
margin-right: 2rem;
275291
`
276292
// TODO create generalized CardList / TableCard
277293
// TODO prop if ordered list or unordered
@@ -285,9 +301,10 @@ const MeetupList = () => {
285301
<ItemNumber>{idx + 1}</ItemNumber>
286302
<ItemTitle>{meetup.title}</ItemTitle>
287303
</LeftContainer>
288-
<ItemDesc>
289-
<Twemoji svg text={meetup.emoji} /> {meetup.location}
290-
</ItemDesc>
304+
<RightContainer>
305+
<Flag svg text={meetup.emoji} />
306+
<ItemDesc>{meetup.location}</ItemDesc>
307+
</RightContainer>
291308
</Item>
292309
)
293310
})}

0 commit comments

Comments
 (0)