From 74b7032ffc46aa8897db25598615c2ec01a61ecf Mon Sep 17 00:00:00 2001
From: n-kawahito <n-kawahito@iij.ad.jp>
Date: Mon, 28 Sep 2026 17:06:13 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[FIX]=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/category_list.html    | 26 ++++++++++-----
 src/main/resources/templates/fixed_cost.html  | 32 ++++++++++++-------
 src/main/resources/templates/goal_create.html |  9 ++++--
 src/main/resources/templates/goal_record.html | 20 ++++++------
 4 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/templates/category_list.html b/src/main/resources/templates/category_list.html
index b67c0ee..c4184b6 100644
--- a/src/main/resources/templates/category_list.html
+++ b/src/main/resources/templates/category_list.html
@@ -9,13 +9,13 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body class="pb-5 pt-5">
+<body style="padding-top:80px; padding-bottom:80px;">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
 
 		<div>
-			<ul>
+			<ul class="list-unstyled p-0 m-0">
 				<li class="card shadow-sm mb-3" th:each="categoryForm : ${categoryFormList}">
 					<div class="card-body">
 						<div class="d-flex justify-content-between">
@@ -49,19 +49,29 @@
 
 						</div>
 
-						<hr>
-						<hr>
 					</div>
 				</li>
 			</ul>
 		</div>
+		
+		<div class="d-grid mt-4">
 
+			<form th:action="@{/category/create}" method="get">
 
+				<input type="hidden"
+			           name="today"
+					   id="today"
+			           th:value="${today}">
 
-		<form th:action="@{/category/create}" method="get">
-			<input type="hidden" name="today" id="today" th:value="${today}">
-			<button type="submit">新規登録</button>
-		</form>
+			    <button class="btn btn-success w-100" type="submit">
+					新規登録
+				</button>
+
+			</form>
+
+		</div>
+		
+	</div>
 
 		<div th:replace="~{footer :: footer}"></div>
 </body>
diff --git a/src/main/resources/templates/fixed_cost.html b/src/main/resources/templates/fixed_cost.html
index 8f7f9f1..9d34e26 100644
--- a/src/main/resources/templates/fixed_cost.html
+++ b/src/main/resources/templates/fixed_cost.html
@@ -10,7 +10,7 @@
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
-<body class="pb-5 pt-5">
+<body style="padding-top:80px; padding-bottom:80px;">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
@@ -19,7 +19,7 @@
 		<h2 class="page-title" th:text="${today}"></h2>
 
 		<div>
-			<ul>
+			<ul class="list-unstyled p-0 m-0">
 				<li th:each="fixedCostForm : ${fixedCostFormList}" class="card shadow-sm mb-3">
 
 					<div class="card-body">
@@ -52,21 +52,29 @@
 
 						</div>
 
-						<hr>
-						<hr>
 					</div>
 				</li>
+			</ul>
 		</div>
-		</ul>
+		<div class="d-grid mt-4">
+
+			<form th:action="@{/category/create}" method="get">
+
+				<input type="hidden"
+					   name="today"
+					   id="today"
+					   th:value="${today}">
+
+				<button class="btn btn-success w-100" type="submit">
+			    	新規登録
+				</button>
+
+			</form>
+
+		</div>
+		
 	</div>
 
-
-
-	<form th:action="@{/fixed-cost/create}" method="get">
-		<input type="hidden" name="today" id="today" th:value="${today}">
-		<button type="submit">新規登録</button>
-	</form>
-
 	<div th:replace="~{footer :: footer}"></div>
 </body>
 
diff --git a/src/main/resources/templates/goal_create.html b/src/main/resources/templates/goal_create.html
index 2057470..f0af281 100644
--- a/src/main/resources/templates/goal_create.html
+++ b/src/main/resources/templates/goal_create.html
@@ -51,9 +51,12 @@
 					<button type="submit" class="btn btn-sm btn-primary w-100">登録</button>
 
 				</form>
-
-				<div th:replace="~{footer :: footer}"></div>
-
+				
+			</div>
+		</div>
+	</div>
+	
+	<div th:replace="~{footer :: footer}"></div>
 
 </body>
 
diff --git a/src/main/resources/templates/goal_record.html b/src/main/resources/templates/goal_record.html
index e2b5900..c5a7e0b 100644
--- a/src/main/resources/templates/goal_record.html
+++ b/src/main/resources/templates/goal_record.html
@@ -8,7 +8,7 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body class="pb-5 pt-5">
+<body style="padding-top:80px; padding-bottom:80px;">
 
 	<div th:replace="~{header :: header}"></div>
 
@@ -74,16 +74,16 @@
 				</ul>
 
 			</div>
-			<div class="d-grid mt-4">
-				<form th:action="@{/goal}" method="get">
-
-					<button class="btn btn-success w-100" type="submit">
-						戻る
-					</button>
-
-				</form>
-			</div>
 		</div>
+		
+		<div class="d-grid mt-4">
+			<form th:action="@{/goal}" method="get">
+				<button class="btn btn-success w-100" type="submit">
+					戻る
+				</button>
+			</form>
+		</div>
+		
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>

