diff --git a/assets/stylesheets/wizard/wizard_badges.scss b/assets/stylesheets/wizard/wizard_badges.scss deleted file mode 100644 index 7eceb065..00000000 --- a/assets/stylesheets/wizard/wizard_badges.scss +++ /dev/null @@ -1,131 +0,0 @@ -@import 'wizard_variables'; - -.badge-wrapper { - font-size: $font-down-1; - font-weight: bold; - white-space: nowrap; - position: relative; - display: inline-flex; - align-items: baseline; - - .badge-category { - display: inline-flex; - align-items: baseline; - .category-name { - text-overflow: ellipsis; - overflow: hidden; - } - .d-icon { - margin-right: 3px; - width: 0.74em; - height: 0.74em; - color: inherit; - } - } - - &.bullet { - margin-right: 12px; - span.badge-category { - color: $primary-high; - overflow: hidden; - text-overflow: ellipsis; - .extra-info-wrapper & { - color: $header-primary; - } - } - .badge-category-parent-bg, - .badge-category-bg { - flex: 0 0 auto; - width: 9px; - height: 9px; - margin-right: 5px; - display: inline-block; - } - .badge-category-parent-bg { - width: 5px; - margin-right: 0; - + .badge-category-bg { - width: 5px; - } - } - .d-icon { - color: $primary-medium; - } - } - - &.box { - margin-right: 5px; - padding: 2px 4px 2px 4px; - display: inline-flex; - span { - overflow: hidden; - text-overflow: ellipsis; - &.badge-category-bg, - &.badge-category-parent-bg { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - } - - &.badge-category-parent-bg { - width: calc(100% - 5px); - & + .badge-category-bg { - left: 5px; - width: calc(100% - 5px); - & + .badge-category { - margin-left: 5px; - } - } - } - - &.badge-category { - position: relative; - } - } - + .topic-header-extra { - padding: 2px 4px 2px 4px; - } - } - - &.bar { - margin-right: 5px; - - span.badge-category { - color: $primary-high; - padding: 1px 3px; - overflow: hidden; - text-overflow: ellipsis; - - .extra-info-wrapper & { - color: $header-primary; - } - } - - .badge-category-parent-bg, - .badge-category-bg { - display: inline-block; - padding: 0 1px; - - &:before { - content: "\a0"; - } - } - } - - &.none { - color: $primary-high; - margin-right: 5px; - } -} - -.list-controls { - .category-breadcrumb { - a.badge-category { - display: inline-block; - padding: 6px 8px; - line-height: $line-height-medium; - } - } -} \ No newline at end of file diff --git a/assets/stylesheets/wizard/wizard_custom.scss b/assets/stylesheets/wizard/wizard_custom.scss index 54ae9024..a1d950cf 100644 --- a/assets/stylesheets/wizard/wizard_custom.scss +++ b/assets/stylesheets/wizard/wizard_custom.scss @@ -708,3 +708,137 @@ input.input-location, div.input-location { } } } + +// Badges + +@import 'wizard_variables'; + +.badge-wrapper { + font-size: $font-down-1; + font-weight: bold; + white-space: nowrap; + position: relative; + display: inline-flex; + align-items: baseline; + + .badge-category { + display: inline-flex; + align-items: baseline; + .category-name { + text-overflow: ellipsis; + overflow: hidden; + } + .d-icon { + margin-right: 3px; + width: 0.74em; + height: 0.74em; + color: inherit; + } + } + + &.bullet { + margin-right: 12px; + span.badge-category { + color: $primary-high; + overflow: hidden; + text-overflow: ellipsis; + .extra-info-wrapper & { + color: $header-primary; + } + } + .badge-category-parent-bg, + .badge-category-bg { + flex: 0 0 auto; + width: 9px; + height: 9px; + margin-right: 5px; + display: inline-block; + } + .badge-category-parent-bg { + width: 5px; + margin-right: 0; + + .badge-category-bg { + width: 5px; + } + } + .d-icon { + color: $primary-medium; + } + } + + &.box { + margin-right: 5px; + padding: 2px 4px 2px 4px; + display: inline-flex; + span { + overflow: hidden; + text-overflow: ellipsis; + &.badge-category-bg, + &.badge-category-parent-bg { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + } + + &.badge-category-parent-bg { + width: calc(100% - 5px); + & + .badge-category-bg { + left: 5px; + width: calc(100% - 5px); + & + .badge-category { + margin-left: 5px; + } + } + } + + &.badge-category { + position: relative; + } + } + + .topic-header-extra { + padding: 2px 4px 2px 4px; + } + } + + &.bar { + margin-right: 5px; + + span.badge-category { + color: $primary-high; + padding: 1px 3px; + overflow: hidden; + text-overflow: ellipsis; + + .extra-info-wrapper & { + color: $header-primary; + } + } + + .badge-category-parent-bg, + .badge-category-bg { + display: inline-block; + padding: 0 1px; + + &:before { + content: "\a0"; + } + } + } + + &.none { + color: $primary-high; + margin-right: 5px; + } +} + +.list-controls { + .category-breadcrumb { + a.badge-category { + display: inline-block; + padding: 6px 8px; + line-height: $line-height-medium; + } + } +} diff --git a/views/layouts/wizard.html.erb b/views/layouts/wizard.html.erb index e6dc80e8..1b92d28d 100644 --- a/views/layouts/wizard.html.erb +++ b/views/layouts/wizard.html.erb @@ -4,7 +4,6 @@ <%= stylesheet_link_tag "wizard_custom" %> <%= stylesheet_link_tag "wizard_composer" %> <%= stylesheet_link_tag "wizard_variables" %> - <%= stylesheet_link_tag "wizard_badges" %> <%= stylesheet_link_tag "wizard_custom_mobile" %> <%- if theme_ids %> <%= discourse_stylesheet_link_tag (mobile_view? ? :mobile_theme : :desktop_theme) %>