Fix styles and add message when there are no statuses

This commit is contained in:
Angelina Filippova 2019-11-29 01:18:33 +09:00
parent e6a06e929b
commit 775d7c36f6
4 changed files with 60 additions and 54 deletions

View file

@ -245,7 +245,8 @@ export default {
roles: 'Roles', roles: 'Roles',
activeUppercase: 'Active', activeUppercase: 'Active',
active: 'active', active: 'active',
deactivated: 'deactivated' deactivated: 'deactivated',
noStatuses: 'No statuses to show'
}, },
usersFilter: { usersFilter: {
inputPlaceholder: 'Select filter', inputPlaceholder: 'Select filter',

View file

@ -185,54 +185,56 @@ export default {
</script> </script>
<style rel='stylesheet/scss' lang='scss'> <style rel='stylesheet/scss' lang='scss'>
.account {
text-decoration: underline;
line-height: 26px;
font-size: 13px;
}
.image {
width: 20%;
img {
width: 100%;
}
}
.show-more-button {
margin-left: 5px;
}
.status-account {
display: flex;
align-items: center;
}
.status-avatar-img {
width: 15px;
height: 15px;
margin-right: 5px;
}
.status-account-name {
margin: 0;
height: 22px;
}
.status-body {
display: flex;
flex-direction: column;
}
.status-content {
font-size: 15px;
line-height: 26px;
}
.status-card { .status-card {
margin-bottom: 15px; .account {
} text-decoration: underline;
.status-deleted { line-height: 26px;
font-style: italic; font-size: 13px;
margin-top: 3px; }
} .image {
.status-header { width: 20%;
display: flex; img {
justify-content: space-between; width: 100%;
} }
.status-without-content { }
font-style: italic; .show-more-button {
margin-left: 5px;
}
.status-account {
display: flex;
align-items: center;
}
.status-avatar-img {
width: 15px;
height: 15px;
margin-right: 5px;
}
.status-account-name {
margin: 0;
height: 22px;
}
.status-body {
display: flex;
flex-direction: column;
}
.status-content {
font-size: 15px;
line-height: 26px;
}
.status-card {
margin-bottom: 15px;
}
.status-deleted {
font-style: italic;
margin-top: 3px;
}
.status-header {
display: flex;
justify-content: space-between;
}
.status-without-content {
font-style: italic;
}
} }
@media @media
only screen and (max-width: 760px), only screen and (max-width: 760px),

View file

@ -156,9 +156,6 @@
</p> </p>
</div> </div>
</el-dialog> </el-dialog>
<div v-if="users.length === 0" class="no-users-message">
<p>There are no users to display</p>
</div>
<div v-if="!loading" class="pagination"> <div v-if="!loading" class="pagination">
<el-pagination <el-pagination
:total="usersCount" :total="usersCount"

View file

@ -61,7 +61,7 @@
</el-card> </el-card>
</el-col> </el-col>
<el-row type="flex" class="row-bg" justify="space-between"> <el-row type="flex" class="row-bg" justify="space-between">
<el-col :span="16"> <el-col :span="18">
<h2 class="recent-statuses">{{ $t('userProfile.recentStatuses') }}</h2> <h2 class="recent-statuses">{{ $t('userProfile.recentStatuses') }}</h2>
</el-col> </el-col>
<el-col :span="6" class="show-private"> <el-col :span="6" class="show-private">
@ -70,11 +70,12 @@
</el-checkbox> </el-checkbox>
</el-col> </el-col>
</el-row> </el-row>
<el-col :span="18"> <el-col :span="16">
<el-timeline v-if="!statusesLoading" class="statuses"> <el-timeline v-if="!statusesLoading" class="statuses">
<el-timeline-item v-for="status in statuses" :key="status.id"> <el-timeline-item v-for="status in statuses" :key="status.id">
<status :status="status" :user-id="user.id" :godmode="showPrivate"/> <status :status="status" :user-id="user.id" :godmode="showPrivate"/>
</el-timeline-item> </el-timeline-item>
<p v-if="statuses.length === 0" class="no-statuses">{{ $t('userProfile.noStatuses') }}</p>
</el-timeline> </el-timeline>
</el-col> </el-col>
</el-row> </el-row>
@ -147,6 +148,11 @@ table {
width: 100%; width: 100%;
} }
} }
.no-statuses {
margin-left: 28px;
color: #606266;
}
.recent-statuses-header { .recent-statuses-header {
margin-top: 10px; margin-top: 10px;
} }
@ -159,7 +165,7 @@ table {
padding-right: 20px; padding-right: 20px;
} }
.recent-statuses { .recent-statuses {
margin-left: 40px; margin-left: 28px;
} }
.user-profile-card { .user-profile-card {
margin-left: 15px; margin-left: 15px;