diff --git a/assets/misuzu.css/confirm.css b/assets/misuzu.css/confirm.css deleted file mode 100644 index 543edca8..00000000 --- a/assets/misuzu.css/confirm.css +++ /dev/null @@ -1,11 +0,0 @@ -.confirm { - max-width: 400px; - margin: 0 auto; -} -.confirm__buttons { - display: flex; - padding: 5px; - justify-content: center; -} -.confirm__message { padding: 2px 5px; } -.confirm__button { margin-right: 5px; } diff --git a/assets/misuzu.css/flags.css b/assets/misuzu.css/flags.css index f2036984..fbc3f373 100644 --- a/assets/misuzu.css/flags.css +++ b/assets/misuzu.css/flags.css @@ -129,7 +129,7 @@ /* Ix */ .flag--id { background-position: top -96px left -48px; } .flag--ie { background-position: top -96px left -64px; } -.flag--il { background-position: top -96px left -176px; } +.flag--il { background-position: top -180px left -288px; } .flag--in { background-position: top -96px left -208px; } .flag--io { background-position: top -96px left -224px; } .flag--iq { background-position: top -96px left -256px; } diff --git a/assets/misuzu.css/forum/confirm.css b/assets/misuzu.css/forum/confirm.css deleted file mode 100644 index 90563871..00000000 --- a/assets/misuzu.css/forum/confirm.css +++ /dev/null @@ -1,15 +0,0 @@ -.forum__confirm { - max-width: 400px; - margin: 0 auto; -} -.forum__confirm__message { - padding: 2px 5px; -} -.forum__confirm__buttons { - display: flex; - padding: 5px; - justify-content: center; -} -.forum__confirm__button { - margin-right: 5px; -} diff --git a/assets/misuzu.css/forum/poll.css b/assets/misuzu.css/forum/poll.css deleted file mode 100644 index 1e77a8d0..00000000 --- a/assets/misuzu.css/forum/poll.css +++ /dev/null @@ -1,104 +0,0 @@ -.forum__poll__container { - margin: 2px 0; - padding: 5px; - display: flex; - flex-direction: column; - align-items: center; -} - -.forum__poll__toggle, -.forum__poll__toggle:checked ~ .forum__poll__container--poll, -.forum__poll__toggle:not(:checked) ~ .forum__poll__container--results { - display: none; -} - -.forum__poll__options { - display: flex; - flex-direction: column; - max-width: 500px; - min-width: 100%; -} - -.forum__poll__results { - max-width: 800px; - width: 100%; - padding: 0 1px; -} - -.forum__poll__option { - padding: 2px; -} - -.forum__poll__remaining, -.forum__poll__expires { - line-height: 1.5em; -} -.forum__poll__remaining__num, -.forum__poll__expires__num, -.forum__poll__remaining__datetime, -.forum__poll__expires__datetime { - font-weight: 700; -} - -.forum__poll__buttons { - display: flex; - margin-top: 2px; -} - -.forum__poll__button { - margin: 0 2px; -} - -.forum__poll__result { - overflow: hidden; - border-radius: 5px; - margin: 4px 0; - border: 1px solid var(--accent-colour); - width: 100%; -} - -.forum__poll__result__background { - position: absolute; - top: 0; - left: 0; - height: 100%; - background: var(--accent-colour); - opacity: .2; -} - -.forum__poll__result--voted .forum__poll__result__background { - opacity: .4; -} - -.forum__poll__result__container { - display: flex; - justify-content: center; -} - -.forum__poll__result__text { - flex: 1 1 auto; - padding: 5px; -} - -.forum__poll__result--voted .forum__poll__result__text { - font-weight: 700; -} - -.forum__poll__result__votes { - flex: 0 0 auto; - padding: 5px; - text-align: right; -} - -.forum__poll__result__percent { - flex: 0 0 auto; - padding: 5px; - min-width: 60px; - text-align: right; -} - -@media (min-width: 400px) { - .forum__poll__options { - min-width: 300px; - } -} diff --git a/assets/misuzu.css/forum/priority.css b/assets/misuzu.css/forum/priority.css deleted file mode 100644 index 2a15218b..00000000 --- a/assets/misuzu.css/forum/priority.css +++ /dev/null @@ -1,37 +0,0 @@ -.forum__priority__votes { - text-align: center; - margin: 5px 16px 5px 5px; - -webkit-touch-callout: none !important; - -webkit-user-select: none !important; - -khtml-user-select: none !important; - -moz-user-select: none !important; - -ms-user-select: none !important; - user-select: none !important; - cursor: default; -} - -.forum__priority__vote { - font-size: 14px; - display: inline; -} - -.forum__priority__star { - margin-right: -.9em; - opacity: .6; - text-shadow: 0 1px 1px #000; - color: var(--user-colour); - transition: text-shadow .2s; -} -.forum__priority__star:last-child { - margin-right: 0; - opacity: 1; -} - -.forum__priority__vote:hover .forum__priority__star { - text-shadow: 0 0 1px #fff; -} - -.forum__priority__input { - margin: 5px; - text-align: center; -} diff --git a/assets/misuzu.css/forum/topics.css b/assets/misuzu.css/forum/topics.css index 91a24f42..b525dd78 100644 --- a/assets/misuzu.css/forum/topics.css +++ b/assets/misuzu.css/forum/topics.css @@ -91,9 +91,6 @@ .forum__topic__icon--unread { background-color: var(--accent-colour); } -.forum__topic__icon--faded { - opacity: .3; -} .forum__topic__icon__participated { position: absolute; bottom: 2px; @@ -105,16 +102,6 @@ box-shadow: 0 1px 2px #111; pointer-events: initial; } -.forum__topic__icon__priority { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - line-height: 30px; - font-size: .9em; - text-align: center; -} .forum__topic__details { margin: 0 4px; @@ -285,4 +272,4 @@ position: absolute; right: 0; } -} \ No newline at end of file +} diff --git a/assets/misuzu.css/main.css b/assets/misuzu.css/main.css index f4088bce..ed1016d1 100644 --- a/assets/misuzu.css/main.css +++ b/assets/misuzu.css/main.css @@ -79,7 +79,6 @@ html { @include animations.css; @include avatar.css; @include bb.css; -@include confirm.css; @include container.css; @include eeprom.css; @include embed.css; @@ -92,7 +91,6 @@ html { @include main.css; @include markdown.css; @include messagebox.css; -@include navigation.css; @include pagination.css; @include permissions.css; @include warning.css; @@ -128,12 +126,9 @@ html { @include forum/actions.css; @include forum/categories.css; -@include forum/confirm.css; @include forum/header.css; @include forum/leaderboard.css; -@include forum/poll.css; @include forum/post.css; -@include forum/priority.css; @include forum/status.css; @include forum/topics.css; diff --git a/assets/misuzu.css/navigation.css b/assets/misuzu.css/navigation.css deleted file mode 100644 index 2dcaf7c1..00000000 --- a/assets/misuzu.css/navigation.css +++ /dev/null @@ -1,85 +0,0 @@ -.navigation { - margin: 2px 0; - width: 100%; - display: flex; - border-width: 0; - border-color: var(--text-colour); - border-style: solid; - border-top-width: 1px; - align-items: flex-start; - justify-content: center; -} - -.navigation--top { - border-top-width: 0; - border-bottom-width: 1px; - align-items: flex-end; -} -.navigation--top .navigation__option { - border-top-width: 1px; - border-bottom-width: 0; -} - -.navigation__option { - list-style: none; - background-color: #c9bbcc; - border: 1px solid var(--text-colour); - border-top-width: 0; - flex-grow: 0; -} -.navigation__option:not(:first-child) { border-left-width: 0; } -.navigation__option--selected { - background-color: var(--accent-colour); - top: -1px; -} -.navigation__option--selected:not(:first-child) { - margin-left: -1px; - border-left-width: 1px; -} - -.navigation__link { - display: block; - padding: 2px 1em; - color: var(--text-colour); - text-decoration: none; -} -.navigation__link:hover, .navigation__link:focus { color: #609; } - - -@media (max-width: 1000px) { - .navigation { - border: none; - align-items: center; - flex-direction: column; - } - .navigation--left { - justify-content: left; - padding-left: 25px; - } - .navigation--right { - justify-content: right; - padding-right: 25px; - } - - .navigation--top .navigation__option--selected { top: 1px; } - - .navigation__link { - padding: 10px 15px; - font-size: 1.5em; - } - - .navigation__option { - background-color: var(--accent-colour); - width: 100%; - border: none; - flex-grow: 1; - margin-bottom: 1px; - } - .navigation__option--selected { - background-color: #a586c3; - top: 0; - } - .navigation__option--selected .navigation__link { - padding: 3px 1em; - } -} diff --git a/assets/misuzu.css/profile/guidelines.css b/assets/misuzu.css/profile/guidelines.css index 098ebf0c..43c40c9b 100644 --- a/assets/misuzu.css/profile/guidelines.css +++ b/assets/misuzu.css/profile/guidelines.css @@ -21,7 +21,7 @@ border-bottom: 1px solid var(--accent-colour); padding-bottom: 2px; } -.profile__guidelines__line:not(&--header) { +.profile__guidelines__line:not(.profile__guidelines__line--header) { margin-left: 1.3em; list-style: square; } diff --git a/assets/misuzu.css/profile/header.css b/assets/misuzu.css/profile/header.css index fedb78f0..071ffaac 100644 --- a/assets/misuzu.css/profile/header.css +++ b/assets/misuzu.css/profile/header.css @@ -19,15 +19,6 @@ background-blend-mode: multiply; } -.profile__header--has-header { - --profile-header-overlay-start: var(--background-colour-translucent-3); -} - -.profile__header--has-header .profile__header__background { - background: var(--user-header) center / cover no-repeat; - background-blend-mode: unset; -} - .profile__header__avatar { display: flex; } @@ -78,15 +69,6 @@ flex: 1 1 auto; } -.profile__header__details__relation { - font-variant: all-small-caps; - background: var(--profile-header-overlay-stop); - border-radius: 2px; - line-height: 1.2em; - padding: 1px 5px 4px; - cursor: default; -} - .profile__header__options { min-height: 62px; background-color: var(--profile-header-overlay-stop); diff --git a/src/Tools.php b/src/Tools.php index 212b7833..a57e7a5b 100644 --- a/src/Tools.php +++ b/src/Tools.php @@ -178,7 +178,7 @@ final class Tools { 'ID' => 'Indonesia', 'IE' => 'Ireland', - 'IL' => 'Israel', + 'IL' => 'Palestine', 'IM' => 'Isle of Man', 'IN' => 'India', 'IO' => 'British Indian Ocean Territory', diff --git a/templates/macros.twig b/templates/macros.twig index b0cce7d6..562231a0 100644 --- a/templates/macros.twig +++ b/templates/macros.twig @@ -1,16 +1,3 @@ -{% macro navigation(links, current, top, fmt, align) %} - {% set top = top|default(false) == true %} - {% set align = align|default('centre') %} - {% set current = current|default(null) %} - {% set fmt = fmt|default('%s') %} - -
-{% endmacro %} - {% macro pagination(info, name, params, range) %} {% if info.page is defined and info.pages > 1 %} {% set params = params is iterable ? params : {} %}