From 67074e975bceea38f6c8507d6da589046adfb979 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Wed, 31 Jul 2019 13:39:53 +1000 Subject: [PATCH] Simplify css file requiring --- assets/stylesheets/wizard/wizard_badges.scss | 17 ----------------- views/layouts/wizard.html.erb | 10 +++++----- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/assets/stylesheets/wizard/wizard_badges.scss b/assets/stylesheets/wizard/wizard_badges.scss index cc21503e..7eceb065 100644 --- a/assets/stylesheets/wizard/wizard_badges.scss +++ b/assets/stylesheets/wizard/wizard_badges.scss @@ -1,8 +1,5 @@ @import 'wizard_variables'; -// Category badges -// -------------------------------------------------- - .badge-wrapper { font-size: $font-down-1; font-weight: bold; @@ -26,8 +23,6 @@ } } - // ----- Bullet - &.bullet { margin-right: 12px; span.badge-category { @@ -47,7 +42,6 @@ display: inline-block; } .badge-category-parent-bg { - // Subcategories width: 5px; margin-right: 0; + .badge-category-bg { @@ -59,8 +53,6 @@ } } - // ----- Box - &.box { margin-right: 5px; padding: 2px 4px 2px 4px; @@ -78,7 +70,6 @@ } &.badge-category-parent-bg { - // Subcategories width: calc(100% - 5px); & + .badge-category-bg { left: 5px; @@ -98,8 +89,6 @@ } } - // ----- Bar - &.bar { margin-right: 5px; @@ -116,7 +105,6 @@ .badge-category-parent-bg, .badge-category-bg { - // Subcategories display: inline-block; padding: 0 1px; @@ -126,17 +114,12 @@ } } - // ----- No category style - &.none { color: $primary-high; margin-right: 5px; } } -// Category badge dropdown -// -------------------------------------------------- - .list-controls { .category-breadcrumb { a.badge-category { diff --git a/views/layouts/wizard.html.erb b/views/layouts/wizard.html.erb index f70616cd..e6dc80e8 100644 --- a/views/layouts/wizard.html.erb +++ b/views/layouts/wizard.html.erb @@ -1,11 +1,11 @@ <%= discourse_stylesheet_link_tag :wizard, theme_id: nil %> - <%= stylesheet_link_tag "wizard_custom", media: "all", "data-turbolinks-track" => "reload" %> - <%= stylesheet_link_tag "wizard_composer", media: "all", "data-turbolinks-track" => "reload" %> - <%= stylesheet_link_tag "wizard_variables", media: "all", "data-turbolinks-track" => "reload" %> - <%= stylesheet_link_tag "wizard_badges", media: "all", "data-turbolinks-track" => "reload" %> - <%= stylesheet_link_tag "wizard_custom_mobile", media: "all", "data-turbolinks-track" => "reload" if mobile_view?%> + <%= 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) %> <%- end %>