Skip to content

Commit dbab137

Browse files
lestercoyoyjrlestercoyoyjr
committed
Merge branch 'feature/WHO-TO-FOLLOW' into develop
2 parents d6409ff + 05cb840 commit dbab137

File tree

2 files changed

+137
-31
lines changed

2 files changed

+137
-31
lines changed

‎Twitter.html

+101-17
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,45 @@ <h3>Google</h3>
111111
<p>Who to follow</p>
112112
<img src="icons/tweet_gear.svg" alt="tweet-gear">
113113
</div>
114+
<div class="who-to-follow_profile_container">
115+
<div class="tweet-post-profile_pic">
116+
<img src="profile_pics/cat2.jpg">
117+
</div>
118+
<div class="profile-info-wtof">
119+
<div class="inf-profile-wtof">
120+
<span class="trending-strong">Kevin Lim</span>
121+
<span class="trending-mini">@Klim1999</span>
122+
</div>
123+
<button class="wtof-button">Follow</button>
124+
</div>
125+
</div>
126+
<div class="who-to-follow_profile_container">
127+
<div class="tweet-post-profile_pic">
128+
<img src="profile_pics/cat.jpg">
129+
</div>
130+
<div class="profile-info-wtof">
131+
<div class="inf-profile-wtof">
132+
<span class="trending-strong">Richard Zheng</span>
133+
<span class="trending-mini">@RZheng100</span>
134+
</div>
135+
<button class="wtof-button">Follow</button>
136+
</div>
137+
</div>
138+
<div class="who-to-follow_profile_container" style="border-bottom: 1px solid rgb(238, 238, 238);">
139+
<div class="tweet-post-profile_pic">
140+
<img src="profile_pics/cat3.jpg">
141+
</div>
142+
<div class="profile-info-wtof">
143+
<div class="inf-profile-wtof">
144+
<span class="trending-strong">Morning Glory</span>
145+
<span class="trending-mini">@Morningglorynews</span>
146+
</div>
147+
<button class="wtof-button">Follow</button>
148+
</div>
149+
</div>
150+
<div class="show-more" >
151+
<p>Show more</p>
152+
</div>
114153
</div>
115154
</nav>
116155
<!-- Ends Right Buttons -->
@@ -164,9 +203,18 @@ <h3>Google</h3>
164203
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting,
165204
</div>
166205
<div class="tpc-class2b">
167-
<img src="icons/twitter_square_message.svg">
168-
<img src="icons/arrow_retweet.svg">
169-
<img src="icons/tweet_heart.svg">
206+
<div class="tweet-reply" style="display: flex; flex-direction: row;">
207+
<img src="icons/twitter_square_message.svg">
208+
<span style="margin-left: 5px; margin-top: -2px;">2</span>
209+
</div>
210+
<div class="tweet-retweet" style="display: flex; flex-direction: row;">
211+
<img src="icons/arrow_retweet.svg">
212+
<span style="margin-left: 5px; margin-top: -2px;">1</span>
213+
</div>
214+
<div class="tweet-like" style="display: flex; flex-direction: row;">
215+
<img src="icons/tweet_heart.svg">
216+
<span style="margin-left: 5px; margin-top: -2px;">10</span>
217+
</div>
170218
<img src="icons/tweet_upload_icon.svg">
171219
</div>
172220
</div>
@@ -194,11 +242,20 @@ <h3>Google</h3>
194242
<img src="tweet_img/istockphoto-474291976-612x612.jpg">
195243
</div>
196244
<div class="tpc-class2b">
197-
<img src="icons/twitter_square_message.svg">
198-
<img src="icons/arrow_retweet.svg">
199-
<img src="icons/tweet_heart.svg">
245+
<div class="tweet-reply" style="display: flex; flex-direction: row;">
246+
<img src="icons/twitter_square_message.svg">
247+
<span style="margin-left: 5px; margin-top: -2px;">5</span>
248+
</div>
249+
<div class="tweet-retweet" style="display: flex; flex-direction: row;">
250+
<img src="icons/arrow_retweet.svg">
251+
<span style="margin-left: 5px; margin-top: -2px;"></span>
252+
</div>
253+
<div class="tweet-like" style="display: flex; flex-direction: row;">
254+
<img src="icons/tweet_heart.svg">
255+
<span style="margin-left: 5px; margin-top: -2px;">1</span>
256+
</div>
200257
<img src="icons/tweet_upload_icon.svg">
201-
</div>
258+
</div>
202259
</div>
203260
<div class="tpc-class3">
204261

