asandikci.com/web
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

fix: prompt with nested blockquotes renders incorrectly (#846)

Browse source 
Resolves #846
This commit is contained in:
Cotes Chung 2023-01-30 04:58:30 +08:00
parent 511df11546
commit babb4a0c5a
No known key found for this signature in database
GPG key ID: 0D9E54843167A808
2 changed files with 10 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
_includes/refactor-content.html
View file

@ -277,54 +277,6 @@
{% assign _content = _heading_content %}
<!-- Wrap prompt element of blockquote with the <div> tag -->
{% assign blockquote_start = '<blockquote class=' %}
{% assign blockquote_end = '</blockquote>' %}
{% assign cls_prefix = 'prompt-' %}
{% if _content contains blockquote_start %}
{% assign _prompt_content = nil %}
{% assign _prompt_snippets = _content | split: blockquote_start %}
{% for _snippet in _prompt_snippets %}
{% if forloop.first %}
{% assign _prompt_content = _snippet %}
{% continue %}
{% endif %}
{% assign left = _snippet | split: blockquote_end | first %}
{% assign right = _snippet | slice: left.size, _snippet.size %}
{% assign cls_str = left | split: '>' | first %}
{% assign cls_array = cls_str | remove: '"' | split: ' ' %}
{% assign is_prompt = false %}
{% for cls in cls_array %}
{% if cls contains cls_prefix %}
{% assign is_prompt = true %}
{% break %}
{% endif %}
{% endfor %}
{% unless is_prompt %}
{% assign _prompt_content = _prompt_content | append: blockquote_start | append: _snippet %}
{% continue %}
{% endunless %}
{% assign left = left | slice: cls_str.size, left.size %}
{% assign left = cls_str | append: '><div' | append: left | append: '</div>' %}
{% assign _prompt_content = _prompt_content | append: blockquote_start | append: left | append: right %}
{% endfor %}
{% assign _content = _prompt_content %}
{% endif %}
<!-- return -->
{{ _content }}

22
_sass/addon/commons.scss
View file

@ -131,9 +131,8 @@ blockquote {
color: var(--blockquote-text-color);
&[class^="prompt-"] {
display: flex;
border-left: 0;
padding: 1rem;
padding: 1rem 1rem 1rem 3rem;
color: var(--prompt-text-color);
@extend %rounded;
@ -141,19 +140,15 @@ blockquote {
&::before {
text-align: center;
width: 1.25rem;
margin-right: 0.75rem;
position: relative;
top: 0.4rem;
position: absolute;
left: 2.5rem;
margin-top: 0.4rem;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
}
> div {
max-width: calc(100% - 2rem);
> :last-child {
margin-bottom: 0;
}
> p:last-child {
margin-bottom: 0;
}
}
@ -1279,11 +1274,14 @@ $sidebar-display: "sidebar-display";
.post-content {
> blockquote[class^="prompt-"] {
@include pl-pr(1.25rem);
@include ml-mr(-1.25rem);
border-radius: 0;
max-width: none;
&::before {
left: 1rem;
}
}
}
}