Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor header CSS and HTML #1417

Closed
wants to merge 10 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 0 additions & 87 deletions assets/css/_core/_media.scss

This file was deleted.

3 changes: 1 addition & 2 deletions assets/css/_page/_index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.page {
position: relative;
max-width: 800px;
width: 60%;
max-width: 66ch;
margin: 0 auto;
padding-top: $header-height;

5 changes: 4 additions & 1 deletion assets/css/_partial/_header.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
header {
width: 100%;
z-index: 150;
background-color: $header-background-color;
@include transition(box-shadow 0.3s ease);

@@ -410,3 +409,7 @@ header {
}
}
}

html:has(#mobile-menu-dialog[open]) {
overflow: hidden;
}
77 changes: 77 additions & 0 deletions assets/css/main.css
Original file line number Diff line number Diff line change
@@ -781,14 +781,34 @@ html.dark {
position: fixed;
}

.tw-absolute {
position: absolute;
}

.tw-relative {
position: relative;
}

.tw-bottom-4 {
bottom: 1rem;
}

.tw-left-0 {
left: 0px;
}

.tw-right-4 {
right: 1rem;
}

.tw-top-0 {
top: 0px;
}

.tw-z-50 {
z-index: 50;
}

.tw-m-0 {
margin: 0px;
}
@@ -803,6 +823,11 @@ html.dark {
margin-right: 0px;
}

.tw-mx-16 {
margin-left: 4rem;
margin-right: 4rem;
}

.tw-mx-2 {
margin-left: 0.5rem;
margin-right: 0.5rem;
@@ -840,6 +865,14 @@ html.dark {
margin-right: 0.25rem;
}

.tw-mr-8 {
margin-right: 2rem;
}

.tw-mt-0 {
margin-top: 0px;
}

.\!tw-block {
display: block !important;
}
@@ -868,6 +901,14 @@ html.dark {
height: 2.5rem;
}

.tw-h-16 {
height: 4rem;
}

.tw-h-6 {
height: 1.5rem;
}

.tw-h-\[90vh\] {
height: 90vh;
}
@@ -934,6 +975,10 @@ html.dark {
flex-direction: column;
}

.tw-flex-nowrap {
flex-wrap: nowrap;
}

.tw-items-center {
align-items: center;
}
@@ -950,6 +995,14 @@ html.dark {
gap: 0.5rem;
}

.tw-gap-4 {
gap: 1rem;
}

.tw-gap-y-4 {
row-gap: 1rem;
}

.tw-overflow-x-auto {
overflow-x: auto;
}
@@ -962,10 +1015,18 @@ html.dark {
text-wrap: wrap;
}

.tw-text-nowrap {
text-wrap: nowrap;
}

.tw-rounded-full {
border-radius: 9999px;
}

.tw-border-l {
border-left-width: 1px;
}

.tw-border-t-2 {
border-top-width: 2px;
}
@@ -975,6 +1036,10 @@ html.dark {
border-color: rgb(240 240 240 / var(--tw-border-opacity, 1));
}

.tw-border-l-fgColor-default {
border-left-color: var(--fgColor-default);
}

.tw-bg-bgColor-secondary {
background-color: var(--bgColor-secondary);
}
@@ -1001,6 +1066,10 @@ html.dark {
padding-bottom: 0.5rem;
}

.tw-pb-4 {
padding-bottom: 1rem;
}

.tw-pb-8 {
padding-bottom: 2rem;
}
@@ -1027,6 +1096,10 @@ html.dark {
line-height: 2.25rem;
}

.tw-font-bold {
font-weight: 700;
}

.tw-uppercase {
text-transform: uppercase;
}
@@ -1151,6 +1224,10 @@ html.dark {
}

@media (min-width: 768px) {
.md\:tw-flex {
display: flex;
}

.md\:tw-hidden {
display: none;
}
2 changes: 0 additions & 2 deletions assets/css/style.scss
Original file line number Diff line number Diff line change
@@ -15,6 +15,4 @@
@import "_partial/footer";
@import "_partial/pagination";

@import "_core/media";

@import "_custom";
35 changes: 18 additions & 17 deletions assets/js/theme.ts
Original file line number Diff line number Diff line change
@@ -25,23 +25,24 @@ function getScrollTop() {
* Initialize the mobile menu bar.
*/
function initMenuMobile() {
const menuToggleMobile = document.getElementById("menu-toggle-mobile");
const menuMobile = document.getElementById("menu-mobile");
// If no event listener has been registered yet, add one.
if (!window.menuToggleMobileEventListener) {
menuToggleMobile.addEventListener("click", () => {
document.body.classList.toggle("blur");
menuToggleMobile.classList.toggle("active");
menuMobile.classList.toggle("active");
});
window.menuToggleMobileEventListener = true;
const openButton = document.getElementById("mobile-menu-open-button") as HTMLButtonElement | null;
const closeButton = document.getElementById("mobile-menu-close-button") as HTMLButtonElement | null;
const dialog = document.getElementById("mobile-menu-dialog") as HTMLDialogElement | null;
if (!openButton) {
throw new Error("Mobile menu button not found.");
}
// Remove the mask when click on it.
window._menuMobileOnClickMask = () => {
menuToggleMobile.classList.remove("active");
menuMobile.classList.remove("active");
};
window.clickMaskEventSet.add(window._menuMobileOnClickMask);
if (!closeButton) {
throw new Error("Mobile menu close button not found.");
}
if (!dialog) {
throw new Error("Mobile menu dialog not found.");
}
openButton.addEventListener("click", () => {
dialog.showModal();
});
closeButton.addEventListener("click", () => {
dialog.close();
});
}

/**
@@ -939,7 +940,7 @@ function init() {
initSwitchTheme();
initSelectTheme();
initMeta();
initSearch();
// initSearch();
initCodeblocks();
initDetails();
initLightGallery();
1 change: 0 additions & 1 deletion layouts/_default/baseof.html
Original file line number Diff line number Diff line change
@@ -33,7 +33,6 @@
<body data-instant-intensity="viewport">
{{- partial "theme.html" . -}}
<div id="back-to-top"></div>
<div id="mask"></div>
{{- partial "header.html" . -}}
<main class="tw-mx-4">
{{- block "content" . }}{{ end -}}
Loading
Loading