Skip to content

update: Bootstrap の削除、Tailwind CSS の導入 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 9, 2025
+10 −13
Merged

update: Bootstrap の削除、Tailwind CSS の導入 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2989d12
update: BootStrap の削除、tailwind の導入
mucho613 Aug 6, 2025
8967e96
remove jQuery
mucho613 Aug 6, 2025
eeb773b
Merge remote-tracking branch 'origin/main' into install-tailwind-css
mucho613 Aug 6, 2025
c90f765
fix layout
mucho613 Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions _includes/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@
<!-- CSS Framework -------------------------- -->
<!-- Font Awasome https://fontawesome.com/ -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<!-- Bootstrap https://getbootstrap.jp/ -->
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM" crossorigin="anonymous">

<!-- Tailwind CSS -->
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>

<!-- CSS -------------------------- -->
<!-- DojoCon CSS -->
Expand Down
2 changes: 1 addition & 1 deletion _includes/top/sections/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<section id="contact">
<div class="d-flex flex-column align-items-center text-center">
<div class="flex flex-col items-center text-center">
<h2 class="title">お問い合わせ</h2>
<p class="subtitle">CONTACT</p>
<p class="text">DojoCon Japan {{ site.year }}についてのお問い合わせは<br>以下のリンク先（Googleフォーム）よりお願いいたします。</p>
Expand Down
9 changes: 4 additions & 5 deletions _layouts/condition.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
---
layout: default
---
<div class="container" style="margin-top: 140px; margin-bottom: 140px">
<div class="text-center">
<h1>{{ page.title }}</h1>
<p>{{ page.subtitle }}</p>
<div style="margin-top: 140px; margin-bottom: 140px">
<div class="text-center mb-8">
<h1 class="text-4xl">{{ page.title }}</h1>
<p>{{ page.subtitle }}</p>
</div>
<div class="air"></div>
<div id='condition'>
<div class="post">
<div class='post-content'>
Expand Down
7 changes: 3 additions & 4 deletions _layouts/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
---
layout: default
---
<div class="container" style="margin-top: 140px; margin-bottom: 140px">
<div class="text-center mb-4">
<div style="margin-top: 140px; margin-bottom: 140px">
<div class="text-center mb-8">
<p class="my-0"><strong>{{ page.subtitle }}</strong></p>
<h2 class="my-1">{{ page.title }}</h2>
<h2 class="text-4xl my-1">{{ page.title }}</h2>
</div>
<div class="air"></div>
<div id=''>
<div class="post">
<div class='post-content'>
Expand Down