diff --git a/assets/less/mio/classes/container.less b/assets/less/mio/classes/container.less index 87d90f12..31df4863 100644 --- a/assets/less/mio/classes/container.less +++ b/assets/less/mio/classes/container.less @@ -3,6 +3,9 @@ background-color: #fbeeff; margin: 2px 0; + .mio--dark & { + background-color: #23172a; + } &__title { display: block; diff --git a/assets/less/mio/classes/input/button.less b/assets/less/mio/classes/input/button.less index e17370aa..6f682dad 100644 --- a/assets/less/mio/classes/input/button.less +++ b/assets/less/mio/classes/input/button.less @@ -3,7 +3,7 @@ font-size: 20px; line-height: 1.25em; color: #fff; - background: #9475b2; + background-color: #9475b2; border: 1px solid #306; box-shadow: inset 0 0 0 1px #643b8c; border-radius: 2px; @@ -14,20 +14,28 @@ display: inline-block; text-decoration: none; - &:focus { - border-color: #407; - } - - &:hover { - background: #A586c3; - } - - &:active { - border-color: #306; - background: #8364a1; - } - &--small { font-size: 15px; } + + &--disabled { + background-color: #888; + border-color: #444; + box-shadow: inset 0 0 0 1px #555; + } + + &:not(&--disabled) { + &:focus { + border-color: #407; + } + + &:hover { + background: #A586c3; + } + + &:active { + border-color: #306; + background: #8364a1; + } + } } diff --git a/assets/less/mio/classes/news/post.less b/assets/less/mio/classes/news/post.less index ad6eddd8..8bd5e9ea 100644 --- a/assets/less/mio/classes/news/post.less +++ b/assets/less/mio/classes/news/post.less @@ -60,8 +60,10 @@ text-decoration: none; color: inherit; - &:hover { - text-decoration: underline; + &--link { + &:hover { + text-decoration: underline; + } } } } diff --git a/public/settings.php b/public/settings.php index 86feedc8..fd4f791f 100644 --- a/public/settings.php +++ b/public/settings.php @@ -204,29 +204,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { break; case 'avatar': - if (isset($_POST['import']) - && !File::exists($app->getStore('avatars/original')->filename($avatar_filename))) { - if (!tmp_csrf_verify($_POST['import'])) { - $settings_errors[] = $csrf_error_str; - break; - } - - $old_avatar_url = trim(file_get_contents( - "https://secret.flashii.net/avatar-serve.php?id={$settings_user->user_id}&r" - )); - - if (empty($old_avatar_url)) { - $settings_errors[] = 'No old avatar was found for you.'; - break; - } - - File::writeAll( - $app->getStore('avatars/original')->filename($avatar_filename), - file_get_contents($old_avatar_url) - ); - break; - } - if (isset($_POST['delete'])) { if (!tmp_csrf_verify($_POST['delete'])) { $settings_errors[] = $csrf_error_str; diff --git a/views/mio/news/macros.twig b/views/mio/news/macros.twig index 08817c3b..fe83fa5a 100644 --- a/views/mio/news/macros.twig +++ b/views/mio/news/macros.twig @@ -13,7 +13,9 @@ {{ post.created_at }} -
{{ post.user.username }}
+
+ {{ post.user.username }} +
diff --git a/views/mio/news/post.twig b/views/mio/news/post.twig index e7008240..35ebaf95 100644 --- a/views/mio/news/post.twig +++ b/views/mio/news/post.twig @@ -21,7 +21,7 @@
- +
Category
diff --git a/views/mio/settings/avatar.twig b/views/mio/settings/avatar.twig index b638d9eb..3c0e032e 100644 --- a/views/mio/settings/avatar.twig +++ b/views/mio/settings/avatar.twig @@ -21,12 +21,9 @@ +
- {% if user_has_avatar %} - - {% else %} - - {% endif %} +
diff --git a/views/mio/user/view.twig b/views/mio/user/view.twig index 5b382096..96709b45 100644 --- a/views/mio/user/view.twig +++ b/views/mio/user/view.twig @@ -71,11 +71,13 @@
+ {% if profile.userTitle is not empty %}
-
+
{{ profile.userTitle }}
+ {% endif %}
@@ -103,7 +105,7 @@ Last Seen
- {% if profile.last_seen.timestamp + 5 >= ''|date('U') %} + {% if profile.last_seen.addMinute.timestamp >= ''|date('U') %} Online now {% else %} {{ profile.last_seen.diffForHumans }} @@ -140,7 +142,7 @@ {% endspaceless %} {% endif %}
-
+