diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs index 91bd68f1277..67b4456a234 100644 --- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs +++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs @@ -5,6 +5,7 @@ {{i18n "categories.reorder.position"}} {{i18n "categories.category"}} + {{#each categoriesOrdered as |cat|}} @@ -21,6 +22,7 @@ {{category-badge cat allowUncategorized="true"}} {{/each}} +
{{/d-modal-body}} diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index c81f77d1733..48ead3d93c4 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -99,21 +99,6 @@ $mobile-breakpoint: 700px; th { padding: 8px; } - th { - text-align: left; - &.sortable { - cursor: pointer; - - &:hover { - background-color: #e9e9e9; - background-color: lighten($primary, 80%); - } - .d-icon-chevron-down, - .d-icon-chevron-up { - margin-left: 0.5em; - } - } - } tr:hover { background-color: darken($secondary, 2.5%); } diff --git a/app/assets/stylesheets/common/admin/dashboard_previous.scss b/app/assets/stylesheets/common/admin/dashboard_previous.scss index a040f1c5954..4014f06085a 100644 --- a/app/assets/stylesheets/common/admin/dashboard_previous.scss +++ b/app/assets/stylesheets/common/admin/dashboard_previous.scss @@ -42,7 +42,6 @@ } th { background: transparent; - text-align: left; padding: 0; } } @@ -139,7 +138,6 @@ } } th { - font-weight: normal; text-align: center; background: $primary-low; } diff --git a/app/assets/stylesheets/common/admin/moderation_history.scss b/app/assets/stylesheets/common/admin/moderation_history.scss index 66c174e0a5b..e6cc1573292 100644 --- a/app/assets/stylesheets/common/admin/moderation_history.scss +++ b/app/assets/stylesheets/common/admin/moderation_history.scss @@ -1,8 +1,5 @@ .moderation-history { width: 100%; - th { - text-align: left; - } td.date { padding-right: 1em; } diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index 564a736e4a7..8f17a9ce33b 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -118,15 +118,12 @@ vertical-align: middle; } th { - color: dark-light-choose($primary-medium, $secondary-medium); - font-weight: normal; - font-size: $font-0; button .d-icon { - color: dark-light-choose($primary-medium, $secondary-medium); + color: $primary-medium; } } td { - color: dark-light-choose($primary-medium, $secondary-medium); + color: $primary-medium; font-size: $font-0; } diff --git a/app/assets/stylesheets/common/base/about.scss b/app/assets/stylesheets/common/base/about.scss index c147abe6fff..5e17e1b1c63 100644 --- a/app/assets/stylesheets/common/base/about.scss +++ b/app/assets/stylesheets/common/base/about.scss @@ -8,12 +8,7 @@ section.about { table { width: auto; - th { - text-align: left; - } - - td, - th { + td { padding: 10px; } diff --git a/app/assets/stylesheets/common/base/cat_reorder.scss b/app/assets/stylesheets/common/base/cat_reorder.scss index ce0155129ed..004bd621fe0 100644 --- a/app/assets/stylesheets/common/base/cat_reorder.scss +++ b/app/assets/stylesheets/common/base/cat_reorder.scss @@ -1,9 +1,7 @@ .reorder-categories { thead { - border-bottom: 1px solid $primary-low; th { padding-bottom: 0.5em; - text-align: left; } } input { diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss index b12ce4ff1a8..6aa071c0e7f 100644 --- a/app/assets/stylesheets/common/base/directory.scss +++ b/app/assets/stylesheets/common/base/directory.scss @@ -46,20 +46,10 @@ } th.sortable { - cursor: pointer; - white-space: nowrap; width: 13%; .d-icon-heart { color: $love; - margin-right: 0.5em; - } - .d-icon-chevron-down, - .d-icon-chevron-up { - margin-left: 0.5em; - } - - &:hover { - background-color: $primary-low; + margin: 0 0.25em 0 0; } } } diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index be05dfd9a8a..fd26b7d6ae0 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -276,7 +276,31 @@ select { border: 1px solid $primary-low; } +table { + th { + font-weight: normal; + color: $primary-medium; + text-align: left; + padding: 0.5em; + } +} + // Common Classes + +.sortable { + white-space: nowrap; + cursor: pointer; + .discourse-no-touch & { + &:hover { + background-color: $primary-low; + } + } + .d-icon { + margin-left: 0.25em; + } + @include unselectable; +} + .radio, .checkbox { min-height: 18px; @@ -532,21 +556,6 @@ select { .control-group { @include clearfix; - - .table { - width: 100%; - - th, - td { - padding: 10px; - text-align: center; - } - } - - &.highlighted { - animation: background-fade-highlight 2.5s ease-out; - background-color: dark-light-choose($highlight-low, $highlight); - } } .control-label { diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss index 0c585c74345..60186921bd8 100644 --- a/app/assets/stylesheets/common/base/group.scss +++ b/app/assets/stylesheets/common/base/group.scss @@ -82,20 +82,15 @@ table.group-manage-logs { width: 100%; - th { - text-align: left; - padding: 5px 0; - } - td { - padding: 10px 0; + padding: 0.5em; } .group-manage-logs-expand-details { cursor: pointer; .d-icon { - color: blend-primary-secondary(50%); + color: $primary-medium; } } } @@ -119,20 +114,6 @@ table.group-members { th { text-align: center; - padding: 5px 0 5px 5px; - color: dark-light-choose($primary-medium, $secondary-medium); - font-weight: normal; - } - - th.sortable { - .d-icon { - margin-left: 5px; - } - - &:hover { - cursor: pointer; - background-color: $primary-low; - } } tr { diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss index e2d91113d69..ff638b978f7 100644 --- a/app/assets/stylesheets/common/base/groups.scss +++ b/app/assets/stylesheets/common/base/groups.scss @@ -26,19 +26,6 @@ .groups-table { width: 100%; - th { - border-bottom: 1px solid $primary-low; - padding: 0.5em; - text-align: left; - } - - .sortable { - &:hover { - background-color: $primary-low; - cursor: pointer; - } - } - tr { td { padding: 0.8em; diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 23dcb1e8019..e17493e8830 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -607,16 +607,16 @@ blockquote > *:last-child { .cooked table, .d-editor-preview table { thead { - border-bottom: 2px solid lighten($primary, 80%); th { text-align: left; padding-bottom: 2px; + font-weight: bold; + color: $primary; } } - td, - th { - padding: 3px 3px 3px 10px; + td { + padding: 3px 3px 3px 0.5em; } } diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss index ef1c7065cd8..2fc738478c2 100644 --- a/app/assets/stylesheets/desktop/category-list.scss +++ b/app/assets/stylesheets/desktop/category-list.scss @@ -12,9 +12,7 @@ } th { - text-align: left; vertical-align: middle; - font-weight: normal; } td:first-of-type { diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss index 680d94c63be..458a6c5b258 100644 --- a/app/assets/stylesheets/desktop/group.scss +++ b/app/assets/stylesheets/desktop/group.scss @@ -50,11 +50,3 @@ top: 20px; right: 20px; } - -.groups-table { - thead { - .d-icon { - padding-left: 2px; - } - } -} diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 877f8f8c76c..ee3073ff4ad 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -111,13 +111,6 @@ left: -2px; } - .sortable { - cursor: pointer; - &:hover { - background-color: $primary-low; - } - @include unselectable; - } .likes { width: 65px; } diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index f871661a235..f04ae567021 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -115,18 +115,6 @@ .user-invite-list { width: 100%; margin-top: 15px; - - th { - text-align: left; - padding: 0 0 10px 0; - color: dark-light-choose($primary-medium, $secondary-medium); - font-weight: normal; - } - - td { - padding: 10px 0 10px 0; - border-bottom: 1px solid $primary-low; - } } .user-invite-search { diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 669df4b7eae..2a470883bb6 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -140,7 +140,6 @@ th, td { padding: 7px 0; - color: dark-light-choose($primary-medium, $secondary-medium); max-width: 300px; } diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index bec296e3bba..97a78dbd43d 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -19,9 +19,7 @@ text-overflow: ellipsis; } th { - padding: 0.5em; text-align: right; - border-bottom: 1px solid $primary-low; } td { padding: 0.5em; @@ -51,17 +49,6 @@ table { width: 100%; margin-top: 10px; - - th { - text-align: left; - border-bottom: 1px solid $primary-low; - padding: 5px; - } - - td { - padding: 5px; - border-bottom: 1px solid $primary-low; - } } }