Skip to content

Commit aa0e97e

Browse files
committed
fix エントリーユニットの余白を修正・unit.htmlを編集しないよう修正
1 parent d1da3c1 commit aa0e97e

File tree

4 files changed

+74
-113
lines changed

4 files changed

+74
-113
lines changed

src/develop/include/topicpath.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- BEGIN_MODULE Topicpath id="{{module_id}}" -->
22
<nav aria-label="現在のページ">
3-
<ol class="flex items-center flex-wrap text-sm text-gray-500 [&_a]:text-gray-900 [&_a:hover]:opacity-70 [&_li:last-child_a]:text-gray-500">
3+
<ol class="flex items-center flex-wrap text-sm text-gray-500 [&_a]:text-gray-900 [&_a:hover]:opacity-70">
44
<!-- BEGIN blog:loop -->
55
<li class="flex items-center h-full"><!-- BEGIN blog:glue --><span class="mx-2 text-gray-400">/</span><!-- END blog:glue --><a href="{url}" class="py-1">{name}</a></li>
66
<!-- END blog:loop --><!-- BEGIN category:loop -->

src/develop/include/unit.html

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/develop/src/style/main.css

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -477,51 +477,57 @@
477477
}
478478

479479
/* メディアユニット */
480-
[class*='column-media-'] {
481-
margin-block: 2rem;
482-
}
483-
484480
[class*='column-media-'] .columnIcon { /* stylelint-disable-line */
485481
margin: 0 auto;
486482
}
487483

488-
/* 引用ユニット */
489-
[class*='column-quote'] blockquote:not([class]) {
490-
padding: 20px 10px 20px 20px;
491-
border-inline-start-color: var(--tw-prose-quote-borders);
492-
border-inline-start-width: 0.25rem;
484+
[class*='column-media-'] .caption {
485+
@apply mt-1 text-gray-500 text-sm text-center;
493486
}
494487

495-
.quoteImageContainer { /* stylelint-disable-line */
496-
position: relative;
497-
float: left;
498-
max-width: 154px;
499-
margin-right: 25px;
500-
}
488+
/* 引用ユニット */
489+
[class*='column-quote'] {
490+
blockquote:not([class]) {
491+
padding: 20px 10px 20px 20px;
492+
border-inline-start-color: var(--tw-prose-quote-borders);
493+
border-inline-start-width: 0.25rem;
494+
}
501495

502-
.quoteImage { /* stylelint-disable-line */
503-
display: block;
504-
max-width: 100%;
505-
height: auto;
506-
}
496+
blockquote.js-biggerlink {
497+
@apply overflow-hidden block md:flex p-0 border border-gray-200 rounded-md font-normal md:transition-opacity hover:opacity-70;
498+
}
507499

508-
.quoteTitle { /* stylelint-disable-line */
509-
padding: 0;
510-
margin: 0 0 5px;
511-
line-height: 1.4;
512-
}
500+
.quoteImageContainer { /* stylelint-disable-line */
501+
@apply md:w-1/3 flex-none mr-0;
502+
}
513503

514-
.quoteSiteName { /* stylelint-disable-line */
515-
padding: 0;
516-
margin: 0 0 10px;
517-
font-size: .75rem;
518-
}
504+
.quoteImage { /* stylelint-disable-line */
505+
@apply block w-full m-0 md:h-full md:object-cover;
506+
}
519507

520-
.quoteDescription { /* stylelint-disable-line */
521-
padding: 0;
522-
margin: 0;
523-
font-size: .75rem;
524-
line-height: 1.6;
508+
div:not(.quoteImageContainer) { /* stylelint-disable-line */
509+
@apply flex flex-col max-w-none p-4 md:w-2/3;
510+
}
511+
512+
.quoteTitle { /* stylelint-disable-line */
513+
@apply mb-1.5 text-base leading-6 line-clamp-2;
514+
}
515+
516+
.quoteTitleLink { /* stylelint-disable-line */
517+
@apply font-normal text-gray-700 no-underline;
518+
}
519+
520+
.quoteSiteName { /* stylelint-disable-line */
521+
@apply -order-1 p-0 mb-1 text-gray-700 text-sm line-clamp-1;
522+
}
523+
524+
.quoteDescription { /* stylelint-disable-line */
525+
@apply p-0 m-0 text-xs text-gray-500 leading-relaxed line-clamp-2;
526+
}
527+
528+
.clearHidden { /* stylelint-disable-line */
529+
@apply hidden;
530+
}
525531
}
526532

527533
/* 地図ユニット */
@@ -581,22 +587,16 @@
581587
display: block;
582588
box-sizing: border-box;
583589
width: 100%;
584-
padding-right: 0;
585-
padding-left: 0;
590+
border-bottom: 1px solid var(--tw-prose-td-borders);
586591
}
587592

588593
[class*=column-table-] table:not([class]) th {
589-
padding-bottom: 0;
590594
text-align: left;
591595
}
592-
593-
[class*=column-table-] table:not([class]) td {
594-
padding-top: 3px;
595-
}
596596
}
597597

598598
[class*=column-table-] .entry-container {
599-
margin-bottom: 2rem;
599+
margin-bottom: 1.5rem;
600600
overflow-x: auto;
601601
overflow-y: visible !important;
602602
}

src/develop/tailwind.config.js

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ module.exports = {
5656
'font-size': '1.125rem',
5757
},
5858
p: {
59+
'margin-bottom': '1.5rem',
5960
'line-height': '1.7',
6061
},
6162
a: {
@@ -67,12 +68,19 @@ module.exports = {
6768
blockquote: {
6869
'font-style': 'normal',
6970
},
71+
ul: {
72+
'margin-top': '0',
73+
'margin-bottom': '1.5rem',
74+
},
7075
'ul > li::marker': {
7176
'color': '#9CA3AF',
7277
},
7378
'ol > li::marker': {
7479
'font-weight': 'bold',
7580
},
81+
li: {
82+
margin: '.375rem 0'
83+
},
7684
dd: {
7785
'margin-top': '0',
7886
'padding-inline-start': '1em',
@@ -104,9 +112,29 @@ module.exports = {
104112
'tr:last-child th, tr:last-child td': {
105113
'border-bottom': '0',
106114
},
115+
'[class*="column-media-"]': {
116+
'margin-bottom': '1.5rem',
117+
},
107118
'[class*="column-media-"] img': {
108-
"margin-bottom": ".75em",
109-
}
119+
'margin-bottom': '.75em',
120+
'border-radius': '0.375rem',
121+
},
122+
'[class*=column-map]': {
123+
'margin-bottom': '1.5rem',
124+
'border-radius': '0.375rem',
125+
},
126+
'[class*=column-quote]': {
127+
'margin-bottom': '1.5rem',
128+
},
129+
'[class*=column-quote] blockquote': {
130+
'font-style': 'normal',
131+
'padding-left': '0',
132+
'color': 'inherit',
133+
'quotes': 'none',
134+
'&::before, &::after': {
135+
content: 'none',
136+
}
137+
},
110138
},
111139
},
112140
},

0 commit comments

Comments
 (0)