From 57e587f39fa8b672b6d99cbbd315d8da5194a4ab Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 1 Jun 2020 11:22:35 +0200 Subject: [PATCH] DEV: removes dead code of dropdown-menu (#9942) --- .../app/components/topic-navigation.js | 1 - .../stylesheets/common/base/discourse.scss | 8 --- app/assets/stylesheets/common/base/modal.scss | 3 - .../stylesheets/desktop/topic-list.scss | 9 --- .../stylesheets/desktop/topic-post.scss | 70 ------------------- app/assets/stylesheets/mobile/topic-list.scss | 45 +----------- app/assets/stylesheets/mobile/topic-post.scss | 19 ----- 7 files changed, 1 insertion(+), 154 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js index 614e144f5f7..0f420607a58 100644 --- a/app/assets/javascripts/discourse/app/components/topic-navigation.js +++ b/app/assets/javascripts/discourse/app/components/topic-navigation.js @@ -76,7 +76,6 @@ export default Component.extend(PanEvents, { if ( !$target.is(".widget-button") && !$parents.is(".widget-button") && - !$parents.is(".dropdown-menu") && !$parents.is("#discourse-modal") && !$target.is("#discourse-modal") && !$parents.is(".modal-footer") && diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index 831aba61b0b..fd6dfef8de3 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -687,14 +687,6 @@ table { } } } - - .dropdown-menu { - width: 120px; - - & .icon { - margin-top: auto; - } - } } .topic-statuses { diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 3f4d85c61f1..a15a7cf7c08 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -29,9 +29,6 @@ } .modal-open { - .dropdown-menu { - z-index: z("modal", "dropdown"); - } .popover { z-index: z("modal", "popover"); } diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 13e1d03da15..d17cef20ff7 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -218,15 +218,6 @@ button.dismiss-read { margin-left: 10px; } -.tags-admin-menu { - .dropdown-menu { - right: 0; - top: 30px; - bottom: auto; - left: auto; - } -} - .category-heading { p { line-height: $line-height-large; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 3d5f0017dcd..ed1b906a302 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -503,10 +503,6 @@ video { } } -.open > .dropdown-menu { - display: block; -} - .btn-group { position: relative; } @@ -641,72 +637,6 @@ blockquote { margin-left: 5px; } -.dropdown-menu { - position: absolute; - bottom: 115%; - left: 0; - z-index: z("dropdown"); - display: none; - float: left; - width: 550px; - margin: 1px 0 0; - list-style: none; - background-color: $secondary; - border: 1px solid $primary-low; - box-shadow: shadow("dropdown"); - background-clip: padding-box; - span { - font-size: $font-down-1; - color: dark-light-choose($primary-medium, $secondary-medium); - } - span.title { - font-weight: bold; - display: block; - font-size: $font-0; - color: $primary; - } -} - -.dropdown-menu a { - display: block; - padding: 9px; - clear: both; - font-weight: normal; - line-height: $line-height-medium; - color: $primary; - transition: all linear 0.15s; - & > div { - margin-left: 26px; - } -} - -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: $primary; - text-decoration: none; - background-color: $highlight-medium; -} - -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { - text-decoration: none; - color: $primary; - background-color: $tertiary-low; - cursor: default; -} - -.dropdown-menu .icon { - margin-top: 3px; - float: left; - font-size: $font-up-2; -} - -.open > .dropdown-menu { - display: block; - clear: both; -} - .selected-posts { width: 200px; position: fixed; diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 516c864c045..5683d5cfd0c 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -424,50 +424,7 @@ tr.category-topic-link { content: ""; margin-left: 5px; } -.dropdown-menu { - position: relative; - top: 100%; - left: 0; - z-index: z("dropdown"); - display: none; - float: left; - width: 280px; - padding: 4px 0; - list-style: none; - background-color: $secondary; - border: 1px solid dark-light-choose(rgba(0, 0, 0, 0.2), $primary); - border-radius: 5px; - box-shadow: shadow("dropdown"); - background-clip: padding-box; - margin: 1px 0 20px; - .title { - font-weight: bold; - display: block; - } -} -.dropdown-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: $line-height-medium; - color: $primary; -} -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: $tertiary; - text-decoration: none; - background-color: $tertiary-low; -} -.open > .dropdown-menu { - display: block; - clear: both; -} -.fade { - opacity: 0; - transition: opacity linear 0.15s; -} + .fade.in { opacity: 1; } diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 3f8729739ab..7031810bc01 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -287,25 +287,6 @@ iframe { max-width: 100%; } -.open > .dropdown-menu { - display: block; -} - -.dropdown-menu li { - margin: 5px 0; - .fa { - float: left; - margin-right: 5px; - padding-top: 1px; - } - span { - color: dark-light-choose($primary-medium, $secondary-medium); - } - span.title { - color: $primary; - } -} - .btn-group { margin-top: 25px; position: relative;