Skip to content

Commit a6037a4

Browse files
flour621flour621
committed
fix コンテナ幅・文字色を調整
1 parent 78c7ec0 commit a6037a4

File tree

17 files changed

+57
-212
lines changed

17 files changed

+57
-212
lines changed

‎src/develop/_entry.html‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,3 @@
1111
</section>
1212
</article>
1313
@endsection
14-
15-
@section("aside")
16-
<section class="has-[div:empty]:hidden mb-12">
17-
<div x-data="{ showAccordion: false }" class="relative w-full mx-auto overflow-hidden font-normal bg-white border border-gray-200 divide-y divide-gray-200 rounded-md">
18-
<div x-data="{ id: $id('accordion') }" class="cursor-pointer group">
19-
<button @click="showAccordion = !showAccordion" class="flex items-center justify-between w-full p-4 text-left select-none group-hover:underline">
20-
<h2 class="text-gray-800 font-bold">目次</h2>
21-
<svg class="w-4 h-4 duration-200 ease-out" :class="{ 'rotate-180': showAccordion }" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"></polyline></svg>
22-
</button>
23-
<div
24-
x-show="showAccordion"
25-
x-collapse
26-
x-cloak
27-
@click="handleSmoothScroll($event)"
28-
>
29-
<div class="p-4 pt-0 opacity-70">
30-
<!-- 参照元：Entry_Body -->
31-
<!-- GET_Rendered id="entry-outline" -->
32-
</div>
33-
</div>
34-
</div>
35-
</div>
36-
</section>
37-
38-
@parent
39-
@endsection

‎src/develop/_layouts/base.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,13 @@
2525
@include("/include/header.html")
2626
@endsection
2727

28-
<!-- ページタイトル -->
29-
@section("page-title")
30-
@include("/include/parts/page-title.html")
31-
@endsection
32-
3328
<!-- ※管理用パーツ -->
3429
@section("admin-part")
3530
@include("/admin/action.html")
3631
@include("/admin/switch-user.html")
3732
@endsection
3833

39-
<main class="container mx-auto px-4 py-20">
34+
<main class="container py-20">
4035
@section("topicpath")
4136
<!-- BEGIN_MODULE Touch_NotTop -->
4237
<div class="mb-10">
@@ -53,11 +48,6 @@
5348
@endsection
5449
</main>
5550

56-
<!-- CTAセクション -->
57-
@section("cta")
58-
@include("/include/parts/cta.html")
59-
@endsection
60-
6151
<!-- フッター -->
6252
@section("footer")
6353
@include("/include/footer.html")

‎src/develop/_layouts/two-column.html‎

Lines changed: 24 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@include("/include/head/js.html")
1616
@endsection
1717
</head>
18-
<body>
18+
<body class="text-gray-700">
1919
@section("body-start")
2020
@include("/include/body-start.html")
2121
@endsection
@@ -25,18 +25,13 @@
2525
@include("/include/header.html")
2626
@endsection
2727

28-
<!-- ページタイトル -->
29-
@section("page-title")
30-
@include("/include/parts/page-title.html")
31-
@endsection
32-
3328
<!-- ※管理用パーツ -->
3429
@section("admin-part")
3530
@include("/admin/action.html")
3631
@include("/admin/switch-user.html")
3732
@endsection
3833

39-
<div class="container mx-auto px-4 py-20">
34+
<div class="container py-20">
4035
@section("topicpath")
4136
<!-- BEGIN_MODULE Touch_NotTop -->
4237
<div class="mb-10">
@@ -59,65 +54,32 @@
5954
</main>
6055

