Skip to content
This repository was archived by the owner on Oct 27, 2023. It is now read-only.

Commit 4195a81

Browse files
author
robinsandborg
committed
Add media-query and more props based styles
1 parent 25f79ba commit 4195a81

File tree

8 files changed

+41
-11
lines changed

8 files changed

+41
-11
lines changed

src/css-modules/Feed.cm.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const FeedCM = () => (
1212
timestamp={item.timestamp}
1313
likes={item.likes}
1414
avatar={item.avatar}
15+
isNew={item.new}
1516
key={item.id}
1617
/>
1718
))}

src/css/Feed.css.js

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const FeedCSS = () => (
1515
timestamp={item.timestamp}
1616
likes={item.likes}
1717
avatar={item.avatar}
18+
isNew={item.new}
1819
key={item.id}
1920
/>
2021
))}

src/css/Feed.item.css.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ const FeedItemCSS = ({
1111
body,
1212
timestamp,
1313
likes,
14-
avatar
14+
avatar,
15+
isNew
1516
}) => (
1617
<div className="css-feed-item">
1718
<div className="css-flag">
@@ -31,7 +32,9 @@ const FeedItemCSS = ({
3132
<span> · </span>
3233
<span className="css-feed-item-user">{`@${username}`}</span>
3334
</div>
34-
<span className="css-feed-item-timestamp">{timestamp}</span>
35+
<span className={`css-feed-item-timestamp ${isNew ? "new" : ""}`}>
36+
{timestamp}
37+
</span>
3538
</div>
3639
</div>
3740
</div>

src/css/Feed.item.styles.css

+27-7
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,31 @@
1212
}
1313

1414
.css-feed-item:nth-child(2):hover .css-feed-item-footer {
15-
border-color: #7ed321;
15+
border-color: #8ccfb9;
1616
}
1717

1818
.css-feed-item:nth-child(3):hover .css-feed-item-footer {
19-
border-color: #184ab1;
19+
border-color: #88a0ba;
2020
}
2121

2222
.css-feed-item:nth-child(4):hover .css-feed-item-footer {
23-
border-color: #f575a6;
23+
border-color: #f27788;
2424
}
2525

2626
.css-feed-item:last-child {
2727
border-bottom: 1px solid #dfdfe6;
2828
}
2929

3030
.css-feed-item-avatar {
31-
width: 54px;
31+
width: 36px;
3232
border-radius: 50%;
3333
}
3434

3535
.css-feed-item-header {
3636
display: flex;
37+
flex-wrap: wrap;
3738
justify-content: space-between;
39+
font-size: 14px;
3840
}
3941

4042
.css-feed-item-author {
@@ -58,11 +60,13 @@
5860
text-align: right;
5961
}
6062

63+
.css-feed-item-timestamp.new {
64+
color: #f27788;
65+
}
66+
6167
.css-feed-item-body {
6268
font-family: serif;
63-
font-size: 1.3rem;
64-
line-height: 1.5;
65-
margin: 24px 0;
69+
margin: 12px 0;
6670
}
6771

6872
.css-feed-item-footer {
@@ -105,3 +109,19 @@
105109
width: 20px;
106110
vertical-align: middle;
107111
}
112+
113+
@media screen and (min-width: 740px) {
114+
.css-feed-item-body {
115+
margin: 24px 0;
116+
font-size: 1.3rem;
117+
line-height: 1.5;
118+
}
119+
120+
.css-feed-item-avatar {
121+
width: 54px;
122+
}
123+
124+
.css-feed-item-header {
125+
font-size: 14px;
126+
}
127+
}

src/data/feed.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ const data = [
77
timestamp: "45m",
88
likes: 138,
99
avatar: "/img/amundsen.jpg",
10-
id: "12r8yfq9"
10+
id: "12r8yfq9",
11+
new: true
1112
},
1213
{
1314
fullname: "Fridtjof Nansen",
@@ -17,7 +18,8 @@ const data = [
1718
timestamp: "2h",
1819
likes: 227,
1920
avatar: "/img/nansen.jpg",
20-
id: "po3ertjfws"
21+
id: "po3ertjfws",
22+
new: true
2123
},
2224
{
2325
fullname: "Helge Ingstad",

src/glamor/Feed.glamor.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const FeedGlamor = () => (
1212
timestamp={item.timestamp}
1313
likes={item.likes}
1414
avatar={item.avatar}
15+
isNew={item.new}
1516
key={item.id}
1617
/>
1718
))}

src/rebem/Feed.bem.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const FeedBEM = () => (
1212
timestamp={item.timestamp}
1313
likes={item.likes}
1414
avatar={item.avatar}
15+
isNew={item.new}
1516
key={item.id}
1617
/>
1718
))}

src/styled-components/Feed.sc.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const FeedSC = () => (
1212
timestamp={item.timestamp}
1313
likes={item.likes}
1414
avatar={item.avatar}
15+
isNew={item.new}
1516
key={item.id}
1617
/>
1718
))}

0 commit comments

Comments
 (0)