refactor: improve SCSS nesting structure

This commit is contained in:
Erzbir
2026-05-16 15:27:13 +08:00
parent f3002b58dc
commit be59fb0e06
19 changed files with 394 additions and 379 deletions
+3 -3
View File
@@ -29,9 +29,9 @@ a.button.outline {
padding: calc(var(--size-theme-font) * 0.5) calc(var(--size-theme-font) * 1.125);
}
button.outline :hover,
.button.outline :hover,
a.button.outline :hover {
button.outline:hover,
.button.outline:hover,
a.button.outline:hover {
transform: none;
box-shadow: none;
}
+1 -1
View File
@@ -33,7 +33,7 @@ comment-widget {
--halo-comment-widget-base-info-color: var(--color-theme-foreground) !important;
--halo-comment-widget-component-form-input-bg-color: var(--color-theme-background) !important;
--halo-comment-widget-component-form-input-color: var(--color-theme-foreground) !important;
--halo-comment-widget-component-form-input-border-color: var(var(--color-theme-foreground) !important) !important;
--halo-comment-widget-component-form-input-border-color: var(--color-theme-foreground) !important;
--halo-comment-widget-component-form-input-border-color-focus: var(--color-theme-accent) !important;
--halo-comment-widget-component-form-input-box-shadow-focus: var(--color-theme-accent) !important;
--halo-comment-widget-component-form-button-login-bg-color: var(--color-theme-background) !important;
+28 -27
View File
@@ -6,9 +6,8 @@
opacity: 0.65;
position: relative;
margin-top: auto;
}
.footer-inner {
&-inner {
display: flex;
flex-direction: column;
align-items: center;
@@ -21,24 +20,23 @@
a {
color: inherit;
}
}
}
.footer-copyright-engine {
&-copyright-engine {
display: flex;
flex-wrap: wrap;
justify-content: center;
align-items: center;
font-size: calc(var(--size-theme-font) * 0.9);
line-height: 1.5;
}
.footer-copyright-engine span,
.footer-copyright-engine a {
span,
a {
white-space: nowrap;
}
}
}
.footer-copyright-site {
&-copyright-site {
display: flex;
justify-content: center;
align-items: center;
@@ -46,58 +44,61 @@
flex-wrap: wrap;
font-size: calc(var(--size-theme-font) * 0.9);
line-height: 1.5;
}
}
.footer-user {
&-user {
display: flex;
align-items: center;
white-space: nowrap;
}
}
.footer-icp p {
&-icp p {
margin: 0;
display: flex;
align-items: center;
gap: calc(var(--size-theme-font) * 0.625);
flex-wrap: wrap;
justify-content: center;
}
}
@media (max-width: 768px) {
.footer-inner {
@media (max-width: 768px) {
&-inner {
padding: calc(var(--size-theme-font) * 0.9375) calc(var(--size-theme-font) * 0.625);
gap: calc(var(--size-theme-font) * 0.625);
}
.footer-copyright-engine {
&-copyright-engine {
font-size: calc(var(--size-theme-font) * 0.8125);
line-height: 1.6;
}
.footer-copyright-site {
&-copyright-site {
flex-direction: column;
gap: calc(var(--size-theme-font) * 0.5);
font-size: calc(var(--size-theme-font) * 0.8125);
}
.footer-icp p {
&-icp p {
flex-direction: column;
gap: calc(var(--size-theme-font) * 0.3125);
}
}
}
@media (max-width: 480px) {
.footer-inner {
@media (max-width: 480px) {
&-inner {
padding: calc(var(--size-theme-font) * 0.75) calc(var(--size-theme-font) * 0.5);
}
.footer-copyright-engine,
.footer-copyright-site {
&-copyright-engine,
&-copyright-site {
font-size: calc(var(--size-theme-font) * 0.75);
}
.footer-copyright-engine span,
.footer-copyright-engine a {
&-copyright-engine {
span,
a {
white-space: normal;
}
}
}
}
+13 -11
View File
@@ -1,28 +1,30 @@
.friend-post-list {
.friend {
&-post-list {
padding: 0;
}
}
.friend-post-title {
margin-bottom: calc(var(--size-theme-font) * .3125);
&-post-title {
margin-bottom: calc(var(--size-theme-font) * 0.3125);
padding: 0;
}
}
.friend-post-meta {
margin-bottom: calc(var(--size-theme-font) * .3125);
&-post-meta {
margin-bottom: calc(var(--size-theme-font) * 0.3125);
padding: 0;
}
}
.friend-author {
&-author {
display: inline-flex;
align-items: center;
gap: calc(var(--size-theme-font) * 0.35);
color: var(--color-theme-meta);
text-decoration: none;
}
}
.friend-post-desc {
&-post-desc {
margin: 0;
padding: 0;
color: var(--color-theme-foreground);
font-size: calc(var(--size-theme-font) * 0.875);
}
}
+11 -9
View File
@@ -2,39 +2,41 @@
display: flex;
flex-direction: column;
position: relative;
}
.header__inner {
&-inner {
display: flex;
align-items: center;
justify-content: space-between;
#theme-toggle, #search-button, #pixel-toggle {
#theme-toggle,
#search-button,
#pixel-toggle {
background-color: transparent;
color: var(--color-theme-header);
border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-header);
margin: 0 0 0 calc(var(--size-theme-font) * 0.5);
padding: 0;
}
}
}
.header__logo {
&-logo {
display: flex;
flex: 1;
}
.header__logo::after {
&::after {
content: "";
background: repeating-linear-gradient(90deg, var(--color-theme-header), var(--color-theme-header) var(--width-theme-border), transparent 0, transparent calc(var(--size-theme-font) * 0.625));
display: block;
width: 100%;
right: calc(var(--size-theme-font) * 0.625);
}
}
.header__logo a {
a {
flex: 0 0 auto;
max-width: 100%;
text-decoration: none;
}
}
}
.logo {
+55 -31
View File
@@ -1,8 +1,9 @@
.link-section {
.link {
&-section {
margin-bottom: calc(var(--size-theme-font) * 3);
}
}
.link-section-header {
&-section-header {
display: flex;
align-items: center;
margin-bottom: calc(var(--size-theme-font) * 1.25);
@@ -18,8 +19,17 @@
white-space: nowrap;
margin: 0;
&::before { content: "┌─["; color: var(--color-theme-accent); opacity: 0.4; }
&::after { content: "]"; color: var(--color-theme-accent); opacity: 0.4; }
&::before {
content: "┌─[";
color: var(--color-theme-accent);
opacity: 0.4;
}
&::after {
content: "]";
color: var(--color-theme-accent);
opacity: 0.4;
}
> span {
color: var(--color-theme-accent);
@@ -37,72 +47,77 @@
margin-left: 0.6em;
opacity: 0.5;
}
}
}
.link-table {
&-table {
width: 100%;
border-collapse: collapse;
}
}
.link-item {
&-item {
display: block;
padding: calc(var(--size-theme-font) * 0.55) calc(var(--size-theme-font) * 0.55);
text-decoration: none;
color: inherit;
}
}
.link-container {
&-container {
display: grid;
grid-template-columns: calc(var(--size-theme-font) * 3.5) 1fr;
gap: calc(var(--size-theme-font) * 0.75);
align-items: center;
}
}
.link-logo-wrap {
&-logo-wrap {
width: calc(var(--size-theme-font) * 3.5);
height: calc(var(--size-theme-font) * 3.5);
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
}
}
.link-logo {
&-logo {
width: 100%;
height: 100%;
object-fit: cover;
display: block;
}
}
.link-content {
&-content {
display: flex;
flex-direction: column;
gap: calc(var(--size-theme-font) * 0.15);
min-width: 0;
}
}
.link-title {
&-title {
display: flex;
align-items: baseline;
flex-wrap: wrap;
gap: calc(var(--size-theme-font) * 0.5);
}
}
.link-name {
&-name {
color: var(--color-theme-foreground);
&::before { content: "> "; color: var(--color-theme-accent); opacity: 0.55; }
}
.link-url {
&::before {
content: "> ";
color: var(--color-theme-accent);
opacity: 0.55;
}
}
&-url {
color: var(--color-theme-meta);
font-size: calc(var(--size-theme-font) * 0.8);
opacity: 0.7;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.link-description {
&-description {
color: var(--color-theme-foreground);
font-size: calc(var(--size-theme-font) * 0.82);
line-height: var(--height-theme-line);
@@ -110,10 +125,19 @@
overflow: hidden;
text-overflow: ellipsis;
opacity: 0.8;
}
}
@media (max-width: 600px) {
.link-url { display: none; }
.link-description { white-space: normal; }
.link-container { grid-template-columns: calc(var(--size-theme-font) * 3) 1fr; }
@media (max-width: 600px) {
&-url {
display: none;
}
&-description {
white-space: normal;
}
&-container {
grid-template-columns: calc(var(--size-theme-font) * 3) 1fr;
}
}
}
+15 -23
View File
@@ -15,7 +15,7 @@
margin: 0;
}
.navigation-menu__inner {
&-inner {
display: flex;
flex: 1;
flex-wrap: wrap;
@@ -31,20 +31,13 @@
justify-items: center;
padding: 0;
li {
> li {
width: 100%;
}
li:not(:last-of-type) {
margin-bottom: 0;
}
.navigation-menu__inner li {
margin: 0;
padding: 0;
}
.navigation-menu__inner > li a {
> li a {
display: block;
text-align: center;
white-space: normal;
@@ -52,9 +45,7 @@
word-break: break-word;
}
}
}
.navigation-menu__inner > li {
> li {
flex: 0 0 auto;
margin-bottom: calc(var(--size-theme-font) * 0.625);
white-space: nowrap;
@@ -65,17 +56,18 @@
min-width: 0;
white-space: normal;
}
}
.navigation-menu__inner > li:not(:last-of-type) {
&:not(:last-of-type) {
margin-right: calc(var(--size-theme-font) * 1.25);
@media (max-width: $phone-max-width) {
margin-right: 0;
}
}
}
}
.navigation-menu .spacer {
.spacer {
flex-grow: 1 !important;
}
@@ -97,7 +89,7 @@
}
}
.menu__trigger {
.menu-trigger {
all: unset;
cursor: pointer;
background-color: var(--color-theme-background) !important;
@@ -118,7 +110,7 @@
}
}
.menu__dropdown {
.menu-dropdown {
display: none;
flex-direction: column;
position: absolute;
@@ -137,15 +129,15 @@
}
}
.menu__dropdown > li {
.menu-dropdown > li {
flex: 0 0 auto;
}
.menu__dropdown > li:not(:last-of-type) {
.menu-dropdown > li:not(:last-of-type) {
margin-bottom: calc(var(--size-theme-font) * 0.625);
}
.menu__dropdown > li a {
.menu-dropdown > li a {
display: flex;
padding: calc(var(--size-theme-font) * 0.3125);
text-decoration: underline;
@@ -155,8 +147,8 @@
display: flex;
}
.sub-menu:hover .menu__dropdown,
.sub-menu:active .menu__dropdown {
.sub-menu:hover .menu-dropdown,
.sub-menu:active .menu-dropdown {
display: flex !important;
opacity: 1;
visibility: visible;
+2 -3
View File
@@ -3,14 +3,14 @@
gap: calc(var(--size-theme-font) * 0.5);
margin: var(--size-theme-font) 0;
width: 80%;
}
.moment-media video {
video {
width: 100%;
height: calc(var(--size-theme-font) * 12.5);
object-fit: cover;
border-radius: var(--size-theme-font);
transition: transform 0.3s ease;
}
}
.moment-footer {
@@ -36,7 +36,6 @@
&.active {
color: var(--color-theme-accent);
}
}
.moment-comment-section {
+21 -21
View File
@@ -3,14 +3,23 @@
.pagination {
margin-top: calc(var(--size-theme-font) * 0.625);
.pagination__title {
&-title {
display: flex;
text-align: center;
position: relative;
margin: calc(var(--size-theme-font) * 0.625) 0 calc(var(--size-theme-font) * 0.625);
text-align: center;
margin: calc(var(--size-theme-font) * 0.625) 0;
hr {
position: absolute;
background-color: color-mix(in srgb, var(--color-theme-foreground) 65%, transparent);
left: 0;
right: 0;
width: 100%;
margin-top: calc(var(--size-theme-font) * 0.9375);
z-index: 0;
}
.pagination__title-h {
&-h {
text-align: center;
margin: 0 auto;
padding: calc(var(--size-theme-font) * 0.3125) calc(var(--size-theme-font) * 0.625);
@@ -21,18 +30,9 @@
letter-spacing: 0.1em;
z-index: 1;
}
.pagination__title hr {
position: absolute;
background-color: color-mix(in srgb, var(--color-theme-foreground) 65%, transparent);
left: 0;
right: 0;
width: 100%;
margin-top: calc(var(--size-theme-font) * 0.9375);
z-index: 0;
}
.pagination__buttons {
&-buttons {
display: flex;
align-items: flex-start;
justify-content: space-between;
@@ -88,25 +88,25 @@
padding: 0;
appearance: none;
}
&:has(span:only-child) {
justify-content: center;
}
}
.button__text {
.button-text {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.next .button__icon {
.next .button-icon {
margin-left: calc(var(--size-theme-font) * 0.5);
}
.prev .button__icon {
.prev .button-icon {
margin-right: calc(var(--size-theme-font) * 0.5);
}
.pagination__buttons:has(span:only-child) {
justify-content: center;
}
}
@media print {
+6 -7
View File
@@ -6,24 +6,23 @@
flex-wrap: wrap;
padding: calc(var(--size-theme-font) * 0.75) 0;
font-size: inherit;
}
.sns-container .sns-icon {
.sns-icon {
display: inline-flex;
align-items: center;
justify-content: center;
color: var(--color-theme-foreground);
text-decoration: none;
}
.sns-container .sns-icon svg {
svg {
width: calc(var(--size-theme-font) * 1.2);
height: calc(var(--size-theme-font) * 1.2);
}
}
}
.sns-container .divider {
.divider {
color: var(--color-theme-foreground);
font-weight: 300;
user-select: none;
}
}
-3
View File
@@ -127,9 +127,6 @@
max-height: calc(60vh - var(--size-theme-font) * 4);
}
.toc-list {
}
.toc-list-item {
margin: calc(var(--size-theme-font) * 0.125) 0;
}
+3 -3
View File
@@ -34,15 +34,15 @@
</div>
</article>
<nav class="pagination" th:if="${archives.hasPrevious() || archives.hasNext()}">
<div class="pagination__buttons">
<div class="pagination-buttons">
<span th:if="${archives.hasPrevious()}">
<a data-pjax th:href="@{${archives.prevUrl}}" class="button prev inline">
<span class="button__text">&lt;&nbsp;Prev</span>
<span class="button-text">&lt;&nbsp;Prev</span>
</a>
</span>
<span th:if="${archives.hasNext()}">
<a data-pjax th:href="@{${archives.nextUrl}}" class="button inline next">
<span class="button__text">Next&nbsp;&gt;</span>
<span class="button-text">Next&nbsp;&gt;</span>
</a>
</span>
</div>
+3 -3
View File
@@ -25,15 +25,15 @@
</div>
</article>
<nav class="pagination" th:if="${posts.hasPrevious() || posts.hasNext()}">
<div class="pagination__buttons">
<div class="pagination-buttons">
<span th:if="${posts.hasPrevious()}">
<a data-pjax th:href="@{${posts.prevUrl}}" class="button inline prev">
<span class="button__text" th:text="'< ' + #{page.pagination.prev}">&lt;&nbsp;Prev</span>
<span class="button-text" th:text="'< ' + #{page.pagination.prev}">&lt;&nbsp;Prev</span>
</a>
</span>
<span th:if="${posts.hasNext()}">
<a data-pjax th:href="@{${posts.nextUrl}}" class="button inline next">
<span class="button__text" th:text="#{page.pagination.next} + ' >'">Next&nbsp;&gt;</span>
<span class="button-text" th:text="#{page.pagination.next} + ' >'">Next&nbsp;&gt;</span>
</a>
</span>
</div>
+3 -3
View File
@@ -36,15 +36,15 @@
</article>
<nav class="pagination" th:if="${friends.hasPrevious() || friends.hasNext()}">
<div class="pagination__buttons">
<div class="pagination-buttons">
<span th:if="${friends.hasPrevious()}">
<a data-pjax th:href="@{${friends.prevUrl}}" class="button prev inline">
<span class="button__text" th:text="'< ' + #{page.pagination.prev}">&lt;&nbsp;Prev</span>
<span class="button-text" th:text="'< ' + #{page.pagination.prev}">&lt;&nbsp;Prev</span>
</a>
</span>
<span th:if="${friends.hasNext()}">
<a data-pjax th:href="@{${friends.nextUrl}}" class="button inline next">
<span class="button__text" th:text="#{page.pagination.next} + ' >'">Next&nbsp;&gt;</span>
<span class="button-text" th:text="#{page.pagination.next} + ' >'">Next&nbsp;&gt;</span>
</a>
</span>
</div>
+3 -3
View File
@@ -44,15 +44,15 @@
</article>
</section>
<nav class="pagination" th:if="${posts.hasPrevious() || posts.hasNext()}">
<div class="pagination__buttons">
<div class="pagination-buttons">
<span th:if="${posts.hasPrevious()}">
<a data-pjax th:href="@{${posts.prevUrl}}" class="button inline prev">
<span class="button__text" th:text="'< ' + #{page.pagination.prev}">&lt;&nbsp;Prev</span>
<span class="button-text" th:text="'< ' + #{page.pagination.prev}">&lt;&nbsp;Prev</span>
</a>
</span>
<span th:if="${posts.hasNext()}">
<a data-pjax th:href="@{${posts.nextUrl}}" class="button inline next">
<span class="button__text" th:text="#{page.pagination.next} + ' >'">Next&nbsp;&gt;</span>
<span class="button-text" th:text="#{page.pagination.next} + ' >'">Next&nbsp;&gt;</span>
</a>
</span>
</div>
+5 -6
View File
@@ -1,6 +1,6 @@
<th:block th:fragment="header" th:with="menu = ${menuFinder.getPrimary()}">
<div class="header__inner">
<div class="header__logo">
<div class="header-inner">
<div class="header-logo">
<a data-pjax href="/">
<div class="logo"
th:text="${#strings.isEmpty(theme.config.basic.logo) ? site.title : theme.config.basic.logo}">
@@ -51,7 +51,7 @@
</div>
<nav class="navigation-menu">
<ul th:if="${menu != null} and ${not #lists.isEmpty(menu.menuItems)}"
class="navigation-menu__inner menu--desktop">
class="navigation-menu-inner menu--desktop">
<li th:each="menuItem : ${menu.menuItems}">
<div th:if="${#lists.isEmpty(menuItem.children)}">
<a data-pjax th:href="@{${menuItem.status.href}}"
@@ -63,8 +63,8 @@
<span th:text="${menuItem.status.displayName}"></span>
</a>
<div class="sub-menu">
<div class="menu__trigger">▾</div>
<ul class="menu__dropdown">
<div class="menu-trigger">▾</div>
<ul class="menu-dropdown">
<li th:each="childMenuItem : ${menuItem.children}">
<a data-pjax
th:href="@{${childMenuItem.status.href}}">
@@ -78,4 +78,3 @@
</ul>
</nav>
</th:block>
+3 -3
View File
@@ -101,15 +101,15 @@
</div>
</article>
<nav class="pagination" th:if="${moments.hasPrevious() || moments.hasNext()}">
<div class="pagination__buttons">
<div class="pagination-buttons">
<span th:if="${moments.hasPrevious()}">
<a data-pjax th:href="@{${moments.prevUrl}}" class="button inline prev">
<span class="button__text"><&nbsp;Prev</span>
<span class="button-text"><&nbsp;Prev</span>
</a>
</span>
<span th:if="${moments.hasNext()}">
<a data-pjax th:href="@{${moments.nextUrl}}" class="button inline next">
<span class="button__text">Next&nbsp;</span>
<span class="button-text">Next&nbsp;</span>
</a>
</span>
</div>
+5 -5
View File
@@ -24,19 +24,19 @@
<div id="toc-content" class="toc-content"></div>
</nav>
<nav class="pagination">
<div class="pagination__title">
<span class="pagination__title-h" th:text="#{page.post.pagination}">READ OTHER POSTS</span>
<div class="pagination-title">
<span class="pagination-title-h" th:text="#{page.post.pagination}">READ OTHER POSTS</span>
<hr/>
</div>
<div class="pagination__buttons" th:with="postCursor=${postFinder.cursor(post.metadata?.name)}">
<div class="pagination-buttons" th:with="postCursor=${postFinder.cursor(post.metadata?.name)}">
<span th:if="${postCursor.hasPrevious()}">
<a data-pjax th:href="@{${postCursor.previous?.status?.permalink}}" class="button prev inline">
<span class="button__text" th:text="|< ${postCursor.previous?.spec?.title}|">prevPost</span>
<span class="button-text" th:text="|< ${postCursor.previous?.spec?.title}|">prevPost</span>
</a>
</span>
<span th:if="${postCursor.hasNext()}">
<a data-pjax th:href="@{${postCursor.next?.status?.permalink}}" class="button next inline">
<span class="button__text" th:text="|${postCursor.next?.spec?.title} >|">nextPost</span>
<span class="button-text" th:text="|${postCursor.next?.spec?.title} >|">nextPost</span>
</a>
</span>
</div>
+3 -3
View File
@@ -25,15 +25,15 @@
</div>
</article>
<nav class="pagination" th:if="${posts.hasPrevious() || posts.hasNext()}">
<div class="pagination__buttons">
<div class="pagination-buttons">
<span th:if="${posts.hasPrevious()}">
<a data-pjax th:href="@{${posts.prevUrl}}" class="button inline prev">
<span class="button__text"><&nbsp;Prev</span>
<span class="button-text"><&nbsp;Prev</span>
</a>
</span>
<span th:if="${posts.hasNext()}">
<a data-pjax th:href="@{${posts.nextUrl}}" class="button inline next">
<span class="button__text">Next&nbsp;></span>
<span class="button-text">Next&nbsp;></span>
</a>
</span>
</div>