Skip to content

Commit 396acc7

Browse files
authored
Merge pull request #79 from BinaryStudioAcademy/feature/fix-style
Fix tweet image position, change created time color
2 parents 61eb678 + b34edfa commit 396acc7

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

frontend/src/components/view/tweet/Comment.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<br>
2323
{{ comment.body }}
2424
<br>
25-
<small>
25+
<small class="has-text-grey">
2626
{{ comment.created | createdDate }}
2727
</small>
2828
</p>

frontend/src/components/view/tweet/TweetContainer.vue

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,20 @@
2626
<p class="tweet-text">
2727
<strong>{{ tweet.author.firstName }} {{ tweet.author.lastName }}</strong>
2828
<br>
29-
<small>
29+
<small class="has-text-grey">
3030
{{ tweet.created | createdDate }}
3131
</small>
3232
<br>
3333
{{ tweet.text }}
34-
<br>
3534
</p>
36-
37-
<nav class="level is-mobile activity">
35+
<figure v-if="tweet.imageUrl" class="image is-3by1 tweet-image">
36+
<img
37+
:src="tweet.imageUrl"
38+
alt="Tweet image"
39+
@click="showImageModal"
40+
>
41+
</figure>
42+
<nav class="level is-mobile">
3843
<div class="level-left">
3944
<b-tooltip label="Comments" animated>
4045
<a class="level-item auto-cursor">
@@ -65,14 +70,6 @@
6570
</b-tooltip>
6671
</div>
6772
</nav>
68-
69-
<figure v-if="tweet.imageUrl" class="image is-3by1 tweet-image">
70-
<img
71-
:src="tweet.imageUrl"
72-
alt="Tweet image"
73-
@click="showImageModal"
74-
>
75-
</figure>
7673
</div>
7774
</div>
7875

@@ -97,7 +94,7 @@
9794

9895
<b-modal :active.sync="isImageModalActive">
9996
<p class="image is-4by3">
100-
<img :src="tweet.imageUrl">
97+
<img class="fit" :src="tweet.imageUrl">
10198
</p>
10299
</b-modal>
103100

@@ -249,6 +246,11 @@ export default {
249246
.content {
250247
figure {
251248
margin-top: 0;
249+
margin-bottom: .75rem;
252250
}
253251
}
252+
253+
.column {
254+
padding-bottom: 0;
255+
}
254256
</style>

0 commit comments

Comments
 (0)