Add gap property to sidebar and main container

This commit is contained in:
Jimmy Cai 2022-03-03 20:17:39 +00:00 committed by GitHub
parent 0c23d0c49d
commit 2fa2eaea4e
14 changed files with 65 additions and 88 deletions

View File

@ -11,7 +11,7 @@
/// Display right sidebar when min-width: lg /// Display right sidebar when min-width: lg
@include respond(lg) { @include respond(lg) {
display: block; display: flex;
} }
} }
@ -76,6 +76,10 @@ main.main {
min-width: 0; min-width: 0;
max-width: 100%; max-width: 100%;
flex-grow: 1; flex-grow: 1;
display: flex;
flex-direction: column;
gap: var(--section-separation);
@include respond(md) { @include respond(md) {
padding-top: var(--main-top-padding); padding-top: var(--main-top-padding);
} }

View File

@ -2,6 +2,7 @@
.article-list { .article-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: var(--section-separation);
article { article {
display: flex; display: flex;
@ -17,10 +18,6 @@
box-shadow: var(--shadow-l2); box-shadow: var(--shadow-l2);
} }
&:not(:last-of-type) {
margin-bottom: var(--section-separation);
}
.article-image { .article-image {
img { img {
width: 100%; width: 100%;
@ -151,10 +148,6 @@
--image-size: 60px; --image-size: 60px;
} }
& + .pagination {
margin-top: var(--section-separation);
}
article { article {
& > a { & > a {
display: flex; display: flex;

View File

@ -2,7 +2,6 @@ footer.site-footer {
padding: 20px 0 var(--section-separation) 0; padding: 20px 0 var(--section-separation) 0;
font-size: 1.4rem; font-size: 1.4rem;
line-height: 1.75; line-height: 1.75;
margin-top: var(--section-separation);
&:before { &:before {
content: ""; content: "";

View File

@ -1,3 +0,0 @@
.archives-group {
margin-bottom: var(--section-separation);
}

View File

@ -13,10 +13,6 @@
box-shadow: var(--shadow-l1); box-shadow: var(--shadow-l1);
overflow: hidden; overflow: hidden;
&.main-article {
margin-bottom: var(--section-separation);
}
.article-header { .article-header {
.article-image { .article-image {
img { img {
@ -211,10 +207,6 @@
} }
} }
.related-contents--wrapper {
margin-bottom: var(--section-separation);
}
.related-contents { .related-contents {
overflow-x: auto; overflow-x: auto;
padding-bottom: 15px; padding-bottom: 15px;

View File

@ -3,7 +3,6 @@
background-color: var(--card-background); background-color: var(--card-background);
padding: var(--small-card-padding); padding: var(--small-card-padding);
box-shadow: var(--shadow-l1); box-shadow: var(--shadow-l1);
margin-bottom: var(--section-separation);
display: flex; display: flex;
align-items: center; align-items: center;
@ -49,7 +48,6 @@
} }
.subsection-list { .subsection-list {
margin-bottom: var(--section-separation);
overflow-x: auto; overflow-x: auto;
.article-list--tile { .article-list--tile {

View File

@ -1,5 +1,4 @@
.search-form { .search-form {
margin-bottom: var(--section-separation);
position: relative; position: relative;
--button-size: 80px; --button-size: 80px;

View File

@ -5,7 +5,6 @@
border-radius: var(--card-border-radius); border-radius: var(--card-border-radius);
overflow: hidden; overflow: hidden;
flex-wrap: wrap; flex-wrap: wrap;
margin: var(--section-separation) 0;
.page-link { .page-link {
padding: 16px 32px; padding: 16px 32px;

View File

@ -39,6 +39,8 @@
.right-sidebar { .right-sidebar {
width: 100%; width: 100%;
display: none; display: none;
flex-direction: column;
gap: var(--widget-separation);
&.sticky { &.sticky {
top: 0; top: 0;
@ -122,21 +124,6 @@
} }
} }
.sidebar {
.widget {
margin-bottom: var(--section-separation);
&:not(:last-of-type):after {
content: "";
width: 100px;
height: 2px;
background-color: var(--body-text-color);
display: block;
margin-top: var(--section-separation);
}
}
}
[data-scheme="dark"] { [data-scheme="dark"] {
#dark-mode-toggle { #dark-mode-toggle {
color: var(--accent-color); color: var(--accent-color);

View File

@ -1,4 +1,7 @@
.widget { .widget {
display: flex;
flex-direction: column;
.widget-icon { .widget-icon {
svg { svg {
width: 32px; width: 32px;

View File

@ -19,7 +19,6 @@
@import "partials/pagination.scss"; @import "partials/pagination.scss";
@import "partials/sidebar.scss"; @import "partials/sidebar.scss";
@import "partials/base.scss"; @import "partials/base.scss";
@import "partials/layout/archives.scss";
@import "partials/layout/article.scss"; @import "partials/layout/article.scss";
@import "partials/layout/list.scss"; @import "partials/layout/list.scss";
@import "partials/layout/404.scss"; @import "partials/layout/404.scss";

View File

@ -161,4 +161,5 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
:root { :root {
--menu-icon-separation: 40px; --menu-icon-separation: 40px;
--container-padding: 15px; --container-padding: 15px;
--widget-separation: var(--section-separation);
} }

View File

@ -1,4 +1,5 @@
{{ define "main" }} {{ define "main" }}
<header>
<h3 class="section-title"> <h3 class="section-title">
{{ if eq .Parent (.GetPage "/") }} {{ if eq .Parent (.GetPage "/") }}
{{ T "list.section" }} {{ T "list.section" }}
@ -41,6 +42,7 @@
</div> </div>
{{ end }} {{ end }}
</div> </div>
</header>
{{- $subsections := .Sections -}} {{- $subsections := .Sections -}}
{{- $pages := .Pages | complement $subsections -}} {{- $pages := .Pages | complement $subsections -}}
@ -53,6 +55,7 @@
{{- end -}} {{- end -}}
{{- with $subsections -}} {{- with $subsections -}}
<aside>
<h2 class="section-title">{{ T "list.subsection" (len $subsections) }}</h2> <h2 class="section-title">{{ T "list.subsection" (len $subsections) }}</h2>
<div class="subsection-list"> <div class="subsection-list">
<div class="article-list--tile"> <div class="article-list--tile">
@ -61,6 +64,7 @@
{{ end }} {{ end }}
</div> </div>
</div> </div>
</aside>
{{- end -}} {{- end -}}
{{/* List only pages that are not a subsection */}} {{/* List only pages that are not a subsection */}}

View File

@ -16,8 +16,10 @@
</button> </button>
</form> </form>
<h3 class="search-result--title section-title"></h3> <div class="search-result">
<div class="search-result--list article-list--compact"></div> <h3 class="search-result--title section-title"></h3>
<div class="search-result--list article-list--compact"></div>
</div>
<script> <script>
window.searchResultTitleTemplate = "{{ T `search.resultTitle` }}" window.searchResultTitleTemplate = "{{ T `search.resultTitle` }}"