@@ -225,9 +282,18 @@ <h3>Google</h3>
225282
<img id="img-top-right1" src="tweet_img/2.jpg">
226283
</div>
227284
<div class="tpc-class2b">
228-
<img src="icons/twitter_square_message.svg">
229-
<img src="icons/arrow_retweet.svg">
230-
<img src="icons/tweet_heart.svg">
285+
<div class="tweet-reply" style="display: flex; flex-direction: row;">
286+
<img src="icons/twitter_square_message.svg">
287+
<span style="margin-left: 5px; margin-top: -2px;">6</span>
288+
</div>
289+
<div class="tweet-retweet" style="display: flex; flex-direction: row;">
290+
<img src="icons/arrow_retweet.svg">
291+
<span style="margin-left: 5px; margin-top: -2px;">8</span>
292+
</div>
293+
<div class="tweet-like" style="display: flex; flex-direction: row;">
294+
<img src="icons/tweet_heart.svg">
295+
<span style="margin-left: 5px; margin-top: -2px;">25</span>
296+
</div>
231297
<img src="icons/tweet_upload_icon.svg">
232298
</div>
233299
</div>
@@ -258,9 +324,18 @@ <h3>Google</h3>
258324
<img id="img-top-right2" src="tweet_img/4.jpg">
259325
</div>
260326
<div class="tpc-class2b">
261-
<img src="icons/twitter_square_message.svg">
262-
<img src="icons/arrow_retweet.svg">
263-
<img src="icons/tweet_heart.svg">
327+
<div class="tweet-reply" style="display: flex; flex-direction: row;">
328+
<img src="icons/twitter_square_message.svg">
329+
<span style="margin-left: 5px; margin-top: -2px;">9</span>
330+
</div>
331+
<div class="tweet-retweet" style="display: flex; flex-direction: row;">
332+
<img src="icons/arrow_retweet.svg">
333+
<span style="margin-left: 5px; margin-top: -2px;">3</span>
334+
</div>
335+
<div class="tweet-like" style="display: flex; flex-direction: row;">
336+
<img src="icons/tweet_heart.svg">
337+
<span style="margin-left: 5px; margin-top: -2px;">100</span>
338+
</div>
264339
<img src="icons/tweet_upload_icon.svg">
265340
</div>
266341
</div>
@@ -294,11 +369,20 @@ <h3>Google</h3>
294369
</div>
295370
</div>
296371
<div class="tpc-class2b">
297-
<img src="icons/twitter_square_message.svg">
298-
<img src="icons/arrow_retweet.svg">
299-
<img src="icons/tweet_heart.svg">
372+
<div class="tweet-reply" style="display: flex; flex-direction: row;">
373+
<img src="icons/twitter_square_message.svg">
374+
<span style="margin-left: 5px; margin-top: -2px;">15</span>
375+
</div>
376+
<div class="tweet-retweet" style="display: flex; flex-direction: row;">
377+
<img src="icons/arrow_retweet.svg">
378+
<span style="margin-left: 5px; margin-top: -2px;">5</span>
379+
</div>
380+
<div class="tweet-like" style="display: flex; flex-direction: row;">
381+
<img src="icons/tweet_heart.svg">
382+
<span style="margin-left: 5px; margin-top: -2px;">105</span>
383+
</div>
300384
<img src="icons/tweet_upload_icon.svg">
301-
</div>
385+
</div>
302386
</div>
303387
<div class="tpc-class3">
304388

‎styles/right_sidebar.css

+36-14
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
filter: invert(.3) sepia(3) saturate(1) hue-rotate(170deg);
8181
margin: 0;
8282
}
83-
.trending{
84-
height: 1fr;
83+
.trending,
84+
.who-to-follow_profile_container{
8585
padding: 10px;
8686
border: 1px solid rgb(230, 230, 230);
8787
border-bottom: none;
@@ -136,24 +136,46 @@
136136
border-top-right-radius: 10px;
137137
border-bottom-right-radius: 10px;
138138
}
139-
140-
141139
.t-link-content h3,
142140
.t-link-content p{
143141
margin: 0;
144142
}
145-
/*
146-
.t-link-image{
147-
display: flex;
148-
width: 50px;
149-
}
150-
.t-link-image img{
151-
flex: 1;
152-
object-fit: contain;
153-
width: 50px;
154-
} */
143+
155144
/* Who-to-follow container */
156145
.who-to-follow-container{
157146
height: 500px;
158147
border-radius: 20px;
148+
}
149+
.who-to-follow_profile_container{
150+
flex-direction: row;
151+
}
152+
.who-to-follow-container .tweet-post-profile_pic{
153+
align-items:center;
154+
padding-top: 0;
155+
}
156+
.profile-info-wtof{
157+
display: flex;
158+
flex-direction: row;
159+
flex: 1;
160+
justify-content: space-between;
161+
}
162+
.profile-info-wtof{
163+
margin: 0;
164+
}
165+
.inf-profile-wtof{
166+
display: flex;
167+
flex-direction: column;
168+
}
169+
.wtof-button{
170+
width: 70px;
171+
height: 30px;
172+
border: 1px solid #1EA2F1;
173+
border-radius: 20px;
174+
background-color: none;
175+
color: #1EA2F1;
176+
font-weight: bold;
177+
}
178+
.who-to-follow-container .tweet-post-profile_pic img{
179+
width: 45px;
180+
height: 45px;
159181
}

0 commit comments

Comments
 (0)