diff --git a/css/general/formatting.css b/css/general/formatting.css new file mode 100644 index 0000000000000000000000000000000000000000..01f9990555e92b4eefccc1abe3dd9469376ef91f --- /dev/null +++ b/css/general/formatting.css @@ -0,0 +1,70 @@ +/* Styles that mainly affect how text looks, but not where it is */ + +/* setting at the beginning of a scene / subscene */ +.scene-intro { + font-style: italic; +} + +/* adds detail to an option: Do something. <span class="detail">Sentence that explains the effect/conditions */ +.detail { + font-style: italic; +} + +/* additional information not related to a specific option */ +.note { + font-style: italic; +} + +.icons { + font-family: 'tme-fa-icons'; +} + +.story-label, .regularParties, .underline { + text-decoration: underline; +} + +/* Note: Do not do a linebreak after span in HTML, because it will underline the automatic space it inserts: "Matilda_is a cow" */ +.slave-name { + color: pink; + font-weight: bold; + text-decoration: underline; + text-decoration-color: white; +} + +.name { + font-weight: bold; +} + +.custom-label { + color: yellow; + font-weight: bold; +} + +.major-link, .bold { + font-weight: bold; +} + +.clear-formatting { + color: white; + font-weight: normal; + font-style: normal; +} + +.major-warning { + font-weight: bold; + color: red; +} + +input:invalid { + border-color: #900; + background-color: rgba(255, 0, 0, 0.25); +} + +input:focus:invalid { + outline: none; +} + +input:out-of-range { + background-color: rgba(255, 0, 0, 0.25); + border: 2px solid #900; +} diff --git a/css/general/layout.css b/css/general/layout.css index ffadcad8a731d59e2e8a58ef8670245deb4730d2..c39e317835e4d380d086b83f40d90e98533f586f 100644 --- a/css/general/layout.css +++ b/css/general/layout.css @@ -1,3 +1,5 @@ +/* Styles that mainly affect where text is, but not how it looks */ + h1, h2, h3 { margin-bottom: 0; margin-top: 0.25em; diff --git a/src/003-assets/CSS/general.css b/src/003-assets/CSS/general.css deleted file mode 100644 index f3467c9abe50b08fbfaa5a0fb83f80f058e02fe1..0000000000000000000000000000000000000000 --- a/src/003-assets/CSS/general.css +++ /dev/null @@ -1,13 +0,0 @@ -input:invalid{ - border-color: #900; - background-color: rgba(255, 0, 0, 0.25); -} - -input:focus:invalid { - outline: none; -} - -input:out-of-range { - background-color: rgba(255, 0, 0, 0.25); - border: 2px solid #900; -} diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css index 3881f1dedf710b34fb19602b5eb75ff385062fe6..a483dfef057e7b156efe5d49373406d37ead692e 100644 --- a/src/gui/css/mainStyleSheet.css +++ b/src/gui/css/mainStyleSheet.css @@ -9,41 +9,6 @@ div.slave-report { margin-top: 1em; margin-bottom: 1em; } -/* setting at the beginning of a scene / subscene */ -.scene-intro { - font-style: italic; -} - -/* adds detail to an option: Do something. <span class="detail">Sentence that explains the effect/conditions */ -.detail { - font-style: italic; -} - -/* additional information not related to a specific option */ -.note { - font-style: italic; -} - -.story-label, .regularParties, .underline { - text-decoration: underline; -} - -/* Note: Do not do a linebreak after span in HTML, because it will underline the automatic space it inserts: "Matilda_is a cow" */ -.slave-name { - color: pink; - font-weight: bold; - text-decoration: underline; - text-decoration-color: white; -} - -.name { - font-weight: bold; -} - -.custom-label { - color: yellow; - font-weight: bold; -} div.cheat-menu { font-style: italic; @@ -56,21 +21,6 @@ div.cheat-menu { margin: 0 auto; } -.major-link, .bold { - font-weight: bold; -} - -.clear-formatting { - color: white; - font-weight: normal; - font-style: normal; -} - -.major-warning { - font-weight: bold; - color: red; -} - /* TODO unify tooltip systems */ .hasTooltip { text-decoration: underline; @@ -107,10 +57,6 @@ div.cheat-menu { margin: 0 2em; } -.icons { - font-family: 'tme-fa-icons'; -} - .favorite, .favorite:hover { color: yellow; text-decoration: none;