From 8c98c18c2bf73863923192e65c28fca1b4165313 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 28 Mar 2019 13:48:35 -0400 Subject: [PATCH] FIX: Remove old flagging scss, fix more linting --- .../controllers/admin-users-list-show.js.es6 | 1 - .../stylesheets/common/admin/admin_base.scss | 1 - .../stylesheets/common/admin/flagging.scss | 307 ------------------ 3 files changed, 309 deletions(-) delete mode 100644 app/assets/stylesheets/common/admin/flagging.scss diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 index ed6f4d4ca6d..b5b0c5b08ae 100644 --- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 @@ -36,7 +36,6 @@ export default Ember.Controller.extend(CanCheckEmails, { }, actions: { - toggleEmailVisibility() { this.toggleProperty("showEmails"); this._refreshUsers(); diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index d42562f4635..8fa9e68758d 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -967,7 +967,6 @@ table#user-badges { @import "common/admin/suspend"; @import "common/admin/badges"; @import "common/admin/emails"; -@import "common/admin/flagging"; @import "common/admin/staff_logs"; @import "common/admin/customize"; @import "common/admin/customize-install-theme"; diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss deleted file mode 100644 index f630655869b..00000000000 --- a/app/assets/stylesheets/common/admin/flagging.scss +++ /dev/null @@ -1,307 +0,0 @@ - -.flagged-post.hidden-post { - .flagged-post-excerpt, - .flagged-post-avatar { - opacity: 0.5; - } -} - -.flagged-post.deleted { - .flagged-post-excerpt, - .flagged-post-avatar { - background-color: $danger-low; - } -} - -.flagged-post { - padding: 1em 0 0.55em 0; - border-bottom: 1px solid $primary-low; - - .flagged-post-details { - display: flex; - - .flagged-post-avatar { - position: relative; - margin-right: 10px; - - img.avatar { - min-width: 45px; - } - - .edited-after { - text-align: center; - margin-top: 0.5em; - } - - .previous-flagged-posts { - position: absolute; - right: -5px; - top: -5px; - background-color: $danger; - } - } - - .flagged-post-contents { - width: calc(100% - 55px); - word-wrap: break-word; - - .flagged-post-user-details { - display: flex; - justify-content: space-between; - - .username { - font-weight: bold; - color: $primary; - } - margin-bottom: 0.5em; - } - - .d-icon { - display: inline-block; - } - h3 { - margin-top: 0; - margin-bottom: 0.5em; - } - p:last-child { - margin-bottom: 0; - } - } - } - - .flagged-post-reply-count { - font-weight: normal; - } - - .flag-user-lists { - display: flex; - align-items: flex-start; - margin-top: 1em; - } - - .user-list-title { - font-weight: bold; - margin: 0; - } - - .flag-users { - margin: 0.5em 0; - display: flex; - flex-wrap: wrap; - } - - .flag-user { - display: flex; - margin-bottom: 1em; - margin-right: 2em; - align-items: center; - justify-content: space-between; - - .flag-user-who { - display: flex; - width: 13em; - } - .flag-user-username { - font-weight: bold; - margin-right: 0.5em; - } - .flag-user-date { - color: $primary-medium; - } - .flag-user-avatar { - margin-right: 0.5em; - } - .flag-user-extra { - display: flex; - align-items: center; - } - } - - .flag-conversation { - padding: 1em 0; - - .reply-conversation { - margin-left: 32px; - } - } - - .suspended-message { - padding: 0.5em; - background-color: $danger; - margin-bottom: 1em; - color: $secondary; - } - - .flagged-post-message { - padding: 0.5em 1em; - margin: 0.5em 0; - background-color: $highlight-medium; - - .text { - margin-right: 1em; - } - - &:hover { - background-color: dark-light-choose($highlight-low, $highlight-medium); - } - } - - .flagged-post-response { - display: flex; - align-items: center; - margin-bottom: 0.5em; - - .response-avatar { - margin-right: 0.5em; - } - - .has-more { - margin-left: 1em; - } - } - - .flagged-post-controls { - display: flex; - flex-wrap: wrap; - align-items: center; - justify-content: flex-start; - - button { - margin-right: 0.5em; - margin-bottom: 0.5em; - } - } -} - -div.flag-counts { - display: inline-block; - margin-right: 0.5em; - - .type-count { - color: $primary-medium; - font-size: $font-down-1; - } -} - -.flagged-topic { - td.topic-title { - width: 400px; - - .combined-title { - .d-icon { - margin-right: 0.5em; - } - display: flex; - } - - a { - width: 400px; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } - } - @include breakpoint(tablet) { - td.topic-title { - width: auto; - max-width: 600px; - a { - width: auto; - white-space: unset; - } - } - } -} - -.flagged-topic-details { - display: flex; - justify-content: space-between; -} - -.mobile-view { - .flagged-posts { - overflow: hidden; - .flagged-post { - .flag-user-lists { - display: block; - } - } - } -} - -.show-details { - .d-icon { - padding-right: 0.25em; - } -} - -.admin-contents table.grid { - @media screen and (max-width: 767px) { - tr.flagged-topic { - grid-template-columns: 0.25fr 1fr 1fr; - td.topic-title { - grid-column-start: 2; - grid-column-end: -2; - min-width: 0; - align-self: start; - } - td.last-flagged { - grid-row: 1; - grid-column-end: -1; - text-align: right; - align-self: start; - } - td.flag-details { - grid-row: 2; - grid-column-end: -1; - text-align: right; - } - td.flagged-topic-users { - grid-row: 1; - grid-column-start: 1; - max-width: 60px; - align-self: start; - a { - display: inline-block; - margin: 0 0.25em 0.25em 0; - } - } - td.flag-counts { - grid-row: 2; - grid-column-start: 2; - } - } - } - //IE11 Support - @media screen and (max-width: 767px) { - tr.flagged-topic { - display: -ms-grid; - -ms-grid-columns: 0.25fr 1fr 1fr; - -ms-grid-rows: auto auto; - td { - display: -ms-grid; - &.flagged-topic-users { - -ms-grid-row: 1; - -ms-grid-column: 1; - -ms-grid-column-span: 1; - } - &.topic-title { - -ms-grid-row: 1; - -ms-grid-column: 2; - } - &.last-flagged { - -ms-grid-row: 1; - -ms-grid-column: 3; - } - &.flag-counts { - -ms-grid-row: 2; - -ms-grid-column: 2; - } - &.flag-details { - -ms-grid-row: 2; - -ms-grid-column: 3; - } - } - } - } -}