From fa540c046d126449f77e46edd379bbc84e02d05d Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 26 Jun 2021 00:00:54 +0800
Subject: ...

---
 FrontEnd/src/service-worker.tsx | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'FrontEnd/src/service-worker.tsx')

diff --git a/FrontEnd/src/service-worker.tsx b/FrontEnd/src/service-worker.tsx
index e40124fe..fb81650d 100644
--- a/FrontEnd/src/service-worker.tsx
+++ b/FrontEnd/src/service-worker.tsx
@@ -1,9 +1,10 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Button } from "react-bootstrap";
 
 import { pushAlert } from "./services/alert";
 
+import Button from "./views/common/button/Button";
+
 if (import.meta.env.PROD && "serviceWorker" in navigator) {
   let isThisTriggerUpgrade = false;
 
@@ -37,12 +38,10 @@ if (import.meta.env.PROD && "serviceWorker" in navigator) {
             <>
               {t("serviceWorker.externalActivatedPrompt")}
               <Button
-                variant="outline-success"
-                size="sm"
+                text="serviceWorker.reloadNow"
+                color="success"
                 onClick={upgradeReload}
-              >
-                {t("serviceWorker.reloadNow")}
-              </Button>
+              />
             </>
           );
         };
@@ -83,9 +82,11 @@ if (import.meta.env.PROD && "serviceWorker" in navigator) {
         return (
           <>
             {t("serviceWorker.upgradePrompt")}
-            <Button variant="outline-success" size="sm" onClick={upgrade}>
-              {t("serviceWorker.upgradeNow")}
-            </Button>
+            <Button
+              text="serviceWorker.upgradeNow"
+              color="success"
+              onClick={upgrade}
+            />
           </>
         );
       };
-- 
cgit v1.2.3


From 8037f4fd528a4e5d064de0d564543a3bf25db459 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 1 Jul 2021 20:31:24 +0800
Subject: ...

---
 FrontEnd/TODO.md                |  2 +-
 FrontEnd/src/index.css          | 29 +++++++++++++++++++++++++++++
 FrontEnd/src/service-worker.tsx |  6 +++---
 3 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'FrontEnd/src/service-worker.tsx')

diff --git a/FrontEnd/TODO.md b/FrontEnd/TODO.md
index 1bcd9b32..2a0728b2 100644
--- a/FrontEnd/TODO.md
+++ b/FrontEnd/TODO.md
@@ -2,7 +2,7 @@
 - [x] Implement popup menu.
 - [x] Implement loading and loading button.
 - [x] Implement tabs and tab page.
-- [ ] Improve forms.
+- [x] Improve forms.
 - [x] Improve buttons.
 - [x] Improve icon buttons.
 - [x] Login page.
diff --git a/FrontEnd/src/index.css b/FrontEnd/src/index.css
index 14f0bc43..22166a33 100644
--- a/FrontEnd/src/index.css
+++ b/FrontEnd/src/index.css
@@ -23,6 +23,35 @@ small {
 
 textarea {
   resize: none;
+  outline: none;
+  border-color: var(--cru-background-2-color);
+}
+
+textarea:hover {
+  border-color: var(--cru-primary-r2-color);
+}
+
+textarea:focus {
+  border-color: var(--cru-primary-color);
+}
+
+input,
+input[type="text"] {
+  resize: none;
+  outline: none;
+  border: 1px solid;
+  transition: all 0.5s;
+  border-color: var(--cru-background-2-color);
+}
+
+input:hover,
+input:hover[type="text"] {
+  border-color: var(--cru-primary-r2-color);
+}
+
+input:focus,
+input:focus[type="text"] {
+  border-color: var(--cru-primary-color);
 }
 
 .white-space-no-wrap {
diff --git a/FrontEnd/src/service-worker.tsx b/FrontEnd/src/service-worker.tsx
index fb81650d..e4af54e1 100644
--- a/FrontEnd/src/service-worker.tsx
+++ b/FrontEnd/src/service-worker.tsx
@@ -47,9 +47,9 @@ if (import.meta.env.PROD && "serviceWorker" in navigator) {
         };
 
         pushAlert({
-          message: Message,
+          customMessage: <Message />,
           dismissTime: "never",
-          type: "warning",
+          type: "primary",
         });
       }
     });
@@ -92,7 +92,7 @@ if (import.meta.env.PROD && "serviceWorker" in navigator) {
       };
 
       pushAlert({
-        message: UpgradeMessage,
+        customMessage: <UpgradeMessage />,
         dismissTime: "never",
         type: "success",
       });
-- 
cgit v1.2.3