6156
<aside class="lg:block z-20">
62-
<div class="fixed inset-0 bg-black bg-opacity-30"
63-
x-show="isShowSideMenu"
64-
x-transition
65-
@click="toggleSideMenu()"
66-
></div>
67-
<div class="max-lg:fixed top-0 right-0 bottom-0 box-border max-lg:w-72 max-lg:px-4 max-lg:py-6 bg-white transition-transform"
68-
:class="{'max-lg:translate-x-0': isShowSideMenu, 'max-lg:translate-x-full': !isShowSideMenu }"
69-
>
70-
<div class="max-lg:max-h-full max-lg:overflow-auto">
71-
@section("aside")
72-
<section>
73-
<h2 class="mb-4 text-gray-800 font-bold">カテゴリー</h2>
74-
@include("/include/category/list-side.html",)
75-
</section>
76-
77-
<section class="mt-8">
78-
<h2 class="mb-4 text-gray-800 font-bold">アーカイブ</h2>
79-
@include("/include/entry/archive-list-side.html")
80-
</section>
81-
82-
<section class="mt-8">
83-
<h2 class="mb-5 text-gray-800 font-bold">ハッシュタグ</h2>
84-
@include("/include/tag/cloud-side.html")
85-
</section>
86-
87-
<section class="mt-8">
88-
<h2 class="sr-only">キーワード検索</h2>
89-
@include("/include/parts/search-keyword.html")
90-
</section>
91-
92-
<section class="mt-8">
93-
<h2 class="mb-5 text-gray-800 font-bold">プロフィール</h2>
94-
@include("/include/user-profile/profile-card.html")
95-
</section>
96-
@endsection
97-
</div>
57+
<div class="max-lg:max-h-full max-lg:overflow-auto">
58+
@section("aside")
59+
<section>
60+
<h2 class="mb-4 text-gray-900 font-bold">カテゴリー</h2>
61+
@include("/include/category/list-side.html",)
62+
</section>
63+
64+
<section class="mt-8">
65+
<h2 class="mb-4 text-gray-900 font-bold">アーカイブ</h2>
66+
@include("/include/entry/archive-list-side.html")
67+
</section>
68+
69+
<section class="mt-8">
70+
<h2 class="mb-5 text-gray-900 font-bold">ハッシュタグ</h2>
71+
@include("/include/tag/cloud-side.html")
72+
</section>
73+
74+
<section class="mt-8">
75+
<h2 class="sr-only">キーワード検索</h2>
76+
@include("/include/parts/search-keyword.html")
77+
</section>
78+
@endsection
9879
</div>
9980
</aside>
100-
101-
<button aria-label="サイドメニュー表示切替" class="fixed bottom-6 z-20 inline-flex items-center justify-center lg:hidden px-2 py-2 text-sm font-medium tracking-wide transition-colors duration-200 bg-white border border-r- rounded-full text-gray-800 hover:text-neutral-700 border-neutral-200/70 hover:bg-neutral-100 active:bg-white focus:bg-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-200/60 focus:shadow-outline"
102-
:class="{'right-80': isShowSideMenu, 'right-0 rounded-r-none': !isShowSideMenu }"
103-
@click="toggleSideMenu()">
104-
<template x-if="!isShowSideMenu">
105-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5">
106-
<path fill-rule="evenodd" d="M7.72 12.53a.75.75 0 0 1 0-1.06l7.5-7.5a.75.75 0 1 1 1.06 1.06L9.31 12l6.97 6.97a.75.75 0 1 1-1.06 1.06l-7.5-7.5Z" clip-rule="evenodd" />
107-
</svg>
108-
</template>
109-
<template x-if="isShowSideMenu">
110-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5">
111-
<path fill-rule="evenodd" d="M16.28 11.47a.75.75 0 0 1 0 1.06l-7.5 7.5a.75.75 0 0 1-1.06-1.06L14.69 12 7.72 5.03a.75.75 0 0 1 1.06-1.06l7.5 7.5Z" clip-rule="evenodd" />
112-
</svg>
113-
</template>
114-
</button>
11581
</div>
11682
</div>
117-
<!-- CTAセクション -->
118-
@section("cta")
119-
@include("/include/parts/cta.html")
120-
@endsection
12183

12284
<!-- フッター -->
12385
@section("footer")

‎src/develop/include/category/list-side.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<a href="{url}" class="flex items-center hover:opacity-70">
99
<span class="flex-1 block py-2 text-gray-900">{name}</span>
1010
<!-- BEGIN amount:veil -->
11-
<span class="block min-w-10 py-1 rounded-full text-sm text-center text-gray-700 font-medium bg-slate-100">{amount}</span>
11+
<span class="block min-w-10 py-1 rounded-full text-sm text-center font-medium bg-slate-100">{amount}</span>
1212
<!-- END amount:veil -->
1313
</a><!-- END category:veil --><!-- BEGIN li#rear -->
1414
</li><!-- END li#rear --><!-- BEGIN ul#rear -->

