Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Start redoing all paddings/margins

Browse source
This commit is contained in:
shpuld 2019-02-06 21:30:46 +02:00
parent 4d00475e98
commit 2aef82a80e
5 changed files with 52 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/App.scss
View file

@ -660,6 +660,10 @@ nav {
border-radius: var(--inputRadius, $fallback--inputRadius); border-radius: var(--inputRadius, $fallback--inputRadius);
} }
.button-icon {
font-size: 1.2em;
}
@keyframes shakeError { @keyframes shakeError {
0% { 0% {
transform: translateX(0); transform: translateX(0);
@ -704,10 +708,6 @@ nav {
margin: 0.5em 0 0.5em 0; margin: 0.5em 0 0.5em 0;
} }
.button-icon {
font-size: 1.2em;
}
.status .status-actions { .status .status-actions {
div { div {
max-width: 4em; max-width: 4em;

2
src/components/attachment/attachment.vue
View file

@ -88,7 +88,7 @@
.attachment { .attachment {
position: relative; position: relative;
margin: 0.5em 0.5em 0em 0em; // margin: 0.5em 0.5em 0em 0em;
align-self: flex-start; align-self: flex-start;
line-height: 0; line-height: 0;

2
src/components/gallery/gallery.vue
View file

@ -30,7 +30,7 @@
margin-bottom: 0.25em; margin-bottom: 0.25em;
.attachments, .attachment { .attachments, .attachment {
margin: 0 0.5em 0 0; // margin: 0 0.5em 0 0;
flex-grow: 1; flex-grow: 1;
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;

2
src/components/link-preview/link-preview.vue
View file

@ -26,7 +26,7 @@
// TODO: clean up the random margins in attachments, this makes preview line // TODO: clean up the random margins in attachments, this makes preview line
// up with attachments... // up with attachments...
margin-right: 0.5em; // margin-right: 0.5em;
.card-image { .card-image {
flex-shrink: 0; flex-shrink: 0;

80
src/components/status/status.vue
View file

@ -32,20 +32,20 @@
</router-link> </router-link>
</div> </div>
<div class="status-body"> <div class="status-body">
<div class="usercard media-body" v-if="userExpanded"> <div class="usercard" v-if="userExpanded">
<user-card-content :user="status.user" :switcher="false"></user-card-content> <user-card-content :user="status.user" :switcher="false"></user-card-content>
</div> </div>
<div v-if="!noHeading" class="media-body container media-heading"> <!-- <div v-if="!noHeading" class="media-body container media-heading"> -->
<div class="media-heading-left"> <div v-if="!noHeading" class="media-heading">
<div class="name-and-links" style="flex-grow: 1;"> <div class="heading-name-row">
<h4 class="user-name" v-if="status.user.name_html" v-html="status.user.name_html"></h4> <h4 class="user-name" v-if="status.user.name_html" v-html="status.user.name_html"></h4>
<h4 class="user-name" v-else>{{status.user.name}}</h4> <h4 class="user-name" v-else>{{status.user.name}}</h4>
<router-link class="account-name links" :to="userProfileLink"> <router-link class="account-name" :to="userProfileLink">
{{status.user.screen_name}} {{status.user.screen_name}}
</router-link> </router-link>
<span style="align-items: baseline; flex-grow: 1; display: flex; justify-content: flex-end;"> <span class="heading-right">
<router-link style="whitespace: nowrap; flex-shrink: 0;" class="links timeago" :to="{ name: 'conversation', params: { id: status.id } }"> <router-link class="timeago" :to="{ name: 'conversation', params: { id: status.id } }">
<timeago :since="status.created_at" :auto-update="60"></timeago> <timeago :since="status.created_at" :auto-update="60"></timeago>
</router-link> </router-link>
<div class="button-icon visibility-icon" v-if="status.visibility"> <div class="button-icon visibility-icon" v-if="status.visibility">
@ -62,9 +62,9 @@
<a href="#" @click.prevent="toggleMute" v-if="unmuted"><i class="button-icon icon-eye-off"></i></a> <a href="#" @click.prevent="toggleMute" v-if="unmuted"><i class="button-icon icon-eye-off"></i></a>
</span> </span>
</div> </div>
<div class="links"> <div class="heading-reply-row">
<a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :aria-label="$t('tool_tip.reply')"> <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :aria-label="$t('tool_tip.reply')" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()">
<i class="button-icon icon-reply" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()"></i> <!-- <i class="button-icon icon-reply" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()"></i> -->
<span class="faint reply-to-text">Reply to </span> <span class="faint reply-to-text">Reply to </span>
</a> </a>
<span v-if="isReply" class="faint"> <span v-if="isReply" class="faint">
@ -80,7 +80,7 @@
</small> </small>
</h4> </h4>
</div> </div>
</div> <!-- </div> -->
<div v-if="showPreview" class="status-preview-container"> <div v-if="showPreview" class="status-preview-container">
<status class="status-preview" v-if="preview" :noReplyLinks="true" :statusoid="preview" :compact=true></status> <status class="status-preview" v-if="preview" :noReplyLinks="true" :statusoid="preview" :compact=true></status>
@ -204,6 +204,10 @@
} }
} }
.media-left {
margin-right: 0.75em;
}
.status-el { .status-el {
hyphens: auto; hyphens: auto;
overflow-wrap: break-word; overflow-wrap: break-word;
@ -231,16 +235,12 @@
.media-body { .media-body {
flex: 1; flex: 1;
padding: 0; padding: 0;
margin: 0 0 0.25em 0.8em; // margin: 0 0 0.25em 0.8em;
} }
.usercard { .usercard {
margin-bottom: .7em margin: 0;
} margin-bottom: 0.75em;
.media-heading {
flex-wrap: nowrap;
line-height: 18px;
} }
.user-name { .user-name {
@ -250,7 +250,7 @@
flex-shrink: 0; flex-shrink: 0;
max-width: 85%; max-width: 85%;
font-weight: bold; font-weight: bold;
margin-right: .2em; // margin-right: .2em;
img { img {
width: 14px; width: 14px;
@ -260,10 +260,13 @@
} }
} }
.media-heading-left { .media-heading {
padding: 0; padding: 0;
vertical-align: bottom; vertical-align: bottom;
flex-basis: 100%; flex-basis: 100%;
margin-bottom: 0.5em;
line-height: 2em;
a { a {
display: inline-block; display: inline-block;
@ -274,24 +277,30 @@
font-weight: lighter; font-weight: lighter;
} }
.name-and-links { .heading-name-row {
padding: 0; padding: 0;
flex: 1 0; flex: 1 0;
display: flex; display: flex;
align-items: baseline; align-items: baseline;
.user-name {
margin-right: 0.5em;
}
.account-name { .account-name {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} flex: 1 1 0;
.user-name {
margin-right: .4em;
} }
} }
.links { .heading-right {
display: flex;
}
.heading-reply-row {
align-content: baseline;
display: flex; display: flex;
font-size: 12px; font-size: 12px;
color: $fallback--link; color: $fallback--link;
@ -313,7 +322,7 @@
} }
} }
.reply-to-text { .reply-to-text {
margin-right: 0.5em; // margin-right: 0.5em;
} }
.reply-info { .reply-info {
display: flex; display: flex;
@ -322,7 +331,7 @@
line-height: 16px; line-height: 16px;
} }
.reply-link { .reply-link {
margin-right: 0.2em; //margin-right: 0.2em;
} }
} }
@ -330,17 +339,17 @@
display: inline-flex; display: inline-flex;
flex-shrink: 0; flex-shrink: 0;
flex-wrap: nowrap; flex-wrap: nowrap;
margin-left: .25em; // margin-left: .25em;
align-self: baseline; align-self: baseline;
.timeago { .timeago {
margin-right: 0.2em; // margin-right: 0.2em;
font-size: 12px; font-size: 12px;
align-self: last baseline; align-self: last baseline;
} }
> * { > * {
margin-left: 0.2em; // margin-left: 0.2em;
} }
a:hover i { a:hover i {
color: $fallback--text; color: $fallback--text;
@ -380,7 +389,7 @@
} }
.status-content { .status-content {
margin-right: 0.5em; // margin-right: 0.5em;
font-family: var(--postFont, sans-serif); font-family: var(--postFont, sans-serif);
img, video { img, video {
@ -491,8 +500,8 @@
display: flex; display: flex;
div, favorite-button { div, favorite-button {
padding-top: 0.25em; // padding-top: 0.25em;
max-width: 6em; max-width: 4em;
flex: 1; flex: 1;
} }
} }
@ -518,7 +527,8 @@
.status { .status {
display: flex; display: flex;
padding: 0.6em; padding: 0.75em;
// padding: 0.6em;
&.is-retweet { &.is-retweet {
padding-top: 0.1em; padding-top: 0.1em;
} }