move filters after condense

This commit is contained in:
Mark
2016-11-10 22:41:00 +01:00
parent 732fd72231
commit 5bb2ce33a7
2 changed files with 29 additions and 29 deletions
@@ -24,10 +24,11 @@
<input type="checkbox" name="attr_spell_points_toggle" class="toggle-spell-points edit"><span class="toggle-spell-points edit button lowercase" data-i18n="SPELL_POINTS"></span>
<input type="checkbox" name="attr_spell_slots_all" class="toggle-spell-slots-all edit"><span class="toggle-spell-slots-all edit button lowercase" data-i18n="ALL"></span>
<input type="checkbox" name="attr_spell_display_filters" class="toggle-filters" value="1" checked><span class="toggle-filters button lowercase" data-i18n="FILTERS"></span>
<input type="checkbox" name="attr_spell_condensed" class="toggle-filter-condense presentation"><span class="toggle-filter-condense presentation button lowercase" data-i18n="CONDENSE"></span>
<input type="checkbox" name="attr_spell_contents" class="toggle-filter-content presentation"><span class="toggle-filter-content presentation button lowercase" data-i18n="CONTENT"></span>
<input type="checkbox" name="attr_spell_display_filters" class="toggle-filters" value="1" checked><span class="toggle-filters button lowercase" data-i18n="FILTERS"></span>
<input type="checkbox" name="attr_spell_only_show_prepared" class="toggle-filter-prepared"><span class="toggle-filter-prepared button lowercase" data-i18n="PREPARED"></span>
<input type="checkbox" name="attr_spell_only_show_rituals" class="toggle-filter-ritual"><span class="toggle-filter-ritual button lowercase" data-i18n="RITUAL"></span>
+27 -28
View File
@@ -35,6 +35,10 @@
@include tab-toggle('spell-slots', 45px, 'padding');
@include tab-toggle('spell-points', 52px, 'padding');
@include tab-toggle('spell-slots-all', 11px, 'padding');
@include tab-toggle('filter-condense', 44px, 'padding');
@include tab-toggle('filter-content', 35px, 'padding');
@include tab-toggle('filters', 24px, 'padding');
@include tab-toggle('filter-prepared', 42px, 'padding');
@@ -55,9 +59,6 @@
@include tab-toggle('filter-time-bonus', 30px, 'padding');
@include tab-toggle('filter-time-action', 29px, 'padding');
@include tab-toggle('filter-condense', 44px, 'padding');
@include tab-toggle('filter-content', 35px, 'padding');
@include tab-toggle('filter-level-cantrips', 36px, 'padding');
@include tab-toggle('filter-level-1', 7px, 'padding');
@include tab-toggle('filter-level-2', 7px, 'padding');
@@ -129,16 +130,16 @@ input.sheet-toggle-level-7:not(:checked) ~ div input.sheet-toggle-spell-slots-al
input.sheet-toggle-level-8:not(:checked) ~ div input.sheet-toggle-spell-slots-all:not(:checked) ~ div .sheet-spell-level-8,
input.sheet-toggle-level-9:not(:checked) ~ div input.sheet-toggle-spell-slots-all:not(:checked) ~ div .sheet-spell-level-9,
input.sheet-toggle-ritual:not([value='Yes']) ~ div .sheet-show-ritual,
input.sheet-show-materials:not(:checked) ~ .sheet-show-materials {
input.sheet-show-materials:not(:checked) ~ .sheet-show-materials,
input.sheet-toggle-filter-condense:checked ~ .sheet-toggle-filter-content,
input.sheet-toggle-filter-condense:checked ~ div .sheet-condense,
input.sheet-toggle-filter-condense:checked ~ div .sheet-show-when-not-condensed,
input.sheet-toggle-filter-condense:not(:checked) ~ div .sheet-show-when-condensed,
input.sheet-toggle-filter-content:not(:checked) ~ div .sheet-content {
display: none;
}
input.sheet-toggle-filters:checked {
& ~ input.sheet-toggle-filter-condense:checked ~ .sheet-toggle-filter-content,
& ~ input.sheet-toggle-filter-condense:checked ~ div .sheet-condense,
& ~ input.sheet-toggle-filter-condense:checked ~ div .sheet-show-when-not-condensed,
& ~ input.sheet-toggle-filter-condense:not(:checked) ~ div .sheet-show-when-condensed,
& ~ input.sheet-toggle-filter-content:not(:checked) ~ div .sheet-content,
& ~ input.sheet-toggle-filter-prepared:checked ~ div input.sheet-toggle-prepared:not(:checked) ~ .sheet-filter-section,
& ~ input.sheet-toggle-filter-ritual:checked ~ div input.sheet-toggle-ritual:not([value='Yes']) ~ .sheet-filter-section,
& ~ input.sheet-toggle-filter-verbal:not(:checked) ~ div input.sheet-toggle-components[value='COMPONENTS_V'] ~ .sheet-filter-section,
@@ -198,27 +199,25 @@ input.sheet-has-warlock-slots[value='1'] ~ div .sheet-spell-slots-or-points-or-w
}
input.sheet-toggle-edit-mode:not(:checked) ~ div {
input.sheet-toggle-filters:checked {
& ~ input.sheet-toggle-filter-condense:checked ~ div {
input.sheet-toggle-filter-condense:checked ~ div {
.sheet-spell-name,
.sheet-psionic-name {
color: $grayer-gray;
font-size: inherit;
font-style: italic;
font-variant: normal;
font-weight: normal;
text-transform: lowercase;
}
.repitem {
padding: 0 1px;
}
input.sheet-toggle-prepared:checked ~ .sheet-filter-section {
.sheet-spell-name,
.sheet-psionic-name {
color: $grayer-gray;
font-size: inherit;
font-style: italic;
font-variant: normal;
font-weight: normal;
text-transform: lowercase;
}
.repitem {
padding: 0 1px;
}
input.sheet-toggle-prepared:checked ~ .sheet-filter-section {
.sheet-spell-name,
.sheet-psionic-name {
color: $pink;
}
color: $pink;
}
}
}