omu-aikido · HALQME · Apr 9, 2026 · Apr 7, 2026 · Apr 7, 2026 · Apr 8, 2026
diff --git a/client/public/_headers b/client/public/_headers
@@ -1,2 +1,2 @@
 /*
-  Content-Security-Policy: script-src 'self' 'unsafe-eval' 'unsafe-inline' https://challenges.cloudflare.com https://*.cloudflare.com https://static.cloudflareinsights.com; connect-src https://omu-aikido.com https://challenges.cloudflare.com https://*.cloudflare.com https://static.cloudflareinsights.com; frame-src https://challenges.cloudflare.com https://*.cloudflare.com; worker-src https://static.cloudflareinsights.com;
+  Content-Security-Policy: script-src 'self' 'unsafe-eval' 'unsafe-inline' https://challenges.cloudflare.com https://*.cloudflare.com https://static.cloudflareinsights.com; connect-src https://omu-aikido.com https://challenges.cloudflare.com https://*.cloudflare.com https://static.cloudflareinsights.com; frame-src https://challenges.cloudflare.com https://*.cloudflare.com https://www.google.com; worker-src https://static.cloudflareinsights.com;
diff --git a/client/src/components/Footer.astro b/client/src/components/Footer.astro
@@ -2,7 +2,7 @@
 
 ---
 
-<footer class="container-page pt-2 text-center text-sm text-body">
+<footer class="container-page mt-4 text-center text-sm text-body">
   <p class="leading-relaxed">
     <span>&COPY; OMU Aikido Club All Rights Reserved.</span>
     <br />
@@ -15,11 +15,13 @@
     <a href="/terms-of-service" un-link> 利用規約 </a>
   </p>
 
-  <div class="mx-auto mt-4 flex max-w-60 items-center justify-between text-2xl">
+  <div class="mx-auto mt-8 flex max-w-60 items-center justify-between text-2xl">
     <a
       href="https://twitter.com/fudaiaiki"
       aria-label="旧府大合氣道部 Twitter"
       class="transition hover:text-brand-600"
+      target="_blank"
+      rel="noopener noreferrer"
       un-i-ri:twitter-fill
     >
       旧府大Twitter
@@ -28,6 +30,8 @@
       href="https://instagram.com/hamudaiaikidoubu"
       aria-label="Instagram"
       class="transition hover:text-brand-600"
+      target="_blank"
+      rel="noopener noreferrer"
       un-i-ri:instagram-fill
     >
       Instagram
@@ -36,6 +40,8 @@
       href="https://github.com/omu-aikido"
       aria-label="GitHub"
       class="transition hover:text-brand-600"
+      target="_blank"
+      rel="noopener noreferrer"
       un-i-ri:github-fill
     >
       GitHub

diff --git a/client/src/components/Head.astro b/client/src/components/Head.astro
@@ -7,23 +7,16 @@ interface Props {
 }
 
 const isDev = import.meta.env.DEV;
+const path = Astro.url.pathname;
 ---
 
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width" />
   <meta name="generator" content={Astro.generator} />
   <meta name="description" content={Astro.props.description} />
-  {
-    isDev && (
-      <meta
-        http-equiv="Content-Security-Policy"
-        content="script-src 'self' 'unsafe-eval' 'unsafe-inline' https://challenges.cloudflare.com https://*.cloudflare.com https://static.cloudflareinsights.com; connect-src 'self' http://localhost:* https://localhost:* https://challenges.cloudflare.com https://*.cloudflare.com https://static.cloudflareinsights.com; frame-src https://challenges.cloudflare.com https://*.cloudflare.com; worker-src https://static.cloudflareinsights.com;"
-      />
-    )
-  }
   <link rel="sitemap" href="/sitemap-index.xml" />
-  <link rel="canonical" href="https://omu-aikido.com" />
+  <link rel="canonical" href={`https://omu-aikido.com${path}`} />
   <link rel="icon" type="image/svg" href="/favicon.svg" />
   <link
     rel="apple-touch-icon"
@@ -36,10 +29,6 @@ const isDev = import.meta.env.DEV;
   <!-- Fonts -->
   <link rel="preconnect" href="https://fonts.googleapis.com" />
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-  <link
-    href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;500;600;700&family=Noto+Sans+JP:wght@400;500;600;700&display=swap"
-    rel="stylesheet"
-  />
 
   <title>
     {Astro.props.title} | 大阪公立大学合氣道部

diff --git a/client/src/components/Sidebar.astro b/client/src/components/Sidebar.astro
@@ -7,6 +7,7 @@ const currentPath = Astro.url.pathname;
 <button
   id="open-sidebar"
   class="i-ri:menu-line text-2xl transition hover:(cursor-pointer i-ri:menu-unfold-4-line text-brand-600)"
+  aria-label="Open Sidebar"
 >
 </button>
 
@@ -17,8 +18,10 @@ const currentPath = Astro.url.pathname;
   <div class="min-h-100dvh m-4 flex flex-col">
     <button
       id="close-sidebar"
-      class="i-ri:close-line mb-2 text-3xl transition hover:(i-ri:close-circle-line text-brand-600 cursor-pointer)"
-      ml-auto></button>
+      class="i-ri:close-line mb-2 ml-auto text-3xl transition hover:(i-ri:close-circle-line text-brand-600 cursor-pointer)"
+      aria-label="Close Sidebar"
+    >
+    </button>
 
     <nav class="mx-2 flex-1 space-y-1">
       {

diff --git a/client/src/components/SiteGuideBento.astro b/client/src/components/SiteGuideBento.astro
@@ -4,21 +4,27 @@ import { navlinks } from "@/lib/navigation";
 const mainNav = navlinks[0]?.children || [];
 ---
 
-<nav class="site-guide">
+<nav class="grid gap-8 p-0 grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
   {
     mainNav.map((parent) => (
-      <div>
-        <a href={parent.path} class="guide-card-header guide-card-link">
-          <span class="guide-card-title">{parent.title}</span>
-          <span class="guide-card-arrow" aria-hidden="true">
+      <div class="flex flex-col gap-3">
+        <a href={parent.path} class="flex-inline items-center gap-2">
+          <span class="text-lg font-bol guide-card-link">{parent.title}</span>
+          <span
+            class="text-xl text-blue-600 opacity-50 transition-opacity duration-150"
+            aria-hidden="true"
+          >
             →
           </span>
         </a>
-        {parent.children && parent.children.length > 0 && (
-          <ul class="guide-card-links">
+        {parent.children?.length && (
+          <ul class="flex flex-col gap-1 list-none p-0 ml-1em">
             {parent.children.map((child) => (
-              <li class="pl-4">
-                <a href={child.path} class="guide-card-link">
+              <li>
+                <a
+                  href={child.path}
+                  class="inline-flex items-center gap-1 text-base font-medium guide-card-link"
+                >
                   {child.title}
                 </a>
               </li>
@@ -31,81 +37,13 @@ const mainNav = navlinks[0]?.children || [];
 </nav>
 
 <style>
-  .site-guide {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
-    gap: 2rem;
-    padding: 0;
-  }
-
-  .guide-card {
-    display: flex;
-    flex-direction: column;
-    gap: 0.75rem;
-    padding: 0;
-    border: none;
-    background: transparent;
-  }
-
-  .guide-card-header {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    gap: 0.5rem;
-    text-decoration: none;
-    padding: 0;
-  }
-
-  .guide-card-title {
-    font-size: 1.125rem;
-    font-weight: 700;
-    color: rgb(24, 24, 27);
-    transition: color 0.15s ease;
-  }
-
-  .guide-card:hover .guide-card-title {
-    color: rgb(37, 99, 235);
-  }
-
-  .guide-card-arrow {
-    font-size: 1.25rem;
-    color: rgb(37, 99, 235);
-    opacity: 0.5;
-    transition:
-      opacity 0.15s ease,
-      transform 0.15s ease;
-  }
-
-  .guide-card:hover .guide-card-arrow {
-    opacity: 1;
-  }
-
-  .guide-card-links {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-    display: flex;
-    flex-direction: column;
-    gap: 0.4rem;
-  }
-
   .guide-card-link {
-    display: inline-flex;
-    align-items: center;
-    gap: 0.4rem;
-    font-size: 1rem;
-    font-weight: 500;
-    color: rgb(63, 63, 70);
     text-decoration: none;
     padding: 0.25rem 0;
     transition: color 0.15s ease;
     position: relative;
   }
 
-  .guide-card-link:hover {
-    color: rgb(37, 99, 235);
-  }
-
   .guide-card-link::after {
     content: "";
     position: absolute;
@@ -120,43 +58,4 @@ const mainNav = navlinks[0]?.children || [];
   .guide-card-link:hover::after {
     width: 100%;
   }
-
-  @media (prefers-color-scheme: dark) {
-    .guide-card-title {
-      color: rgb(244, 244, 245);
-    }
-
-    .guide-card:hover .guide-card-title {
-      color: rgb(147, 197, 253);
-    }
-
-    .guide-card-link {
-      color: rgb(212, 212, 216);
-    }
-
-    .guide-card-link:hover {
-      color: rgb(147, 197, 253);
-    }
-
-    .guide-card-link::after {
-      background: rgb(147, 197, 253);
-    }
-  }
-
-  @media (prefers-reduced-motion: reduce) {
-    .guide-card-arrow,
-    .guide-card-link {
-      transition: none;
-    }
-
-    .guide-card-link::after {
-      transition: none;
-    }
-  }
-
-  @media (max-width: 640px) {
-    .site-guide {
-      grid-template-columns: 1fr;
-    }
-  }
 </style>
diff --git a/client/src/pages/about/index.mdx b/client/src/pages/about/index.mdx
@@ -39,7 +39,7 @@ import InfoList from "../../components/InfoList.astro";
 
 ### 年間行事予定
 
-<section class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
+<section class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3 my-2">
   <article class="rounded-md border border-zinc-200/70 bg-zinc-50 p-4 dark:(border-zinc-700/70 bg-zinc-800/40)">
     <p class="text-sm font-semibold text-muted">４月</p>
     <p class="text-body mt-2">ふたば祭教室企画出店</p>
@@ -101,10 +101,11 @@ import InfoList from "../../components/InfoList.astro";
     { label: "団体種別", value: "公認団体" },
     { label: "活動分類", value: "武道／スポーツ" },
     {
-      label: "構成員数",
+      label: "活動場所",
       value: [
-        "31名（１年生：12名、２年生：9名、３年生：5名、４年生：0名、大学院生：5名）",
-        "※2025年6月現在",
+        "中百舌鳥キャンパス 武道場",
+        "杉本キャンパス 新武道場",
+        "森之宮キャンパス マルチユースルーム",
       ],
     },
     {
@@ -120,8 +121,10 @@ import InfoList from "../../components/InfoList.astro";
     { label: "２年生以上の受入", value: "歓迎" },
     {
       label: "兼部・兼サー",
-      value:
-        "可能です。白鷺祭実行委員会、中百舌鳥新歓実行委員会などに参加している部員もいます。兼部・兼サーをして、予定が合わない場合は無理に合氣道の稽古に参加しなくても構いません。",
+      value: [
+        "可能です。白鷺祭実行委員会、中百舌鳥新歓実行委員会などに参加している部員もいます。",
+        "ただし、昇級・昇段には一定以上の稽古の参加、道場のイベントへの参加を求めます。",
+      ],
     },
     { label: "バイトとの両立", value: "可能" },
     { label: "入部可能時期", value: "通年可能" },

diff --git a/client/src/pages/about/links.mdx b/client/src/pages/about/links.mdx
@@ -1,10 +1,10 @@
 ---
 layout: ../../layouts/Markdown.astro
-title: リンク集
+title: 関係団体など
 description: 大阪公立大学合氣道部がお世話になっている方々の紹介ページ
 ---
 
-## リンク集
+## 関係団体など
 
 [**天之武産合氣塾道場**](https://amenotakemusu.jimdofree.com)
 

diff --git a/client/src/pages/calendar/index.astro b/client/src/pages/calendar/index.astro
@@ -19,18 +19,18 @@ import Layout from "@/layouts/Layout.astro";
       id="google-calendar-navigation"
       class="card-base mt-4 flex items-start gap-3"
     >
-      <div class="text-body flex-inline items-center gap-2">
-        <div class="i-ri:information-2-line mt-0.5 h-10 w-10s text-brand-600">
-        </div>
-        <a
-          href="https://calendar.google.com/calendar/embed?src=aikido.omu%40gmail.com"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="link"
-        >
-          Googleカレンダー
-        </a>
-        では過去の稽古や1ヶ月以上先の稽古予定も確認できます。
+      <div class="text-body inline-flex items-center gap-2">
+        <span>
+          <a
+            href="https://calendar.google.com/calendar/embed?src=aikido.omu%40gmail.com"
+            target="_blank"
+            rel="noopener noreferrer"
+            un-link
+          >
+            Googleカレンダー
+          </a>
+          では過去の稽古や1ヶ月以上先の稽古予定も確認できます。
+        </span>
       </div>
     </div>
   </section>