diff --git a/Fate/FateOmni.css b/Fate/FateOmni.css
index 946073d982..541b14d6d1 100644
--- a/Fate/FateOmni.css
+++ b/Fate/FateOmni.css
@@ -468,6 +468,7 @@ input.sheet-icon[value="blank"] + span.sheet-icon::before {
padding: 10px;
}
+.sheet-ComboColumn .repcontrol,
.sheet-AspectDisplay .repcontrol,
.sheet-TrackDisplay .repcontrol,
.sheet-StuntDisplay .repcontrol,
@@ -688,12 +689,28 @@ input.sheet-icon[value="blank"] + span.sheet-icon::before {
display: none;
}
+.sheet-SkillColumnFirst,
+.sheet-SkillColumnSecond,
+.sheet-SkillColumnThird,
.sheet-SkillNone,
.sheet-SkillList,
.sheet-SkillGrid {
display: none;
}
+input[value=""] + .sheet-SkillColumnFirst,
+input[value="1"] + .sheet-SkillColumnFirst {
+ display: initial;
+}
+
+input[value="2"] + .sheet-SkillColumnSecond {
+ display: initial;
+}
+
+input[value="3"] + .sheet-SkillColumnThird {
+ display: initial;
+}
+
input[value="none"] ~ .sheet-SkillNone {
display: block;
}
@@ -934,6 +951,7 @@ input[type="checkbox"].sheet-checkbox + span.sheet-optionsbox::before {
input[type="checkbox"].sheet-checkbox:checked + span.sheet-optionsbox::before {
content: "2";
+ font-style: normal;
}
input[type="checkbox"].sheet-checkbox + span.sheet-checker::before {
@@ -1041,6 +1059,19 @@ input[type="checkbox"].sheet-deeptrigger:checked ~ * .sheet-deeptriggered {
display: initial;
}
+/* Skill Combo Columns */
+
+.sheet-ComboColumns {
+ display: flex;
+}
+
+.sheet-ComboColumn {
+ flex-flow: column;
+ padding-right: 6px;
+ padding-left: 6px;
+ white-space: nowrap;
+}
+
/* Corruption */
.sheet-CorrClock {
@@ -1349,6 +1380,7 @@ button[type="roll"].sheet-share {
}
input[value="blue"].sheet-theme + .sheet-Wrapper .sheet-share,
+input[value="blue"].sheet-theme + .sheet-Wrapper .sheet-optionsbox,
input[value="blue"].sheet-theme + .sheet-Wrapper .sheet-OptionsTitleBar,
input[value="blue"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checker::before,
input[value="blue"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checkmark::before,
@@ -1484,6 +1516,7 @@ input[value="blue"].sheet-theme + .sheet-Wrapper .sheet-SkillEdit > .repcontaine
}
input[value="green"].sheet-theme + .sheet-Wrapper .sheet-share,
+input[value="green"].sheet-theme + .sheet-Wrapper .sheet-optionsbox,
input[value="green"].sheet-theme + .sheet-Wrapper .sheet-OptionsTitleBar,
input[value="green"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checker::before,
input[value="green"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checkmark::before,
@@ -1619,6 +1652,7 @@ input[value="green"].sheet-theme + .sheet-Wrapper .sheet-SkillEdit > .repcontain
}
input[value="purple"].sheet-theme + .sheet-Wrapper .sheet-share,
+input[value="purple"].sheet-theme + .sheet-Wrapper .sheet-optionsbox,
input[value="purple"].sheet-theme + .sheet-Wrapper .sheet-OptionsTitleBar,
input[value="purple"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checker::before,
input[value="purple"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checkmark::before,
@@ -1754,6 +1788,7 @@ input[value="purple"].sheet-theme + .sheet-Wrapper .sheet-SkillEdit > .repcontai
}
input[value="cthulhu"].sheet-theme + .sheet-Wrapper .sheet-share,
+input[value="cthulhu"].sheet-theme + .sheet-Wrapper .sheet-optionsbox,
input[value="cthulhu"].sheet-theme + .sheet-Wrapper .sheet-OptionsTitleBar,
input[value="cthulhu"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checker::before,
input[value="cthulhu"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checkmark::before,
@@ -1889,6 +1924,7 @@ input[value="cthulhu"].sheet-theme + .sheet-Wrapper .sheet-SkillEdit > .repconta
}
input[value="evilhat"].sheet-theme + .sheet-Wrapper .sheet-share,
+input[value="evilhat"].sheet-theme + .sheet-Wrapper .sheet-optionsbox,
input[value="evilhat"].sheet-theme + .sheet-Wrapper .sheet-OptionsTitleBar,
input[value="evilhat"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checker::before,
input[value="evilhat"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checkmark::before,
@@ -2028,6 +2064,7 @@ input[value="evilhat"].sheet-theme + .sheet-Wrapper .sheet-SkillEdit > .repconta
}
input[value="gray"].sheet-theme + .sheet-Wrapper .sheet-share,
+input[value="gray"].sheet-theme + .sheet-Wrapper .sheet-optionsbox,
input[value="gray"].sheet-theme + .sheet-Wrapper .sheet-OptionsTitleBar,
input[value="gray"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checker::before,
input[value="gray"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checkmark::before,
@@ -2165,6 +2202,7 @@ input[value="gray"].sheet-theme + .sheet-Wrapper .sheet-SkillEdit > .repcontaine
}
input[value="shotc"].sheet-theme + .sheet-Wrapper .sheet-share,
+input[value="shotc"].sheet-theme + .sheet-Wrapper .sheet-optionsbox,
input[value="shotc"].sheet-theme + .sheet-Wrapper .sheet-OptionsTitleBar,
input[value="shotc"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checker::before,
input[value="shotc"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checkmark::before,
@@ -2300,6 +2338,7 @@ input[value="shotc"].sheet-theme + .sheet-Wrapper .sheet-SkillEdit > .repcontain
}
input[value="orange"].sheet-theme + .sheet-Wrapper .sheet-share,
+input[value="orange"].sheet-theme + .sheet-Wrapper .sheet-optionsbox,
input[value="orange"].sheet-theme + .sheet-Wrapper .sheet-OptionsTitleBar,
input[value="orange"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checker::before,
input[value="orange"].sheet-theme + .sheet-Wrapper input[type="checkbox"].sheet-checkbox:checked + span.sheet-checkmark::before,
diff --git a/Fate/FateOmni.html b/Fate/FateOmni.html
index 013c92fb60..06c32611d1 100644
--- a/Fate/FateOmni.html
+++ b/Fate/FateOmni.html
@@ -58,6 +58,7 @@
Aspects
+ Combinable Skills
Conditions
Consequences
Corruption
@@ -311,6 +312,85 @@
+
+
+
+
+
+
+
+
+ Edit Combinable Skills
+
+
+
+
+ Allow selection of multiple skills from the same column
+
+
+
+
+
+
+
@@ -330,6 +410,7 @@