Skip to content

Commit f8054fb

Browse files
committed
ui improvement
1 parent ac46b92 commit f8054fb

11 files changed

Lines changed: 188 additions & 188 deletions

App/create_confirm_dialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ module.exports=function(dialog_content,do_what_if_sure){
1313
<p>${dialog_content}</p>
1414
</div>
1515
<div class="modal-footer">
16-
<fluent-button appearance="accent" data-bs-dismiss="modal"><i class="fa fa-ban"></i> ${langdata["CANCEL"][lang_name]}</fluent-button>
17-
<fluent-button appearance="accent" data-bs-dismiss="modal" id="${dialog_id}_sure"><i class="fa fa-check"></i> ${langdata["OK"][lang_name]}</fluent-button>
16+
<button type="button" class="danger_btn" data-bs-dismiss="modal"><i class="fa fa-ban"></i> ${langdata["CANCEL"][lang_name]}</button>
17+
<button type="button" class="success_btn" data-bs-dismiss="modal" id="${dialog_id}_sure"><i class="fa fa-check"></i> ${langdata["OK"][lang_name]}</button>
1818
</div>
1919
</div>
2020
</div>

App/edit_friend_book.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ${langdata.GET_FRIEND_BOOK_DATA_FROM_EXTERNAL_LINK[lang_name]}
9292
9393
9494
95-
<fluent-button appearance="accent" onclick="add_new_friend();"><i class="fa fa-plus"></i> ${langdata.ADD_NEW_FRIEND_BOOK_INFO[lang_name]}</fluent-button>
95+
<button type="button" class="success_btn" onclick="add_new_friend();"><i class="fa fa-plus"></i> ${langdata.ADD_NEW_FRIEND_BOOK_INFO[lang_name]}</button>
9696
</div>
9797
</div>
9898
<div class="modal-footer" id="edit_friend_book_dialog_footer">

App/encryption_decryption_ui.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const ui_encrypt_article = (article_id) => {
1010
<label class="form-label"><i class="fa fa-password"></i> ${langdata.INPUT_A_PASSWORD[lang_name]}</label>
1111
<input class="form-control" placeholder="${langdata.INPUT_A_PASSWORD[lang_name]}" value="" id="article_password_modal_value">
1212
</div>
13-
<fluent-button appearance="accent" id="encryptionOptionsModalEncryptBtn">${langdata.ENCRYPT_ARTICLE[lang_name]}</fluent-button>
13+
<button type="button" class="success_btn" id="encryptionOptionsModalEncryptBtn">${langdata.ENCRYPT_ARTICLE[lang_name]}</button>
1414
`;
1515
document.getElementById("encryptionOptionsModalEncryptBtn").addEventListener("click", () => {
1616
let password = document.getElementById("article_password_modal_value").value;
@@ -35,7 +35,7 @@ const ui_decrypt_article = (article_id) => {
3535
<label class="form-label"><i class="fa fa-password"></i> ${langdata.INPUT_A_PASSWORD[lang_name]}</label>
3636
<input class="form-control" placeholder="${langdata.INPUT_A_PASSWORD[lang_name]}" value="" id="article_password_modal_value">
3737
</div>
38-
<fluent-button appearance="accent" id="encryptionOptionsModalDecryptBtn">${langdata.DECRYPT_ARTICLE[lang_name]}</fluent-button>
38+
<button type="button" class="success_btn" id="encryptionOptionsModalDecryptBtn">${langdata.DECRYPT_ARTICLE[lang_name]}</button>
3939
`;
4040
document.getElementById("encryptionOptionsModalDecryptBtn").addEventListener("click", () => {
4141
let password = document.getElementById("article_password_modal_value").value;
@@ -61,4 +61,4 @@ const ui_decrypt_article = (article_id) => {
6161
module.exports = {
6262
ui_encrypt_article: ui_encrypt_article,
6363
ui_decrypt_article: ui_decrypt_article
64-
};
64+
};

App/import_fluent_ui.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

App/manage.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,6 @@ const edit_external_links = require("./edit_external_links.js");
120120
const let_page_up = require("./change_page_order.js").let_page_up;
121121
const let_page_down = require("./change_page_order.js").let_page_down;
122122

123-
const import_fluent_ui = require("./import_fluent_ui.js");
124-
125-
import_fluent_ui();
126-
127-
128-
129123
function convertTimeStampToDatetimeString(timestamp) {
130124
const date = new Date(timestamp);
131125

App/start.js

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@ const check_update = require("./check_update.js");
2525

2626
const BlogData = require("./BlogData.js");
2727

28-
const import_fluent_ui = require("./import_fluent_ui.js");
2928
const icon = require("./icon.js");
3029

31-
import_fluent_ui();
32-
3330
const create_new_site_dialog = new bootstrap.Modal(document.getElementById("create-new-site-dialog"));
3431
const err_dialog = new bootstrap.Modal(document.getElementById("err-dialog"));
3532
const info_dialog = new bootstrap.Modal(document.getElementById("info-dialog"));
@@ -399,34 +396,34 @@ storage.has("language", (error, hasKey) => {
399396
document.getElementById("interface_firstpart").innerHTML = `
400397
<h1>${langdata.STARTPAGE_TITLE[lang_name]}</h1><br />
401398
<br />
402-
<fluent-button class="startpage_btn_container" id="open_site_btn" onclick="open_site()">
403-
<div class="startpage_btn_inner">
404-
<div class="startpage_btn_icon">${icon("folder-svgrepo-com")}</div>
399+
<button type="button" class="startpage_btn_container startpage_action_btn" id="open_site_btn" onclick="open_site()">
400+
<span class="startpage_btn_inner">
401+
<span class="startpage_btn_icon">${icon("folder-svgrepo-com")}</span>
405402
406403
${langdata.OPEN_EXISTING_SITE[lang_name]}
407-
</div>
408-
</fluent-button>
404+
</span>
405+
</button>
409406
410-
<fluent-button class="startpage_btn_container" id="create_site_btn" onclick="create_new_site_dialog_show()">
411-
<div class="startpage_btn_inner">
412-
<div class="startpage_btn_icon">${icon("add-folder-svgrepo-com")}</div>
407+
<button type="button" class="startpage_btn_container startpage_action_btn" id="create_site_btn" onclick="create_new_site_dialog_show()">
408+
<span class="startpage_btn_inner">
409+
<span class="startpage_btn_icon">${icon("add-folder-svgrepo-com")}</span>
413410
${langdata.CREATE_NEW_SITE[lang_name]}
414-
</div>
415-
</fluent-button>
411+
</span>
412+
</button>
416413
<div class="dropdown" style="display: inline-block">
417-
<fluent-button class="startpage_btn_container" id="recent_open_btn" data-bs-toggle="dropdown"><div class="startpage_btn_inner"><div class="startpage_btn_icon">${icon("clock-time-and-date-svgrepo-com")}</div>${langdata.RECENT_OPEN[lang_name]}</div></fluent-button>
414+
<button type="button" class="startpage_btn_container startpage_action_btn" id="recent_open_btn" data-bs-toggle="dropdown"><span class="startpage_btn_inner"><span class="startpage_btn_icon">${icon("clock-time-and-date-svgrepo-com")}</span>${langdata.RECENT_OPEN[lang_name]}</span></button>
418415
<ul class="dropdown-menu">
419416
<li><a class="dropdown-item" id="last_managed_site"></a></li>
420417
</ul>
421418
422419
</div>
423420
<div class="dropdown" style="display: inline-block">
424-
<fluent-button class="startpage_btn_container" id="application_settings_btn" data-bs-toggle="dropdown">
425-
<div class="startpage_btn_inner">
426-
<div class="startpage_btn_icon">${icon("cog-svgrepo-com")}</div>
421+
<button type="button" class="startpage_btn_container startpage_action_btn" id="application_settings_btn" data-bs-toggle="dropdown">
422+
<span class="startpage_btn_inner">
423+
<span class="startpage_btn_icon">${icon("cog-svgrepo-com")}</span>
427424
${langdata.APPLICATION_SETTINGS[lang_name]}
428-
</div>
429-
</fluent-button>
425+
</span>
426+
</button>
430427
<ul class="dropdown-menu">
431428
<li><a class="dropdown-item" onclick="language_dialog.show();"><i class="fa fa-flag" aria-hidden="true"></i> Language Settings / 语言设定</a></li>
432429
<li><a class="dropdown-item" onclick="openStylesheetDialog()"><i class="fa fa-paint-brush" aria-hidden="true"></i> ${langdata.APPLICATION_STYLE_SETTING[lang_name]}</a></li>

App/stylesheets/DarkMode.css

Lines changed: 77 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -131,49 +131,6 @@ body:before {
131131
color: greenyellow;
132132
}
133133

134-
.fluentbtn {
135-
border-radius: 8px;
136-
background-color: rgb(254, 254, 254);
137-
border-style: solid;
138-
border-width: 1px;
139-
border-color: rgb(235, 237, 238);
140-
padding-top: 8px;
141-
padding-left: 20px;
142-
padding-right: 20px;
143-
padding-bottom: 8px;
144-
text-decoration: none;
145-
color: black;
146-
font-size: 110%;
147-
box-shadow: 0 3px 1px -2px rgb(0 0 0 / 5%), 0 2px 2px 0 rgb(0 0 0 / 6%), 0 1px 5px 0 rgb(0 0 0 / 6%);
148-
}
149-
150-
.fluentbtn-blue {
151-
background-color: rgba(3, 106, 196, 0.671) !important;
152-
color: white !important
153-
}
154-
155-
.fluentbtn-blue:hover {
156-
background-color: #168dd6 !important;
157-
color: white !important
158-
}
159-
160-
.fluentbtn-blue:active {
161-
background-color: rgb(39, 78, 175) !important;
162-
color: rbg(218, 228, 255) !important
163-
}
164-
165-
.fluentbtn:hover {
166-
background-color: rgb(250, 251, 251);
167-
text-decoration: none;
168-
color: black;
169-
}
170-
171-
.fluentbtn:active {
172-
background-color: rgb(250, 251, 251);
173-
text-decoration: none;
174-
color: grey;
175-
}
176-
177134
@keyframes fade-in {
178135
from {
179136
opacity: 0
@@ -651,21 +608,6 @@ textarea.form-control:focus {
651608
color: white;
652609
}
653610

654-
.fluentbtn-start {
655-
background-color: rgb(136, 164, 199) !important;
656-
color: black !important;
657-
border-radius: 0px;
658-
border: 0;
659-
}
660-
661-
.fluentbtn-start:hover {
662-
background-color: rgb(187, 210, 238) !important;
663-
}
664-
665-
.fluentbtn-start:active {
666-
background-color: rgb(189, 213, 242) !important;
667-
}
668-
669611
#startpage_container {
670612
background-color: rgb(42, 45, 60);
671613
color: white;
@@ -703,18 +645,42 @@ textarea.form-control:focus {
703645

704646
.startpage_btn_container {
705647
height: fit-content;
648+
margin: 4px 5px;
706649
}
707650

708651
.startpage_btn_inner {
709-
padding-top: 20px;
710-
padding-bottom: 20px;
711-
padding-left: 10px;
712-
padding-right: 10px;
652+
display: block;
653+
padding-top: 12px;
654+
padding-bottom: 12px;
655+
padding-left: 7px;
656+
padding-right: 7px;
713657
}
714658

715659
.startpage_btn_icon {
716-
font-size: 33px;
717-
margin-bottom: 10px;
660+
display: block;
661+
font-size: 24px;
662+
margin-bottom: 6px;
663+
}
664+
665+
.startpage_action_btn {
666+
border: 1px solid rgb(224, 230, 238);
667+
background: rgb(255, 255, 255);
668+
color: rgb(35, 47, 61);
669+
border-radius: 12px;
670+
cursor: pointer;
671+
transition: transform 0.18s ease, box-shadow 0.18s ease, background-color 0.18s ease, border-color 0.18s ease;
672+
}
673+
674+
.startpage_action_btn:hover {
675+
background: rgb(255, 255, 255);
676+
border-color: rgb(199, 212, 228);
677+
transform: translateY(-1px);
678+
}
679+
680+
.startpage_action_btn:active {
681+
background: rgb(247, 249, 252);
682+
border-color: rgb(183, 198, 214);
683+
transform: translateY(0);
718684
}
719685

720686
#container {
@@ -727,10 +693,28 @@ textarea.form-control:focus {
727693
border-radius: 8px;
728694
background-color: rgb(255, 255, 255);
729695
color: rgb(38, 107, 196);
730-
border: none;
696+
border: 1px solid rgb(205, 214, 224);
731697
box-shadow: 0 3px 1px -2px rgb(0 0 0 / 5%), 0 2px 2px 0 rgb(0 0 0 / 6%), 0 1px 5px 0 rgb(0 0 0 / 6%);
732698
font-size: 16px;
733699
vertical-align: top;
700+
cursor: pointer;
701+
transition: background-color 0.18s ease, color 0.18s ease, box-shadow 0.18s ease, transform 0.18s ease;
702+
}
703+
704+
.add_item_btn:hover {
705+
background-color: rgb(243, 247, 252);
706+
color: rgb(24, 84, 162);
707+
border-color: rgb(183, 196, 212);
708+
box-shadow: 0 8px 16px -12px rgb(0 0 0 / 28%), 0 4px 10px -8px rgb(0 0 0 / 18%);
709+
transform: translateY(-1px);
710+
}
711+
712+
.add_item_btn:active {
713+
background-color: rgb(235, 241, 248);
714+
color: rgb(18, 67, 132);
715+
border-color: rgb(167, 182, 199);
716+
box-shadow: 0 4px 8px -8px rgb(0 0 0 / 22%);
717+
transform: translateY(0);
734718
}
735719

736720
.primary_btn {
@@ -741,16 +725,24 @@ textarea.form-control:focus {
741725
padding: 8px 16px;
742726
font-size: 16px;
743727
cursor: pointer;
728+
box-shadow: 0 3px 8px -8px rgb(0 0 0 / 18%);
729+
transition: background-color 0.18s ease, color 0.18s ease, border-color 0.18s ease, box-shadow 0.18s ease, transform 0.18s ease;
744730
}
745731

746732
.primary_btn:hover {
747733
background-color: rgb(250, 253, 255);
748-
border-color: rgb(134, 166, 218)
734+
border-color: rgb(134, 166, 218);
735+
color: rgb(39, 109, 221);
736+
box-shadow: 0 8px 16px -12px rgb(0 0 0 / 28%), 0 4px 10px -8px rgb(0 0 0 / 18%);
737+
transform: translateY(-1px);
749738
}
750739

751740
.primary_btn:active {
752741
background-color: rgb(255, 255, 255);
753-
border-color: rgb(45, 83, 143)
742+
border-color: rgb(45, 83, 143);
743+
color: rgb(27, 92, 197);
744+
box-shadow: 0 4px 8px -8px rgb(0 0 0 / 22%);
745+
transform: translateY(0);
754746
}
755747

756748
.danger_btn {
@@ -760,16 +752,25 @@ textarea.form-control:focus {
760752
border-radius: 8px;
761753
padding: 8px 16px;
762754
font-size: 16px;
755+
cursor: pointer;
756+
box-shadow: 0 3px 8px -8px rgb(0 0 0 / 18%);
757+
transition: background-color 0.18s ease, color 0.18s ease, border-color 0.18s ease, box-shadow 0.18s ease, transform 0.18s ease;
763758
}
764759

765760
.danger_btn:hover {
766761
background-color: rgb(255, 250, 250);
767762
border-color: rgb(255, 134, 134);
763+
color: rgb(166, 29, 27);
764+
box-shadow: 0 8px 16px -12px rgb(0 0 0 / 28%), 0 4px 10px -8px rgb(0 0 0 / 18%);
765+
transform: translateY(-1px);
768766
}
769767

770768
.danger_btn:active {
771769
background-color: rgb(255, 255, 255);
772770
border-color: rgb(186, 35, 33);
771+
color: rgb(146, 24, 23);
772+
box-shadow: 0 4px 8px -8px rgb(0 0 0 / 22%);
773+
transform: translateY(0);
773774
}
774775

775776
.success_btn {
@@ -779,16 +780,25 @@ textarea.form-control:focus {
779780
border-radius: 8px;
780781
padding: 8px 16px;
781782
font-size: 16px;
783+
cursor: pointer;
784+
box-shadow: 0 3px 8px -8px rgb(0 0 0 / 18%);
785+
transition: background-color 0.18s ease, color 0.18s ease, border-color 0.18s ease, box-shadow 0.18s ease, transform 0.18s ease;
782786
}
783787

784788
.success_btn:hover {
785789
background-color: rgb(250, 253, 250);
786790
border-color: rgb(134, 218, 134);
791+
color: rgb(22, 112, 81);
792+
box-shadow: 0 8px 16px -12px rgb(0 0 0 / 28%), 0 4px 10px -8px rgb(0 0 0 / 18%);
793+
transform: translateY(-1px);
787794
}
788795

789796
.success_btn:active {
790797
background-color: rgb(255, 255, 255);
791798
border-color: rgb(26, 132, 95);
799+
color: rgb(19, 95, 69);
800+
box-shadow: 0 4px 8px -8px rgb(0 0 0 / 22%);
801+
transform: translateY(0);
792802
}
793803

794804
.warning_btn {

0 commit comments

Comments
 (0)