From c76e73a3f01ce33f9b431c76d35078ed6895d3b4 Mon Sep 17 00:00:00 2001 From: t11003 Date: Wed, 18 Mar 2026 07:56:11 +0800 Subject: [PATCH 01/10] =?UTF-8?q?style:=20=E6=8C=89=E9=88=95=E6=94=B9?= =?UTF-8?q?=E7=82=BA=E6=B7=B1=E8=97=8D=E8=89=B2=20#1a73e8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- style.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/style.css b/style.css index e420ff3..60a5e59 100644 --- a/style.css +++ b/style.css @@ -87,10 +87,7 @@ header .subtitle { font-size: 13px; opacity: 0.85; margin-top: 4px; } } .input-area button { - /* 練習:把按鈕顏色改成你喜歡的顏色 - conflict-a 分支:改成 #4f8ef7(藍色) - conflict-b 分支:改成 #e84393(粉色) */ - background: #4f8ef7; + background: #1a73e8; /* conflict-a:深藍色 */ color: white; border: none; padding: 10px 20px; From 7fae6a3a97b78407289f5631fef847cd979b5344 Mon Sep 17 00:00:00 2001 From: t11003 Date: Wed, 18 Mar 2026 07:56:22 +0800 Subject: [PATCH 02/10] =?UTF-8?q?style:=20=E6=8C=89=E9=88=95=E6=94=B9?= =?UTF-8?q?=E7=82=BA=E7=B2=89=E8=89=B2=20#e84393?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- style.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/style.css b/style.css index e420ff3..01f3e64 100644 --- a/style.css +++ b/style.css @@ -87,10 +87,7 @@ header .subtitle { font-size: 13px; opacity: 0.85; margin-top: 4px; } } .input-area button { - /* 練習:把按鈕顏色改成你喜歡的顏色 - conflict-a 分支:改成 #4f8ef7(藍色) - conflict-b 分支:改成 #e84393(粉色) */ - background: #4f8ef7; + background: #e84393; /* conflict-b:粉色 */ color: white; border: none; padding: 10px 20px; From 1fc8eeb34f55be09498dcb20e722793a7e32f922 Mon Sep 17 00:00:00 2001 From: t11003 Date: Wed, 18 Mar 2026 08:41:27 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B7=B1?= =?UTF-8?q?=E8=89=B2=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8F=9B=E6=8C=89=E9=88=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 1 + style.css | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/index.html b/index.html index 756d0f2..dcda068 100644 --- a/index.html +++ b/index.html @@ -12,6 +12,7 @@

🤖 練習用 Chatbot

W4 Git Branch 練習

