diff --git a/src/components/Status/index.vue b/src/components/Status/index.vue index f6c63a12..50fbcfb0 100644 --- a/src/components/Status/index.vue +++ b/src/components/Status/index.vue @@ -267,9 +267,8 @@ export default { font-style: italic; } } -@media -only screen and (max-width: 760px), -(min-device-width: 768px) and (max-device-width: 1024px) { + +@media only screen and (max-width:480px) { .el-message { min-width: 80%; } diff --git a/src/views/invites/index.vue b/src/views/invites/index.vue index e8ca75fd..2497bfc0 100644 --- a/src/views/invites/index.vue +++ b/src/views/invites/index.vue @@ -85,7 +85,7 @@ sortable/> {{ scope.row.used ? $t('invites.used') : $t('invites.active') }} + disable-transitions> + {{ scope.row.used ? $t('invites.used') : $t('invites.active') }} +

{{ $t('moderationLog.moderationLog') }}

- - - - - - - - - - - - - - - - - +
+ + + + + + +
+
@@ -76,6 +71,9 @@ export default { } }, computed: { + isMobile() { + return this.$store.state.app.device === 'mobile' + }, loading() { return this.$store.state.moderationLog.logLoading && this.$store.state.moderationLog.adminsLoading @@ -138,7 +136,17 @@ h1 { margin: 25px 45px 0 0; padding: 0px; } -.user-select { +.moderation-log-date-panel { + width: 350px; +} +.moderation-log-nav-container { + display: flex; + justify-content: space-between; +} +.moderation-log-search { + width: 350px; +} +.moderation-log-user-select { margin: 0 0 20px; width: 350px; } @@ -148,4 +156,30 @@ h1 { .pagination { text-align: center; } + +@media only screen and (max-width:480px) { + .moderation-log-date-panel { + width: 100%; + } + .moderation-log-user-select { + margin: 0 0 10px; + width: 55%; + } + .moderation-log-search { + width: 40%; + } +} + +@media only screen and (max-width:801px) and (min-width: 481px) { + .moderation-log-date-panel { + width: 55%; + } + .moderation-log-user-select { + margin: 0 0 10px; + width: 55%; + } + .moderation-log-search { + width: 40%; + } +} diff --git a/src/views/reports/components/GroupedReport.vue b/src/views/reports/components/GroupedReport.vue index fe4aa6f3..54ee5b1a 100644 --- a/src/views/reports/components/GroupedReport.vue +++ b/src/views/reports/components/GroupedReport.vue @@ -109,6 +109,9 @@ export default { .el-icon-arrow-right { margin-right: 6px; } + .divider { + margin: 15px 0; + } .grouped-report { .header-container { display: flex; @@ -137,9 +140,8 @@ export default { .reported-status { margin-top: 15px; } - @media - only screen and (max-width: 760px), - (min-device-width: 768px) and (max-device-width: 1024px) { + + @media only screen and (max-width:480px) { .grouped-report { .header-container { display: flex; @@ -155,5 +157,13 @@ export default { margin-bottom: 7px; } } + .block { + .reports-timeline .el-timeline { + margin: 20px 10px; + .el-timeline-item__wrapper { + padding-left: 20px; + } + } + } } diff --git a/src/views/reports/components/NoteCard.vue b/src/views/reports/components/NoteCard.vue index fdc81d91..379e752b 100644 --- a/src/views/reports/components/NoteCard.vue +++ b/src/views/reports/components/NoteCard.vue @@ -97,9 +97,8 @@ export default { display: flex; justify-content: space-between; } - @media - only screen and (max-width: 760px), - (min-device-width: 768px) and (max-device-width: 1024px) { + + @media only screen and (max-width:480px) { .el-card__header { padding: 10px 17px; } diff --git a/src/views/reports/components/Report.vue b/src/views/reports/components/Report.vue index 9b963679..5911ad7d 100644 --- a/src/views/reports/components/Report.vue +++ b/src/views/reports/components/Report.vue @@ -74,7 +74,7 @@ v-model="notes[report.id]" :placeholder="$t('reports.leaveNote')" type="textarea" - rows="3"/> + rows="2"/>
{{ $t('reports.postNote') }}
@@ -279,9 +279,8 @@ export default { font-style: italic; color: gray; } - @media - only screen and (max-width: 760px), - (min-device-width: 768px) and (max-device-width: 1024px) { + + @media only screen and (max-width:480px) { .report { .header-container { display: flex; @@ -303,5 +302,11 @@ export default { margin-bottom: 7px; } } + .reports-timeline { + margin: 20px 10px; + .el-timeline-item__wrapper { + padding-left: 20px; + } + } } diff --git a/src/views/reports/components/ReportCard.vue b/src/views/reports/components/ReportCard.vue index 6121bb52..430b58bb 100644 --- a/src/views/reports/components/ReportCard.vue +++ b/src/views/reports/components/ReportCard.vue @@ -108,9 +108,8 @@ export default { display: flex; justify-content: space-between; } - @media - only screen and (max-width: 760px), - (min-device-width: 768px) and (max-device-width: 1024px) { + + @media only screen and (max-width:480px) { .el-card__header { padding: 10px 17px; } diff --git a/src/views/reports/components/ReportsFilter.vue b/src/views/reports/components/ReportsFilter.vue index da1fd782..29e15075 100644 --- a/src/views/reports/components/ReportsFilter.vue +++ b/src/views/reports/components/ReportsFilter.vue @@ -54,12 +54,17 @@ export default { .select-field { width: 350px; } -@media -only screen and (max-width: 760px), -(min-device-width: 768px) and (max-device-width: 1024px) { + +@media only screen and (max-width:480px) { .select-field { width: 100%; margin-bottom: 5px; } } + +@media only screen and (max-width:801px) and (min-width: 481px) { + .select-field { + width: 50%; + } +} diff --git a/src/views/reports/index.vue b/src/views/reports/index.vue index 3e67d90e..8c37e6a1 100644 --- a/src/views/reports/index.vue +++ b/src/views/reports/index.vue @@ -92,9 +92,8 @@ export default { font-size: 28px; } } -@media -only screen and (max-width: 760px), -(min-device-width: 768px) and (max-device-width: 1024px) { + +@media only screen and (max-width:480px) { .reports-container { h1 { margin: 7px 10px 15px 10px; @@ -103,8 +102,5 @@ only screen and (max-width: 760px), margin: 0 10px; } } - #app > div > div.main-container > section > div > div.block > ul { - margin: 45px 45px 5px 19px; - } } diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss index a6658b55..5b68e0c6 100644 --- a/src/views/settings/styles/main.scss +++ b/src/views/settings/styles/main.scss @@ -520,8 +520,8 @@ margin-right: 8px } } - @media only screen and (max-width:801px) and (min-width: 481px) { + @media only screen and (max-width:801px) and (min-width: 481px) { .delete-setting-button { margin: 4px 0 0 10px; height: 28px; diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue index 828526c8..b6fd2019 100644 --- a/src/views/statuses/index.vue +++ b/src/views/statuses/index.vue @@ -129,19 +129,19 @@ h1 { margin: 22px 0 0 0; } -@media -only screen and (max-width: 760px), -(min-device-width: 768px) and (max-device-width: 1024px) { +@media only screen and (max-width:480px) { .filter-container { display: flex; height: 36px; flex-direction: column; - margin: 10px 10px + margin: 10px 0; } - .select-field { width: 100%; margin-bottom: 5px; } + .select-instance { + width: 100%; + } } diff --git a/src/views/users/components/NewAccountDialog.vue b/src/views/users/components/NewAccountDialog.vue index 4190f3cc..5b32985d 100644 --- a/src/views/users/components/NewAccountDialog.vue +++ b/src/views/users/components/NewAccountDialog.vue @@ -139,9 +139,8 @@ export default { .create-account-form-item-without-margin { margin-bottom: 0px; } -@media -only screen and (max-width: 760px), -(min-device-width: 768px) and (max-device-width: 1024px) { + +@media only screen and (max-width:480px) { .create-user-dialog { width: 85% } diff --git a/src/views/users/components/UsersFilter.vue b/src/views/users/components/UsersFilter.vue index edb3d75d..eba859f6 100644 --- a/src/views/users/components/UsersFilter.vue +++ b/src/views/users/components/UsersFilter.vue @@ -61,12 +61,17 @@ export default { .select-field { width: 350px; } -@media -only screen and (max-width: 760px), -(min-device-width: 768px) and (max-device-width: 1024px) { + +@media only screen and (max-width:480px) { .select-field { width: 100%; margin-bottom: 5px; } } + +@media only screen and (max-width:801px) and (min-width: 481px) { + .select-field { + width: 50%; + } +} diff --git a/src/views/users/index.vue b/src/views/users/index.vue index 2940f776..780f9b39 100644 --- a/src/views/users/index.vue +++ b/src/views/users/index.vue @@ -269,9 +269,8 @@ export default { font-size: 28px; } } -@media -only screen and (max-width: 760px), -(min-device-width: 768px) and (max-device-width: 1024px) { + +@media only screen and (max-width:480px) { .password-reset-token-dialog { width: 85% } diff --git a/src/views/users/show.vue b/src/views/users/show.vue index 40952aeb..ca0ed538 100644 --- a/src/views/users/show.vue +++ b/src/views/users/show.vue @@ -23,81 +23,73 @@

- - - - - - -

{{ $t('userProfile.recentStatuses') }}

-
- - - {{ $t('userProfile.showPrivateStatuses') }} - - -
- + @@ -193,6 +185,11 @@ table { margin-left: 28px; color: #606266; } +.recent-statuses-container { + display: flex; + flex-direction: column; + width: 67%; +} .recent-statuses-header { margin-top: 10px; } @@ -205,6 +202,10 @@ table { line-height: 67px; margin-right: 20px; } +.show-private-statuses { + margin-left: 28px; + margin-bottom: 20px; +} .recent-statuses { margin-left: 28px; } @@ -218,6 +219,11 @@ table { } .user-profile-card { margin: 0 20px; + width: 30%; + height: fit-content; +} +.user-profile-container { + display: flex; } .user-profile-table { margin: 0; @@ -225,4 +231,65 @@ table { .user-profile-tag { margin: 0 4px 4px 0; } + +@media only screen and (max-width:480px) { + .avatar-name-container { + margin-bottom: 10px; + } + .recent-statuses { + margin: 20px 10px 15px 10px; + } + .recent-statuses-container { + width: 100%; + margin: 0 10px; + } + .show-private-statuses { + margin: 0 10px 20px 10px; + } + .user-page-header { + flex-direction: column; + align-items: flex-start; + padding: 0; + margin: 7px 0 15px 10px; + } + .user-profile-card { + margin: 0 10px; + width: 95%; + td { + width: 80px; + } + } + .user-profile-container { + flex-direction: column; + } +} + +@media only screen and (max-width:801px) and (min-width: 481px) { + .avatar-name-container { + margin-bottom: 20px; + } + .recent-statuses { + margin: 20px 10px 15px 0; + } + .recent-statuses-container { + width: 97%; + margin: 0 20px; + } + .show-private-statuses { + margin: 0 10px 20px 0; + } + .user-page-header { + flex-direction: column; + align-items: flex-start; + padding: 0; + margin: 7px 0 20px 20px; + } + .user-profile-card { + margin: 0 20px; + width: fit-content; + } + .user-profile-container { + flex-direction: column; + } +}