nickslowinski/discourse-custom-wizard-unlocked
1
0
Fork 0
geforkt von mirrored/discourse-custom-wizard
Code Pull-Requests Aktivität

Simplify css file requiring

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Angus McLeod 2019-07-31 13:39:53 +10:00
Ursprung 0c61a9b5dc
Commit 67074e975b
2 geänderte Dateien mit 5 neuen und 22 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

17
assets/stylesheets/wizard/wizard_badges.scss
Datei anzeigen

@ -1,8 +1,5 @@
@import 'wizard_variables'; @import 'wizard_variables';
// Category badges
// --------------------------------------------------
.badge-wrapper { .badge-wrapper {
font-size: $font-down-1; font-size: $font-down-1;
font-weight: bold; font-weight: bold;
@ -26,8 +23,6 @@
} }
} }
// ----- Bullet
&.bullet { &.bullet {
margin-right: 12px; margin-right: 12px;
span.badge-category { span.badge-category {
@ -47,7 +42,6 @@
display: inline-block; display: inline-block;
} }
.badge-category-parent-bg { .badge-category-parent-bg {
// Subcategories
width: 5px; width: 5px;
margin-right: 0; margin-right: 0;
+ .badge-category-bg { + .badge-category-bg {
@ -59,8 +53,6 @@
} }
} }
// ----- Box
&.box { &.box {
margin-right: 5px; margin-right: 5px;
padding: 2px 4px 2px 4px; padding: 2px 4px 2px 4px;
@ -78,7 +70,6 @@
} }
&.badge-category-parent-bg { &.badge-category-parent-bg {
// Subcategories
width: calc(100% - 5px); width: calc(100% - 5px);
& + .badge-category-bg { & + .badge-category-bg {
left: 5px; left: 5px;
@ -98,8 +89,6 @@
} }
} }
// ----- Bar
&.bar { &.bar {
margin-right: 5px; margin-right: 5px;
@ -116,7 +105,6 @@
.badge-category-parent-bg, .badge-category-parent-bg,
.badge-category-bg { .badge-category-bg {
// Subcategories
display: inline-block; display: inline-block;
padding: 0 1px; padding: 0 1px;
@ -126,17 +114,12 @@
} }
} }
// ----- No category style
&.none { &.none {
color: $primary-high; color: $primary-high;
margin-right: 5px; margin-right: 5px;
} }
} }
// Category badge dropdown
// --------------------------------------------------
.list-controls { .list-controls {
.category-breadcrumb { .category-breadcrumb {
a.badge-category { a.badge-category {

10
views/layouts/wizard.html.erb
Datei anzeigen

@ -1,11 +1,11 @@
<html> <html>
<head> <head>
<%= discourse_stylesheet_link_tag :wizard, theme_id: nil %> <%= discourse_stylesheet_link_tag :wizard, theme_id: nil %>
<%= stylesheet_link_tag "wizard_custom", media: "all", "data-turbolinks-track" => "reload" %> <%= stylesheet_link_tag "wizard_custom" %>
<%= stylesheet_link_tag "wizard_composer", media: "all", "data-turbolinks-track" => "reload" %> <%= stylesheet_link_tag "wizard_composer" %>
<%= stylesheet_link_tag "wizard_variables", media: "all", "data-turbolinks-track" => "reload" %> <%= stylesheet_link_tag "wizard_variables" %>
<%= stylesheet_link_tag "wizard_badges", media: "all", "data-turbolinks-track" => "reload" %> <%= stylesheet_link_tag "wizard_badges" %>
<%= stylesheet_link_tag "wizard_custom_mobile", media: "all", "data-turbolinks-track" => "reload" if mobile_view?%> <%= stylesheet_link_tag "wizard_custom_mobile" %>
<%- if theme_ids %> <%- if theme_ids %>
<%= discourse_stylesheet_link_tag (mobile_view? ? :mobile_theme : :desktop_theme) %> <%= discourse_stylesheet_link_tag (mobile_view? ? :mobile_theme : :desktop_theme) %>
<%- end %> <%- end %>