diff --git a/src/styles/links.scss b/src/styles/links.scss index 8ebff1b..f03b134 100644 --- a/src/styles/links.scss +++ b/src/styles/links.scss @@ -56,7 +56,7 @@ &-logo { width: 100%; - max-width: 100% !important; + max-width: 100%; height: 100%; object-fit: cover; display: block; @@ -157,7 +157,7 @@ img { width: 140px; - max-width: none !important; + max-width: none; height: 40px; margin: 0; padding: 0; @@ -230,4 +230,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/styles/main.scss b/src/styles/main.scss index aeb1b0e..6678ec0 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -40,7 +40,7 @@ html[system_font_enable='true']:not([pixel_style='true']) { } * { - scrollbar-width: var(--width-theme-scrollbar) !important; + scrollbar-width: var(--width-theme-scrollbar); scrollbar-color: var(--color-theme-scrollbar); font-variant-ligatures: var(--lig-theme-font); } @@ -70,45 +70,29 @@ body { } } -.wrapper { - display: flex; - flex-direction: row; -} - -.sidebar-left, -.sidebar-right { - width: 20%; - padding: calc(var(--size-theme-font) * 1.25); -} - -.container { +.site-shell { display: flex; flex-direction: column; - padding: var(--spacing-theme-container-padding); + min-height: 100vh; +} + +.site-frame { + flex: 1 0 auto; width: 60%; + padding: var(--spacing-theme-container-padding); margin: 0 auto; } .content { display: flex; flex-direction: column; + min-width: 0; } -body[layout_mode='fullscreen'] { - .wrapper { - display: block; - } - - .sidebar-left, - .sidebar-right { - display: none; - width: 0; - padding: 0; - } - - .container { +body[data-layout-mode='fullscreen'] { + .site-frame { width: 100%; - max-width: none !important; + max-width: none; } .content img, @@ -120,34 +104,25 @@ body[layout_mode='fullscreen'] { } } -body[table_full_width='true'] { +body[data-table-full-width='true'] { .content table { width: 100%; } } @media (max-width: 1024px) { - .sidebar-left, - .sidebar-right { - display: none; - } - - .container { + .site-frame { width: 100%; } } @media (max-width: 768px) { - .container { + .site-frame { padding: var(--spacing-theme-container-padding-mobile); } } @media print { - .container { - display: initial; - } - .content { display: initial; } diff --git a/src/styles/menu.scss b/src/styles/menu.scss index 647945b..036e5e0 100644 --- a/src/styles/menu.scss +++ b/src/styles/menu.scss @@ -68,10 +68,6 @@ } } - .spacer { - flex-grow: 1 !important; - } - .menu { display: flex; position: relative; @@ -93,8 +89,8 @@ .menu-trigger { all: unset; cursor: pointer; - background-color: var(--color-theme-background) !important; - margin-right: 0 !important; + background-color: var(--color-theme-background); + margin-right: 0; padding-left: calc(var(--size-theme-font) * 0.3125); padding-right: calc(var(--size-theme-font) * 0.3125); color: var(--color-theme-menu); @@ -105,7 +101,7 @@ @media (max-width: $phone-max-width) { padding-left: calc(var(--size-theme-font) * 0.625); padding-right: calc(var(--size-theme-font) * 0.625); - margin-bottom: 0 !important; + margin-bottom: 0; outline: none; -webkit-tap-highlight-color: transparent; } @@ -146,7 +142,7 @@ .sub-menu:hover .menu-dropdown, .sub-menu:active .menu-dropdown { - display: flex !important; + display: flex; opacity: 1; visibility: visible; } diff --git a/src/styles/portfolio.scss b/src/styles/portfolio.scss index 270475e..f82c3f7 100644 --- a/src/styles/portfolio.scss +++ b/src/styles/portfolio.scss @@ -48,8 +48,8 @@ .portfolio-item .post-title { font-size: calc(var(--size-theme-font) * 1.05); - margin-bottom: calc(var(--size-theme-font) * 0.5) !important; - padding-bottom: calc(var(--size-theme-font) * 0.5) !important; + margin-bottom: calc(var(--size-theme-font) * 0.5); + padding-bottom: calc(var(--size-theme-font) * 0.5); } .portfolio-item .post-meta { diff --git a/src/styles/post.scss b/src/styles/post.scss index 0aa8183..e620b46 100644 --- a/src/styles/post.scss +++ b/src/styles/post.scss @@ -43,10 +43,10 @@ .post-title { position: relative; color: var(--color-theme-title); - margin-top: 0 !important; - margin-bottom: calc(var(--size-theme-font) * 0.9375) !important; - padding-bottom: calc(var(--size-theme-font) * 0.9375) !important; - text-decoration: none !important; + margin-top: 0; + margin-bottom: calc(var(--size-theme-font) * 0.9375); + padding-bottom: calc(var(--size-theme-font) * 0.9375); + text-decoration: none; font-weight: 400; } @@ -84,10 +84,6 @@ color: inherit; } -.post-author { - -} - .post-tags { margin-bottom: calc(var(--size-theme-font) * 0.3125); font-size: inherit; diff --git a/src/styles/toc.scss b/src/styles/toc.scss index 8882e24..69f15d6 100644 --- a/src/styles/toc.scss +++ b/src/styles/toc.scss @@ -113,7 +113,7 @@ } } -body[layout_mode='fullscreen'] { +body[data-layout-mode='fullscreen'] { .toc.toc-visible { border: calc(var(--size-theme-font) * 0.0625) solid var(--color-theme-foreground); } diff --git a/templates/modules/layout.html b/templates/modules/layout.html index 4951d29..5db83ca 100644 --- a/templates/modules/layout.html +++ b/templates/modules/layout.html @@ -114,30 +114,20 @@ -
-