From 4a9a1d08988602523744ff184e393caad1f70bd2 Mon Sep 17 00:00:00 2001
From: n-kawahito <n-kawahito@iij.ad.jp>
Date: Tue, 29 Sep 2026 11:13:13 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=E3=82=B3=E3=83=BC=E3=82=B9=E9=81=B8?=
 =?UTF-8?q?=E6=8A=9E=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=87=E3=82=B6=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/select_course.html     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index 635e154..3852e88 100644
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -5,6 +5,7 @@
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 	<title>コース選択</title>
 </head>
 
@@ -12,13 +13,16 @@
 	<div th:replace="~{header :: header}"></div>
 	<h1 class="page-title">コース選択</h1>
 
-	<th:block th:if="${mode == 'change'}">
-		<form th:action="@{/course/create}" method="get">
-			<button type="submit">新規登録</button>
-		</form>
-
-
-	</th:block>
+	<div class="d-grid mt-4">
+	    <th:block th:if="${mode == 'change'}">
+		    <form th:action="@{/course/create}" method="get">
+			    <button class="btn btn-success w-100" type="submit">
+					新規登録
+				</button>
+		    </form>
+	    </th:block>
+	</div>
+	
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
 		<button type="submit" class="btn btn-primary w-100">確定</button>
 

From 438ff59bc2f462ccdf14399d9620ce96bece2719 Mon Sep 17 00:00:00 2001
From: n-kawahito <n-kawahito@iij.ad.jp>
Date: Tue, 29 Sep 2026 11:32:22 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=E7=94=BB=E9=9D=A2=E3=83=87=E3=82=B6?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=AE=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/analysis.html        |  2 +-
 src/main/resources/templates/category_update.html |  2 +-
 src/main/resources/templates/goal_view.html       |  4 ++++
 src/main/resources/templates/profile_edit.html    | 14 +++++++-------
 src/main/resources/templates/select_course.html   |  4 ++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html
index c85e4e0..dd88457 100644
--- a/src/main/resources/templates/analysis.html
+++ b/src/main/resources/templates/analysis.html
@@ -35,7 +35,7 @@
 	<table class="table text-center">
         <thead>
 	        <tr>
-                <th scope="col">カテゴリ別</th>
+                <th scope="col"></th>
 			    <th scope="col">支出</th>
 			    <th scope="col">前月比</th>
 			</tr>
diff --git a/src/main/resources/templates/category_update.html b/src/main/resources/templates/category_update.html
index f69ad72..c140cbe 100644
--- a/src/main/resources/templates/category_update.html
+++ b/src/main/resources/templates/category_update.html
@@ -47,7 +47,7 @@
 					<input type="hidden" name="categoryId" th:value="${categoryId}">
 
 					<div class="d-grid">
-						<button type="submit" class="btn btn-primary">登録</button>
+						<button type="submit" class="btn btn-primary">更新</button>
 					</div>
 				</form>
 			</div>
diff --git a/src/main/resources/templates/goal_view.html b/src/main/resources/templates/goal_view.html
index 5249f82..45b6b63 100644
--- a/src/main/resources/templates/goal_view.html
+++ b/src/main/resources/templates/goal_view.html
@@ -189,6 +189,8 @@
 
 	</div>
 
+	<div class="d-grid gap-2 mt-4">
+		
 	<form th:action="@{/goal/create}" method="get">
 
 		<button type="submit" class="btn btn-success w-100">
@@ -204,6 +206,8 @@
 		</button>
 
 	</form>
+	
+	</div>
 
 	<div th:replace="~{footer :: footer}"></div>
 
diff --git a/src/main/resources/templates/profile_edit.html b/src/main/resources/templates/profile_edit.html
index c0598f7..3feec50 100644
--- a/src/main/resources/templates/profile_edit.html
+++ b/src/main/resources/templates/profile_edit.html
@@ -101,15 +101,15 @@
 								   max="10000000"
 		                           required>
 		                </div>
+						
+						<div class="d-grid">
+							<button type="submit"
+							        class="btn btn-primary">
+								編集
+							</button>
+						</div>
 
 		        	</div>
-					
-					<div class="d-grid">
-	                    <button type="submit"
-	                            class="btn btn-primary">
-	                        確定
-	                    </button>
-	                </div>
 				
 				</form>
 
diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index 3852e88..3482b90 100644
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -13,7 +13,7 @@
 	<div th:replace="~{header :: header}"></div>
 	<h1 class="page-title">コース選択</h1>
 
-	<div class="d-grid mt-4">
+	<div class="d-grid gap-2 mt-4">
 	    <th:block th:if="${mode == 'change'}">
 		    <form th:action="@{/course/create}" method="get">
 			    <button class="btn btn-success w-100" type="submit">
@@ -21,7 +21,6 @@
 				</button>
 		    </form>
 	    </th:block>
-	</div>
 	
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
 		<button type="submit" class="btn btn-primary w-100">確定</button>
@@ -57,6 +56,7 @@
 			</div>
 		</div>
 	</form>
+	</div>
 
 	<th:block th:if="${mode=='change'}">
 		<div th:replace="~{footer :: footer}"></div>