+
diff --git a/style.css b/style.css index e420ff3..b06e61c 100644 --- a/style.css +++ b/style.css @@ -102,3 +102,22 @@ header .subtitle { font-size: 13px; opacity: 0.85; margin-top: 4px; } .input-area button:hover { opacity: 0.85; } + +/* ===== feature/dark-mode 新增 ===== */ +.dark-toggle { + margin-top: 8px; + background: rgba(255,255,255,0.2); + border: none; + color: white; + padding: 4px 12px; + border-radius: 6px; + cursor: pointer; + font-size: 12px; +} + +body.dark { background-color: #1e1e2e; } +body.dark .container { background: #313244; color: #cdd6f4; } +body.dark header { background: #1e1e2e; } +body.dark .message.bot { background: #45475a; color: #cdd6f4; } +body.dark .input-area { border-top-color: #45475a; } +body.dark .input-area input { background: #45475a; color: #cdd6f4; border-color: #585b70; } From 0ef4d923a53a7231e42b892a83d7355c4fb0ad7e Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 18 Mar 2026 09:54:43 +0800 Subject: [PATCH 04/10] =?UTF-8?q?style:=20=E6=9B=B4=E6=8F=9B=E6=97=A5?= =?UTF-8?q?=E7=B3=BB=E9=85=8D=E8=89=B2=E9=A2=A8=E6=A0=BC=20=F0=9F=8C=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- style.css | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/style.css b/style.css index e420ff3..1dcec19 100644 --- a/style.css +++ b/style.css @@ -1,14 +1,14 @@ /* ============================ W4 練習 Chatbot 樣式 - 學生練習:修改顏色、字體大小等 + 日系配色 🌸 ============================ */ * { box-sizing: border-box; margin: 0; padding: 0; } body { font-family: 'Noto Sans TC', sans-serif; - /* 練習:把背景色改成你喜歡的顏色 */ - background-color: #f0f4f8; + /* 日系淡米色背景 */ + background-color: #faf6f0; display: flex; justify-content: center; align-items: center; @@ -16,18 +16,18 @@ body { } .container { - background: white; + background: #fffbf5; border-radius: 16px; - box-shadow: 0 4px 20px rgba(0,0,0,0.1); + box-shadow: 0 4px 20px rgba(139, 109, 82, 0.12); width: 480px; max-width: 95vw; overflow: hidden; } header { - /* 練習:把標題列顏色從藍色改成其他顏色 */ - background: #4f8ef7; - color: white; + /* 日系櫻花粉 */ + background: #d4a0a7; + color: #fffbf5; padding: 20px 24px; } @@ -52,16 +52,17 @@ header .subtitle { font-size: 13px; opacity: 0.85; margin-top: 4px; } } .message.bot { - background: #f0f4f8; - color: #333; + /* 日系淡抹茶色 */ + background: #e8ede4; + color: #4a4a4a; align-self: flex-start; border-bottom-left-radius: 4px; } .message.user { - /* 練習:把使用者訊息顏色從綠色改成你喜歡的顏色 */ - background: #4caf87; - color: white; + /* 日系藤紫色 */ + background: #8b7bb5; + color: #fffbf5; align-self: flex-end; border-bottom-right-radius: 4px; } @@ -70,28 +71,27 @@ header .subtitle { font-size: 13px; opacity: 0.85; margin-top: 4px; } display: flex; padding: 16px; gap: 10px; - border-top: 1px solid #eee; + border-top: 1px solid #e8ddd0; } .input-area input { flex: 1; padding: 10px 14px; - border: 1px solid #ddd; + border: 1px solid #ddd3c7; border-radius: 8px; font-size: 14px; outline: none; + background: #fffbf5; } .input-area input:focus { - border-color: #4f8ef7; + border-color: #d4a0a7; } .input-area button { - /* 練習:把按鈕顏色改成你喜歡的顏色 - conflict-a 分支:改成 #4f8ef7(藍色) - conflict-b 分支:改成 #e84393(粉色) */ - background: #4f8ef7; - color: white; + /* 日系櫻花粉按鈕 */ + background: #d4a0a7; + color: #fffbf5; border: none; padding: 10px 20px; border-radius: 8px; @@ -100,5 +100,5 @@ header .subtitle { font-size: 13px; opacity: 0.85; margin-top: 4px; } } .input-area button:hover { - opacity: 0.85; + background: #c48e96; } From 9d0cfdd70c9c8338c8df294f1927ee5f25612676 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 18 Mar 2026 10:43:20 +0800 Subject: [PATCH 05/10] feat: Apply a Japanese-style color palette to the chatbot UI elements. --- index.html | 88 ++++++++++---- style.css | 328 +++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 333 insertions(+), 83 deletions(-) diff --git a/index.html b/index.html index dcda068..5bd6ac1 100644 --- a/index.html +++ b/index.html @@ -2,33 +2,55 @@ + W4 練習 Chatbot + +
-

🤖 練習用 Chatbot

- -

W4 Git Branch 練習

- +
+
🤖
+
+

練習用 Chatbot

+

W4 Git Branch 練習

+
+
+
-
- 嗨!我是練習用的 Chatbot,今天我們要學 Git Branch 🌿 +
+
🤖
+
+ 嗨!我是練習用的 Chatbot,今天我們要學 Git Branch 🌿 + 剛才 +
- - - + +
- + + \ No newline at end of file From 66490193c453353b1e42bad62eadc914620d2f96 Mon Sep 17 00:00:00 2001 From: Eason92k <148435996+Eason92k@users.noreply.github.com> Date: Wed, 18 Mar 2026 11:13:38 +0800 Subject: [PATCH 07/10] Update README.md --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ac5a71..4be14d5 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,14 @@ git checkout main ``` **思考:dark-mode 分支修改了哪些檔案的哪些地方?** - +1.index.html: + 在 header 區塊中新增了一個按鈕,點擊時會觸發 body 的 dark class 切換 +2.style.css: + 按鈕樣式 (.dark-toggle):設定了切換按鈕的外觀(透明背景、白色文字、圓角等)。 + 深色色彩定義 (body.dark): + 將背景改為深灰色 (#1e1e2e)。 + 調整對話框容器 (.container) 和標題列 (header) 的底色。 + 修改 Bot 訊息與輸入框的顏色,使其在深色背景下易於閱讀。 --- ## 練習二:Merge feature 分支 From abe8ea431d42b0bcd97ed559e95b021f27b4a811 Mon Sep 17 00:00:00 2001 From: cupid00772 Date: Wed, 18 Mar 2026 11:13:46 +0800 Subject: [PATCH 08/10] Update style.css --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index 44705da..8e9e542 100644 --- a/style.css +++ b/style.css @@ -16,7 +16,7 @@ body { } .container { - background: #fffbf5; + background: #58f8eb; /* 解決衝突:採用藍綠色 */ border-radius: 16px; box-shadow: 0 4px 20px rgba(139, 109, 82, 0.12); width: 480px; From 96f7fd1389b428a474c1b640367918b4f6f1e4de Mon Sep 17 00:00:00 2001 From: Eason92k <148435996+Eason92k@users.noreply.github.com> Date: Wed, 18 Mar 2026 11:14:18 +0800 Subject: [PATCH 09/10] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4be14d5..e05480d 100644 --- a/README.md +++ b/README.md @@ -37,14 +37,14 @@ git checkout main ``` **思考:dark-mode 分支修改了哪些檔案的哪些地方?** -1.index.html: - 在 header 區塊中新增了一個按鈕,點擊時會觸發 body 的 dark class 切換 -2.style.css: +**1.index.html: + 在 header 區塊中新增了一個按鈕,點擊時會觸發 body 的 dark class 切換** +**2.style.css: 按鈕樣式 (.dark-toggle):設定了切換按鈕的外觀(透明背景、白色文字、圓角等)。 深色色彩定義 (body.dark): 將背景改為深灰色 (#1e1e2e)。 調整對話框容器 (.container) 和標題列 (header) 的底色。 - 修改 Bot 訊息與輸入框的顏色,使其在深色背景下易於閱讀。 + 修改 Bot 訊息與輸入框的顏色,使其在深色背景下易於閱讀。** --- ## 練習二:Merge feature 分支 From f73917c1e817f6c86704d83fc04015c3f74701ec Mon Sep 17 00:00:00 2001 From: cupid00772 Date: Wed, 25 Mar 2026 11:15:03 +0800 Subject: [PATCH 10/10] feat: implement quick replies and clear chat --- index.html | 24 ++++++++++++++++++++++++ style.css | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/index.html b/index.html index 230d791..fb18f0c 100644 --- a/index.html +++ b/index.html @@ -36,6 +36,12 @@

練習用 Chatbot

+
+ + + +
+