‎src/develop/include/entry/archive-list-side.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<!-- BEGIN archive:loop -->
66
<li>
77
<a href="{url}" class="flex items-center hover:opacity-70">
8-
<span class="flex-1 block py-2 text-gray-900">{date#Y}年 {date#n}月</span>
8+
<span class="flex-1 block py-2">{date#Y}年 {date#n}月</span>
99
<!-- BEGIN amount:veil -->
10-
<span class="block min-w-10 py-1 rounded-full text-sm text-center text-gray-700 font-medium bg-slate-100">{amount}</span>
10+
<span class="block min-w-10 py-1 rounded-full text-sm text-center font-medium bg-slate-100">{amount}</span>
1111
<!-- END amount:veil -->
1212
</a>
1313
</li>

‎src/develop/include/entry/body.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h1 class="font-bold text-3xl sm:text-4xl lg:text-5xl entry-title"><a href="{tit
1717
<p><time datetime="{date#Y}-{date#m}-{date#d}">{date#Y}年 {date#n}月 {date#j}日</time></p>
1818
<!-- END date:veil -->
1919
<!-- BEGIN category:loop -->
20-
<p><a href="{url}" class="inline-block px-3 py-2 leading-none rounded-full bg-slate-100 text-gray-700 font-medium uppercase">{name}</a></p>
20+
<p><a href="{url}" class="inline-block px-3 py-2 leading-none rounded-full bg-slate-100 font-medium uppercase">{name}</a></p>
2121
<!-- END category:loop -->
2222
</div>
2323
<!-- BEGIN tag:veil -->
@@ -68,7 +68,7 @@ <h4 class="mb-1 font-medium leading-none tracking-tight">この記事は公開
6868
@include("/admin/entry/action.html")
6969

7070
<!-- BEGIN udate:veil -->
71-
<p class="mt-8 text-gray-700"><time datetime="{udate#Y}-{udate#m}-{udate#d}">{udate#Y}年 {udate#n}月 {udate#j}日</time> 更新</p>
71+
<p class="mt-8"><time datetime="{udate#Y}-{udate#m}-{udate#d}">{udate#Y}年 {udate#n}月 {udate#j}日</time> 更新</p>
7272
<!-- END udate:veil -->
7373

7474
<!-- BEGIN_IF [{{sns_share}}/eq/true] -->

‎src/develop/include/entry/summary-card.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
@include("/admin/module/setting.html")
44

55
<!-- BEGIN notFound -->
6-
<p class="text-gray-800 text-lg text-center">記事が見つかりませんでした。</p>
6+
<p class="text-gray-900 text-lg text-center">記事が見つかりませんでした。</p>
77
<!-- END notFound -->
88

99
<!-- BEGIN_MODULE Touch_Keyword -->
10-
<p class="text-gray-800 text-xl font-bold mb-8">%{KEYWORD} の検索結果：{itemsAmount}件</p>
10+
<p class="text-gray-900 text-xl font-bold mb-8">%{KEYWORD} の検索結果：{itemsAmount}件</p>
1111
<!-- END_MODULE Touch_Keyword -->
1212

1313
<!-- BEGIN unit:loop -->
@@ -29,10 +29,10 @@
2929
>
3030
<!-- END_IF -->
3131
<!-- BEGIN category:veil -->
32-
<p class="inline-block px-3 py-2 leading-none rounded-full text-xs font-medium uppercase bg-slate-100 text-gray-700">{categoryName}</p>
32+
<p class="inline-block px-3 py-2 leading-none rounded-full text-xs font-medium uppercase bg-slate-100">{categoryName}</p>
3333
<!-- END category:veil -->
34-
<h2 class="mt-3 text-gray-800 text-lg font-bold">{title}</h2>
35-
<p class="mt-2 text-gray-500 text-sm">{summary}</p>
34+
<h2 class="mt-3 text-gray-900 text-lg font-bold">{title}</h2>
35+
<p class="mt-2 text-sm">{summary}</p>
3636
<div class="flex items-center mt-2 text-xs">
3737
<p class="text-gray-900"><time datetime="{date#Y}-{date#m}-{date#d}">{date#Y}年 {date#n}月 {date#j}日</time></p>
3838
<!-- BEGIN new -->

‎src/develop/include/entry/tag-relational-card.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 class="text-4xl font-extrabold text-gray-900 text-center sm:text-5xl lg:text
2525
>
2626
<!-- END_IF -->
2727
<!-- BEGIN category:veil -->
28-
<p class="inline-block px-3 py-2 leading-none rounded-full text-xs font-medium uppercase bg-slate-100 text-gray-700">{categoryName}</p>
28+
<p class="inline-block px-3 py-2 leading-none rounded-full text-xs font-medium uppercase bg-slate-100">{categoryName}</p>
2929
<!-- END category:veil -->
3030
<h2 class="mt-3 text-lg font-bold">{title}</h2>
3131
<p class="mt-2 text-sm text-gray-500">{summary}</p>

‎src/develop/include/header.html‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
<header class="max-lg:sticky top-0 left-0 z-10 w-full bg-white" x-data="{ showMenu: false }">
2-
<div class="px-4">
3-
<div class="flex items-center justify-between gap-x-4 w-full h-20 mx-auto my-0 leading-6 text-gray-800">
2+
<div class="container">
3+
<div class="flex items-center justify-between gap-x-4 w-full h-14 leading-6 text-gray-900">
44
<!-- BEGIN_MODULE Blog_Field ctx="bid/1" -->
55

6-
<div class="font-extrabold text-gray-800 lg:w-auto title-font md:mb-0">
6+
<div class="font-extrabold lg:w-auto text-2xl md:mb-0">
77
<p>
88
<a href="%{BLOG_URL}">
9-
<!-- BEGIN_IF [{site_logo@path}/nem] -->
10-
<img src="%{MEDIA_ARCHIVES_DIR}{site_logo@path}" alt="{site_logo@alt}" class="w-auto h-8 lg:h-12 hover:opacity-70">
11-
<!-- ELSE -->
129
<span>%{BLOG_NAME}</span>
13-
<!-- END_IF -->
1410
</a>
1511
</p>
1612
</div>
1713
<!-- END_MODULE Blog_Field -->
1814

1915
@include("/include/links/navigation.html")
2016

21-
<div @click="showMenu = !showMenu"
17+
<div
2218
class="flex flex-col items-center items-end justify-center w-10 h-10 -mt-1 rounded-full cursor-pointer lg:hidden hover:bg-gray-100">
23-
<svg class="w-6 h-6 text-gray-700" x-show="!showMenu" fill="none" stroke-linecap="round" stroke-linejoin="round"
19+
<svg class="w-6 h-6" fill="none" stroke-linecap="round" stroke-linejoin="round"
2420
stroke-width="2" viewBox="0 0 24 24" stroke="currentColor" x-cloak>
2521
<path d="M4 6h16M4 12h16M4 18h16"></path>
2622
</svg>
2723

28-
<svg class="w-6 h-6 text-gray-700" x-show="showMenu" fill="none" stroke="currentColor" viewBox="0 0 24 24"
29-
xmlns="http://www.w3.org/2000/svg" x-cloak>
24+
<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"
25+
xmlns="http://www.w3.org/2000/svg">
3026
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
3127
</svg>
3228
</div>

‎src/develop/include/links/navigation.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- BEGIN_MODULE Links id="{{module_id}}" -->
2-
<nav class="bg-white max-lg:absolute max-lg:top-20 max-lg:w-full max-lg:h-[calc(100dvh-5rem)] max-lg:left-0 lg:block" :class="\{'block': showMenu, 'hidden': !showMenu \}">
2+
<nav class="bg-white max-lg:absolute max-lg:top-20 max-lg:w-full max-lg:h-[calc(100dvh-5rem)] max-lg:left-0 lg:block">
33
<div>
44
@include("/admin/module/setting.html")
5-
<ul class="flex-wrap items-center list-none p-0 space-y-5 leading-6 text-gray-800 lg:static lg:w-auto lg:flex lg:space-y-0 lg:mt-0">
5+
<ul class="flex-wrap items-center list-none p-0 space-y-5 leading-6 lg:static lg:w-auto lg:flex lg:space-y-0 lg:mt-0">
66
<!-- BEGIN loop -->
77
<li class="box-border w-full my-3 font-medium text-center lg:w-auto group">
88
<a href="{url}" class="px-5 py-2 lg:group-last:pr-0 no-underline bg-transparent rounded-full cursor-pointer hover:opacity-70">{name}</a>

0 commit comments

Comments
 (0)