diff --git a/assets/less/classes/flag.less b/assets/less/classes/flag.less index 67dbd036..f4e787ea 100644 --- a/assets/less/classes/flag.less +++ b/assets/less/classes/flag.less @@ -9,7 +9,7 @@ display: inline-block; width: @flag-width; height: @flag-height; - background-image: url('https://static.flash.moe/images/flag-sprite.png'); + background-image: url('/images/flag-sprite.png'); background-repeat: no-repeat; font-size: 0; .flag-position(23, 23); // xx diff --git a/assets/less/classes/header.less b/assets/less/classes/header.less index ad9d1c1f..325ca3ec 100644 --- a/assets/less/classes/header.less +++ b/assets/less/classes/header.less @@ -29,12 +29,13 @@ height: 40px; &--menu { - background-image: url('https://static.flash.moe/images/mobile-menu.png'); - background-size: 40px; + font-size: 3em; + justify-content: center; + align-items: center; } @media (max-width: @site-mobile-width) { - display: block; + display: inline-flex; } } @@ -44,14 +45,14 @@ text-decoration: none; cursor: pointer; display: block; - background: url('https://static.flash.moe/images/imouto-transparent.png') no-repeat center / cover; - background-image: url('https://static.flash.moe/images/imouto-halloween.png'); + background: url('/images/logos/imouto-default.png') no-repeat center / cover; + background-image: url('/images/logos/imouto-halloween.png'); width: 60px; height: 60px; font-size: 0; &--manage { - background-image: url('https://static.flash.moe/images/imouto-broom.png'); + background-image: url('/images/logos/imouto-broom.png'); } @media (max-width: @site-mobile-width) { diff --git a/assets/less/classes/usercard.less b/assets/less/classes/usercard.less index a3d5a4fb..fc36509c 100644 --- a/assets/less/classes/usercard.less +++ b/assets/less/classes/usercard.less @@ -129,7 +129,7 @@ } &--donator { - background-image: url('https://static.flash.moe/images/tenshi.png'); + //background-image: url('/images/tenshi.png'); width: 37px; height: 11px; font-size: 0; diff --git a/assets/less/main.less b/assets/less/main.less index ffa80280..80d5fde8 100644 --- a/assets/less/main.less +++ b/assets/less/main.less @@ -67,26 +67,6 @@ body { &--legacy { --background-color: #fbeeff; } - - &--bg-blend { - background-blend-mode: multiply; - } - - /*&--bg-slide { - }*/ - - &--bg-cover { - background-repeat: no-repeat; - } - - &--bg-stretch { - background-size: 100% 100%; - background-repeat: no-repeat; - } - - &--bg-tile { - background-repeat: repeat; - } } // Input elements diff --git a/public/images/flag-sprite.png b/public/images/flag-sprite.png new file mode 100644 index 00000000..4134fd70 Binary files /dev/null and b/public/images/flag-sprite.png differ diff --git a/public/images/logos/imouto-broom.png b/public/images/logos/imouto-broom.png new file mode 100644 index 00000000..d29a4b45 Binary files /dev/null and b/public/images/logos/imouto-broom.png differ diff --git a/public/images/logos/imouto-default.png b/public/images/logos/imouto-default.png new file mode 100644 index 00000000..845168f6 Binary files /dev/null and b/public/images/logos/imouto-default.png differ diff --git a/public/images/logos/imouto-halloween.png b/public/images/logos/imouto-halloween.png new file mode 100644 index 00000000..6249f5f4 Binary files /dev/null and b/public/images/logos/imouto-halloween.png differ diff --git a/public/settings.php b/public/settings.php index c150e342..1128a16d 100644 --- a/public/settings.php +++ b/public/settings.php @@ -156,7 +156,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { switch ($_POST['background']['mode'] ?? '') { case 'delete': user_background_delete($settingsUserId); - user_background_set_settings($settingsUserId, MSZ_USER_BACKGROUND_ATTACHMENT_NONE); break; case 'upload': @@ -165,55 +164,40 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { break; } - if (empty($_POST['background']) - || !is_array($_POST['background'])) { + if (empty($_FILES['background']) + || !is_array($_FILES['background']) + || empty($_FILES['background']['name']['file'])) { break; } - if (!empty($_FILES['background']['name']['file'])) { - if ($_FILES['background']['error']['file'] !== UPLOAD_ERR_OK) { - $settingsErrors[] = sprintf( - MSZ_TMP_USER_ERROR_STRINGS['avatar']['upload'][$_FILES['background']['error']['file']] - ?? MSZ_TMP_USER_ERROR_STRINGS['avatar']['upload']['_'], - $_FILES['background']['error']['file'], - byte_symbol($backgroundProps['max_size'], true), - $backgroundProps['max_width'], - $backgroundProps['max_height'] - ); - break; - } - - $setBackground = user_background_set_from_path( - $settingsUserId, - $_FILES['background']['tmp_name']['file'], - $backgroundProps + if ($_FILES['background']['error']['file'] !== UPLOAD_ERR_OK) { + $settingsErrors[] = sprintf( + MSZ_TMP_USER_ERROR_STRINGS['avatar']['upload'][$_FILES['background']['error']['file']] + ?? MSZ_TMP_USER_ERROR_STRINGS['avatar']['upload']['_'], + $_FILES['background']['error']['file'], + byte_symbol($backgroundProps['max_size'], true), + $backgroundProps['max_width'], + $backgroundProps['max_height'] ); - - if ($setBackground !== MSZ_USER_BACKGROUND_NO_ERRORS) { - $settingsErrors[] = sprintf( - MSZ_TMP_USER_ERROR_STRINGS['avatar']['set'][$setBackground] - ?? MSZ_TMP_USER_ERROR_STRINGS['avatar']['set']['_'], - $setBackground, - byte_symbol($backgroundProps['max_size'], true), - $backgroundProps['max_width'], - $backgroundProps['max_height'] - ); - } + break; } - $backgroundSettings = in_array($_POST['background']['attach'] ?? '', MSZ_USER_BACKGROUND_ATTACHMENTS_NAMES) - ? array_flip(MSZ_USER_BACKGROUND_ATTACHMENTS_NAMES)[$_POST['background']['attach']] - : MSZ_USER_BACKGROUND_ATTACHMENTS[0]; + $setBackground = user_background_set_from_path( + $settingsUserId, + $_FILES['background']['tmp_name']['file'], + $backgroundProps + ); - if (!empty($_POST['background']['attr']['blend'])) { - $backgroundSettings |= MSZ_USER_BACKGROUND_ATTRIBUTE_BLEND; + if ($setBackground !== MSZ_USER_BACKGROUND_NO_ERRORS) { + $settingsErrors[] = sprintf( + MSZ_TMP_USER_ERROR_STRINGS['avatar']['set'][$setBackground] + ?? MSZ_TMP_USER_ERROR_STRINGS['avatar']['set']['_'], + $setBackground, + byte_symbol($backgroundProps['max_size'], true), + $backgroundProps['max_width'], + $backgroundProps['max_height'] + ); } - - if (!empty($_POST['background']['attr']['slide'])) { - $backgroundSettings |= MSZ_USER_BACKGROUND_ATTRIBUTE_SLIDE; - } - - user_background_set_settings($settingsUserId, $backgroundSettings); break; } } @@ -350,17 +334,11 @@ switch ($settingsMode) { $getAccountInfo = Database::prepare(sprintf( ' - SELECT - %1$s, `email`, `user_about_content`, `user_about_parser`, - `user_background_settings` & 0x0F as `user_background_attachment`, - (`user_background_settings` & %2$d) > 0 as `user_background_attr_blend`, - (`user_background_settings` & %3$d) > 0 as `user_background_attr_slide` + SELECT %s, `email`, `user_about_content`, `user_about_parser` FROM `msz_users` WHERE `user_id` = :user_id ', - pdo_prepare_array($profileFields, true, '`user_%s`'), - MSZ_USER_BACKGROUND_ATTRIBUTE_BLEND, - MSZ_USER_BACKGROUND_ATTRIBUTE_SLIDE + pdo_prepare_array($profileFields, true, '`user_%s`') )); $getAccountInfo->bindValue('user_id', $settingsUserId); $accountInfo = $getAccountInfo->execute() ? $getAccountInfo->fetch(PDO::FETCH_ASSOC) : []; @@ -376,7 +354,6 @@ switch ($settingsMode) { 'settings_profile_fields' => $profileFields, 'settings_disable_account_options' => $disableAccountOptions, 'account_info' => $accountInfo, - 'background_attachments' => MSZ_USER_BACKGROUND_ATTACHMENTS_NAMES, ]); break; diff --git a/templates/_layout/header.twig b/templates/_layout/header.twig index 9ab4c1c2..e874342c 100644 --- a/templates/_layout/header.twig +++ b/templates/_layout/header.twig @@ -3,7 +3,9 @@