From 2bc6d213ee7c472b1c2cf9c11220f466e94b4ee3 Mon Sep 17 00:00:00 2001 From: Sped0n Date: Sun, 29 Oct 2023 00:58:26 +0800 Subject: [PATCH] chore(variables.scss): update variable names and values for better readability and consistency chore(style.scss): reorganize import statements for better organization and readability --- assets/css/_variables.scss | 22 ++++++++++------------ assets/css/style.scss | 22 ++++++++++------------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index 193d082..b126326 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -1,14 +1,12 @@ -// ============================== -// Variables -// ============================== - -// ========== Global ========== // -// Font and Line Height -$global-font-family: system-ui, -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft YaHei UI, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif !default; -$global-font-size: 16px; -$global-font-weight: 400; -$global-line-height: 1.5rem; +@import '_core/mixins'; :root { - --footer-height: 38px; -} \ No newline at end of file + --window-height: 100vh; + --nav-height: 2rem; + --space-standard: 0.625rem; + + --z-curtain: 200; + --z-nav-gallery: 500; + --z-cursor: 600; + --z-nav: 800; +} diff --git a/assets/css/style.scss b/assets/css/style.scss index 7df3db5..96c8842 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -1,15 +1,13 @@ @charset "utf-8"; -@import "_variables"; +@import '_core/reset'; +@import '_core/font'; +@import '_core/typography'; +@import '_core/mixins'; +@import '_variables'; +@import '_core/base'; -@import "_core/base"; - -@import "_core/media"; - -@import "_partial/imagesDesktop"; - -@import "_partial/imagesMobile"; - -@import "_partial/footer"; - -@import "_partial/overlay"; \ No newline at end of file +@import '_partial/customCursor'; +@import '_partial/nav'; +@import '_partial/stage'; +@import '_partial/stageNav';