Merge pull request #86 from MizuiMiduki/Dev

3.0.2
MizuiMiduki · Oct 30, 2024 · 2777326 · 2777326
2 parents 1c0e7fa + 8d6782b
commit 2777326
Show file tree

Hide file tree

Showing 19 changed files with 160 additions and 136 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,16 @@
 # Mizunaとは
-ノート時に無駄な通信を行わず通信量を削減したい方向けのノート専用Misskeyクライアントです
 
-# 公式サーバー
-- [安定版(推奨)](https://mizuna.blossomsarchive.com/)
-- [開発版](https://mizuna-canary.blossomsarchive.com/)
+Mizunaは、ノート時に無駄な通信を行わず通信量を削減したい方向けのノート専用Misskeyクライアントです。
+
+## 公式サーバー
+
+- [安定版（推奨）](https://mizuna.blossomsarchive.com/): 安定したバージョンのMizunaを利用できます。
+- [開発版](https://mizuna-canary.blossomsarchive.com/): 最新の機能を試すことができますが、不安定な場合があります。
 
 # リリースノート
-[Mizunaリリースノート | BlossomsArchive](https://blossomsarchive.com/blog/category/mizuna/)
 
-# ライセンス
-[LICENSE](/LICENSE)をご確認ください
+[Mizunaリリースノート | BlossomsArchive](https://blossomsarchive.com/blog/category/mizuna/): 最新のリリース情報や変更点を確認できます。
+
+## ライセンス
+
+このプロジェクトのライセンスについては、[LICENSE](/LICENSE)をご確認ください。
diff --git a/css/add_account.css b/css/add_account.css
@@ -6,12 +6,17 @@
     border: 1px solid black;
     box-sizing: border-box;
     width: 70%;
+    height: 2em;
 }
 
 #add_account_server_button {
-    font-weight: bolder;
+    font-weight: bold;
     background-color: var(--main_color);
     border-radius: 20px;
     cursor: pointer;
     width: 20%;
+    font-size: inherit;
+    height: 2em;
+    color: black;
+    border: black solid 1px;
 }
diff --git a/css/index.css b/css/index.css
@@ -8,6 +8,11 @@
     --main_color: lightblue;
 }
 
+input[type="button"], input[type="submit"] {
+    -webkit-appearance: none;
+    appearance: none;
+}
+
 body {
     margin: 0;
     padding: 0;
@@ -132,9 +137,8 @@ body {
     width: 50px;
     aspect-ratio: 1;
     border-radius: 50%;
-    background:
-        radial-gradient(farthest-side, var(--main_color) 94%, #0000) top/8px 8px no-repeat,
-        conic-gradient(#0000 30%, var(--main_color));
+    background: radial-gradient(farthest-side, var(--main_color) 94%, #0000) top/8px 8px no-repeat,
+    conic-gradient(#0000 30%, var(--main_color));
     -webkit-mask: radial-gradient(farthest-side, #0000 calc(100% - 8px), #000 0);
     animation: l13 1s infinite linear;
 

diff --git a/css/menu.css b/css/menu.css
@@ -76,7 +76,6 @@
 }
 
 
-
 .add_account_floating_button svg,
 .back_inputform_floating_button svg {
     display: flex;
@@ -93,7 +92,7 @@
     margin-top: -0.2em;
     width: 100%;
     text-align: center;
-    font-size: calc(1em/2);
+    font-size: calc(1em / 2);
     font-weight: bold;
 }
 

diff --git a/css/note_input.css b/css/note_input.css
@@ -11,6 +11,9 @@
     margin-bottom: 3%;
     align-items: center;
     cursor: pointer;
+    font-size: inherit;
+    color: black;
+    border: black solid 2px;
 }
 
 /* ノートメニュー */
@@ -84,15 +87,15 @@
     margin-top: -0.2em;
     width: 100%;
     text-align: center;
-    font-size: calc(1em/2);
+    font-size: calc(1em / 2);
     font-weight: bold;
 }
 
-.note_end_mizuna input[type="checkbox"]:checked~.menu_button,
-.followers_selecter input[type="checkbox"]:checked~.menu_button,
-.home_selecter input[type="checkbox"]:checked~.menu_button,
-.public_selecter input[type="checkbox"]:checked~.menu_button,
-.cw input[type="checkbox"]:checked~.menu_button {
+.note_end_mizuna input[type="checkbox"]:checked ~ .menu_button,
+.followers_selecter input[type="checkbox"]:checked ~ .menu_button,
+.home_selecter input[type="checkbox"]:checked ~ .menu_button,
+.public_selecter input[type="checkbox"]:checked ~ .menu_button,
+.cw input[type="checkbox"]:checked ~ .menu_button {
     opacity: 1;
     border-color: #000000;
 }

diff --git a/css/settings.css b/css/settings.css
@@ -12,7 +12,7 @@
     left: 0;
 }
 
-.cp_tab>.cp_tabs>input[type='radio'] {
+.cp_tab > .cp_tabs > input[type='radio'] {
     margin: 0;
     padding: 0;
     border: none;
@@ -32,7 +32,7 @@
     overflow-y: scroll;
 }
 
-.cp_tab>.cp_tabs>label {
+.cp_tab > .cp_tabs > label {
     position: relative;
     display: inline-block;
     padding: 15px;
@@ -41,12 +41,12 @@
     border-bottom: 0;
 }
 
-.cp_tab>.cp_tabs>label:hover,
-.cp_tab>.cp_tabs>input:focus+label {
+.cp_tab > .cp_tabs > label:hover,
+.cp_tab > .cp_tabs > input:focus + label {
     color: #0066cc;
 }
 
-.cp_tab>.cp_tabs>input:checked+label {
+.cp_tab > .cp_tabs > input:checked + label {
     margin-bottom: -1px;
     border-color: #cccccc;
     border-bottom: 1px solid #ffffff;
@@ -139,9 +139,8 @@ kbd {
     background-color: #eee;
     border-radius: 3px;
     border: 1px solid #b4b4b4;
-    box-shadow:
-        0 1px 1px rgba(0, 0, 0, 0.2),
-        0 2px 0 0 rgba(255, 255, 255, 0.7) inset;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2),
+    0 2px 0 0 rgba(255, 255, 255, 0.7) inset;
     color: #333;
     display: inline-block;
     font-size: 0.85em;
@@ -158,6 +157,7 @@ kbd {
     padding: 0.3em;
     border: gray 1px solid;
     user-select: none;
+    color: black;
 }
 
 .mizuna_share:active {

diff --git a/index.html b/index.html
@@ -4,8 +4,8 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Mizuna -ノート専用Misskeyクライアント</title>
-    <meta name="description" content="Mizunaは機能をノート送信のみにすることで通信量削減に重点を置いたMisskeyクライアントです"/>
+    <title>Mizuna - ノート専用Misskeyクライアント</title>
+    <meta name="description" content="Mizunaは機能をノート送信のみにすることで通信量削減に重点を置いたMisskeyクライアントです">
     <link rel="manifest" href="/manifest.json">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
     <script src="https://unpkg.com/dexie/dist/dexie.js"></script>
@@ -15,9 +15,9 @@
     <script src="js/index.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js"></script>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css">
-    <link rel="stylesheet" href="css/index.css">
-    <link rel="stylesheet" href="css/settings.css">
-    <link rel="icon" href="/icon.png">
+    <link href="css/index.css" rel="stylesheet">
+    <link href="css/settings.css" rel="stylesheet">
+    <link href="/icon.png" rel="icon">
 </head>
 
 <body>
@@ -34,11 +34,11 @@ <h1>Mizuna</h1>
         <!-- フッター -->
         <div class="footer">
             <div class="user_icon_back">
-                <img class="user_icon" id="menu_icon" src="/icon.png" onError="this.onerror=null;this.src='/icon.png';">
+                <img class="user_icon" id="menu_icon" onError="this.onerror=null;this.src='/icon.png';" src="/icon.png">
             </div>
             <div class="settings_icon_back">
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="#5f6368" class="settings_icon"
-                    id="settings_icon">
+                <svg class="settings_icon" fill="#5f6368" id="settings_icon" viewBox="0 -960 960 960"
+                    xmlns="http://www.w3.org/2000/svg">
                     <path
                         d="m370-80-16-128q-13-5-24.5-12T307-235l-119 50L78-375l103-78q-1-7-1-13.5v-27q0-6.5 1-13.5L78-585l110-190 119 50q11-8 23-15t24-12l16-128h220l16 128q13 5 24.5 12t22.5 15l119-50 110 190-103 78q1 7 1 13.5v27q0 6.5-2 13.5l103 78-110 190-118-50q-11 8-23 15t-24 12L590-80H370Zm70-80h79l14-106q31-8 57.5-23.5T639-327l99 41 39-68-86-65q5-14 7-29.5t2-31.5q0-16-2-31.5t-7-29.5l86-65-39-68-99 42q-22-23-48.5-38.5T533-694l-13-106h-79l-14 106q-31 8-57.5 23.5T321-633l-99-41-39 68 86 64q-5 15-7 30t-2 32q0 16 2 31t7 30l-86 65 39 68 99-42q22 23 48.5 38.5T427-266l13 106Zm42-180q58 0 99-41t41-99q0-58-41-99t-99-41q-59 0-99.5 41T342-480q0 58 40.5 99t99.5 41Zm-2-140Z" />
                 </svg>
@@ -47,9 +47,9 @@ <h1>Mizuna</h1>
                 <p><span id="user_name">name</span>(@<span id="user_id">id@address</span>)</p>
             </div>
         </div>
-        <link rel="stylesheet" href="css/note_input.css">
-        <link rel="stylesheet" href="css/menu.css">
-        <link rel="stylesheet" href="css/add_account.css">
+        <link href="css/note_input.css" rel="stylesheet">
+        <link href="css/menu.css" rel="stylesheet">
+        <link href="css/add_account.css" rel="stylesheet">
     </div>
 </body>
 

diff --git a/js/function/WebShareTarget.js b/js/function/WebShareTarget.js
@@ -6,27 +6,27 @@ const websharetarget = function (retryCount = 0) {
     const url = localStorage.getItem("wst_url");
 
     if (title !== null || text !== null || url !== null) {
-            let oldValue = $(".note_content").val() || "";
+        let oldValue = $(".note_content").val() || "";
 
-            if (title) {
-                oldValue += (oldValue ? "\n" : "") + title;
-            }
+        if (title) {
+            oldValue += (oldValue ? "\n" : "") + title;
+        }
 
-            if (text) {
-                oldValue += (oldValue ? "\n" : "") + text;
-            }
+        if (text) {
+            oldValue += (oldValue ? "\n" : "") + text;
+        }
 
-            if (url) {
-                oldValue += (oldValue ? "\n" : "") + url;
-            }
+        if (url) {
+            oldValue += (oldValue ? "\n" : "") + url;
+        }
 
-            $('.note_content').val(oldValue);
+        $('.note_content').val(oldValue);
 
-            setTimeout(() => {
+        setTimeout(() => {
             if ($('.note_content').val().trim() === "" && retryCount < maxRetries) {
                 websharetarget(retryCount + 1);
             }
-        },100)
+        }, 100)
     }
     return;
 }
diff --git a/js/function/apply_default_visibility_button.js b/js/function/apply_default_visibility_button.js
@@ -19,7 +19,7 @@ const apply_default_visibility_button = function () {
             break;
     }
 
-    if(true == user_options.is_note_end_mizuna){
+    if (true == user_options.is_note_end_mizuna) {
         $("#note_end_mizuna_checkbox").prop('checked', true);
         $('#max_charCount').text(2986);
     }

diff --git a/js/function/generate_account_list.js b/js/function/generate_account_list.js
@@ -3,7 +3,7 @@ const generate_account_list = function () {
         get_user_db_data(account_list_array).then(account_list => {
             for (let i = 0; i < account_list.length; i++) {
                 $('.account_display_area').append
-                    (`
+                (`
                         <div class="account_card_area">
                         <div id="account_card" data-id="${account_list[i]['id']}">
                         <table>

diff --git a/js/function/get_setting_db_data.js b/js/function/get_setting_db_data.js
@@ -27,7 +27,15 @@ const user_setting = function () {
                 return;
             } else {
                 // ユーザー設定が存在しなかった場合に全て初期値で新規作成して再試行
-                db.setting.add({ select_user: 1, default_visibility: 1, is_note_end_mizuna: false, is_visible_icon: true, ui_mode: 1, is_darkmode: 1, is_pick_theme_color: false }).then(() => {
+                db.setting.add({
+                    select_user: 1,
+                    default_visibility: 1,
+                    is_note_end_mizuna: false,
+                    is_visible_icon: true,
+                    ui_mode: 1,
+                    is_darkmode: 1,
+                    is_pick_theme_color: false
+                }).then(() => {
                     user_setting();
                 })
             }

diff --git a/js/function/set_user_text.js b/js/function/set_user_text.js
@@ -4,7 +4,7 @@ const set_user_text = function (data) {
     $("#user_id").text(`${data.username}@${data.address}`);
     if (user_options.is_visible_icon == true) {
         $('#menu_icon').attr('src', data.avatarurl);
-    }else{
+    } else {
         $('#menu_icon').attr('src', "/icon.png");
     }
     return;

diff --git a/js/option/mizuna_option.js b/js/option/mizuna_option.js
@@ -1,5 +1,5 @@
 mizuna_options = {
-    mizuna_version: "3.0.1",
+    mizuna_version: "3.0.2",
     mizuna_address: "https://" + location.hostname,
     maintenance: false,
 }

diff --git a/js/service/inputform_service.js b/js/service/inputform_service.js
@@ -54,7 +54,7 @@ $.getScript("/js/function/form_mizuna.js")
 
 function note_send_submit() {
     $(".note_submit").prop("disabled", true);
-    send_note(user_data)
+    send_note(user_data);
 }
 
 // 公開範囲ボタンをラジオボタンと同じ挙動にする
@@ -81,7 +81,7 @@ $(document).on("click", "#form_clear_button", function () {
 let load_generate_menu_service = false;
 let toggle_menu_input = 0;
 $(document).on("click", "#menu_icon", function () {
-    if($('.input_block').length){
+    if ($('.input_block').length) {
         if (toggle_settings_input === 0) {
             cw_content_tmp = $('.cw_content').val();
             note_content_tmp = $('.note_content').val();
@@ -120,7 +120,7 @@ $(document).on("click", "#menu_icon", function () {
                 $(".cw_input_ara").css('display', 'block');
                 $('.cw_content').text(cw_content_tmp);
             }
-            $('.note_content').text(note_content_tmp);
+            $('.note_content').val(note_content_tmp);
 
             $('#charCount').text($('.note_content').val().length);
             $.getScript("/js/function/note_content_count.js")
@@ -137,7 +137,7 @@ $.getScript("/js/function/WebShareTarget.js", function () {
 let load_settings_service = false;
 let toggle_settings_input = 0;
 $(document).on("click", "#settings_icon", function () {
-    if($('.input_block').length){
+    if ($('.input_block').length) {
         if (toggle_settings_input === 0) {
             cw_content_tmp = $('.cw_content').val();
             note_content_tmp = $('.note_content').val();
@@ -175,7 +175,7 @@ $(document).on("click", "#settings_icon", function () {
                 $(".cw_input_ara").css('display', 'block');
                 $('.cw_content').text(cw_content_tmp);
             }
-            $('.note_content').text(note_content_tmp);
+            $('.note_content').val(note_content_tmp);
 
             $('#charCount').text($('.note_content').val().length);
             $.getScript("/js/function/note_content_count.js")

diff --git a/maintenance.html b/maintenance.html
@@ -3,11 +3,11 @@
 
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta content="width=device-width, initial-scale=1.0" name="viewport">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
     <title>メンテナンス | Mizuna</title>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
-    <link rel="icon" href="/icon.png">
+    <link href="/icon.png" rel="icon">
 
     <style>
         body {
@@ -62,16 +62,16 @@
 </head>
 
 <body>
-    <div class="container">
-        <img src="/icon.png" alt="Mizuna" class="logo">
+<div class="container">
+    <img alt="Mizuna" class="logo" src="/icon.png">
 
-        <h1>現在メンテナンス中です</h1>
-        <p>しばらくお待ちください。<br>メンテナンスが完了次第、サービスを再開いたします。</p>
+    <h1>現在メンテナンス中です</h1>
+    <p>しばらくお待ちください。<br>メンテナンスが完了次第、サービスを再開いたします。</p>
 
-        <div class="footer">
-            &copy; 2023 瑞井 箕月
-        </div>
+    <div class="footer">
+        &copy; 2023 瑞井 箕月
     </div>
+</div>
 </body>
 
 </html>