diff --git a/_config.yml b/_config.yml index f5f83a7536..02fde2986a 100644 --- a/_config.yml +++ b/_config.yml @@ -402,7 +402,7 @@ reading_progress: # Available values: top | bottom position: top color: "#37c6c0" - height: 2px + height: 3px # Bookmark Support bookmark: diff --git a/layout/_layout.swig b/layout/_layout.swig index 8177f86600..dbb2df0a99 100644 --- a/layout/_layout.swig +++ b/layout/_layout.swig @@ -22,9 +22,7 @@
- {%- if theme.scheme === 'Pisces' or theme.scheme === 'Gemini' %} - {% include '_partials/header/sub-menu.swig' %} - {%- endif %} + {% include '_partials/header/sub-menu.swig' %}
{% block content %}{% endblock %}
diff --git a/layout/_partials/header/index.swig b/layout/_partials/header/index.swig index 9d656905c7..38e966915e 100644 --- a/layout/_partials/header/index.swig +++ b/layout/_partials/header/index.swig @@ -4,10 +4,6 @@ {%- if hasSearch %} diff --git a/layout/_partials/header/sub-menu.swig b/layout/_partials/header/sub-menu.swig index 64dcbdb3e7..24bdd17fc4 100644 --- a/layout/_partials/header/sub-menu.swig +++ b/layout/_partials/header/sub-menu.swig @@ -1,6 +1,6 @@ -{%- if theme.menu and not is_home() and not is_post() %} - {% import 'menu-item.swig' as menu_item with context %} +{% import 'menu-item.swig' as menu_item %} +{%- if theme.menu and is_page() %} {# Submenu & Submenu-2 #} {%- for name, value in theme.menu %} {%- set respath = value %} diff --git a/source/css/_common/outline/header/github-banner.styl b/source/css/_common/outline/header/github-banner.styl index 7d78dc13ea..42a433a9cf 100644 --- a/source/css/_common/outline/header/github-banner.styl +++ b/source/css/_common/outline/header/github-banner.styl @@ -27,6 +27,7 @@ position: absolute; right: 0; top: 0; + z-index: $zindex-0; } +tablet-mobile() { diff --git a/source/css/_common/outline/header/header.styl b/source/css/_common/outline/header/header.styl index 3baa551d21..087d3cb113 100644 --- a/source/css/_common/outline/header/header.styl +++ b/source/css/_common/outline/header/header.styl @@ -6,7 +6,6 @@ .header-inner { margin: 0 auto; - padding: 100px 0 70px; position: relative; width: $content-desktop; diff --git a/source/css/_schemes/Gemini/index.styl b/source/css/_schemes/Gemini/index.styl index a03e47d640..4859ebb5a8 100644 --- a/source/css/_schemes/Gemini/index.styl +++ b/source/css/_schemes/Gemini/index.styl @@ -112,18 +112,16 @@ $use-seo = hexo-config('seo'); box-shadow: $box-shadow-inner; // Adapt submenu(s) with post-blocks. - + .content { - .post-block { - box-shadow: $box-shadow; - margin-top: $sidebar-offset; - - +tablet() { - margin-top: $content-tablet-padding; - } - - +mobile() { - margin-top: $content-mobile-padding; - } + + .content .post-block { + box-shadow: $box-shadow; + margin-top: $sidebar-offset; + + +tablet() { + margin-top: $content-tablet-padding; + } + + +mobile() { + margin-top: $content-mobile-padding; } } } diff --git a/source/css/_schemes/Mist/_base.styl b/source/css/_schemes/Mist/_base.styl deleted file mode 100644 index f36b49b8a8..0000000000 --- a/source/css/_schemes/Mist/_base.styl +++ /dev/null @@ -1,10 +0,0 @@ -// Tags -// -------------------------------------------------- -a { - border-bottom-color: $grey-light; -} - -hr { - height: 2px; - margin: 20px 0; -} diff --git a/source/css/_schemes/Mist/_layout.styl b/source/css/_schemes/Mist/_layout.styl new file mode 100644 index 0000000000..8551ed5083 --- /dev/null +++ b/source/css/_schemes/Mist/_layout.styl @@ -0,0 +1,65 @@ +// Tags +// -------------------------------------------------- +a { + border-bottom-color: $grey-light; +} + +hr { + height: 2px; + margin: 20px 0; +} + +// Components +// -------------------------------------------------- +.btn { + border-radius: 0; + border-width: 2px; + padding: 0 10px; +} + +.headband { + display: none; +} + +// Page - Container +// -------------------------------------------------- +.main-inner { + padding-bottom: 80px; + + +mobile() { + width: auto; + } +} + +.content { + padding-top: 80px; +} + +// Pagination +// -------------------------------------------------- +.pagination { + margin: 120px 0 0; + text-align: left; + + +mobile() { + margin: 80px 10px 0; + text-align: center; + } +} + +// Footer +// -------------------------------------------------- +.footer { + background: $whitesmoke; + color: $grey-dim; + padding: 10px 0; +} + +.footer-inner { + text-align: left; + + +mobile() { + text-align: center; + width: auto; + } +} diff --git a/source/css/_schemes/Mist/index.styl b/source/css/_schemes/Mist/index.styl index 64effc0b41..2f7053ca8e 100644 --- a/source/css/_schemes/Mist/index.styl +++ b/source/css/_schemes/Mist/index.styl @@ -1,60 +1,9 @@ // // Mist scheme // ================================================== -@import '_base'; +@import '_layout'; @import '_header'; @import '_menu'; @import '_posts-expand'; @import '../Muse/_sidebar'; - -// Components -// -------------------------------------------------- -.btn { - border-radius: 0; - border-width: 2px; - padding: 0 10px; -} - -.headband { - display: none; -} - -// Page - Container -// -------------------------------------------------- -.main-inner { - padding-bottom: 80px; - padding-top: 80px; - - +mobile() { - width: auto; - } -} - -// Pagination -// -------------------------------------------------- -.pagination { - margin: 120px 0 0; - text-align: left; - - +mobile() { - margin: 80px 10px 0; - text-align: center; - } -} - -// Footer -// -------------------------------------------------- -.footer { - background: $whitesmoke; - color: $grey-dim; - padding: 10px 0; -} - -.footer-inner { - text-align: left; - - +mobile() { - text-align: center; - width: auto; - } -} +@import '../Muse/_sub-menu'; diff --git a/source/css/_schemes/Muse/_layout.styl b/source/css/_schemes/Muse/_layout.styl index 90776fc8e6..4cea849c29 100644 --- a/source/css/_schemes/Muse/_layout.styl +++ b/source/css/_schemes/Muse/_layout.styl @@ -5,8 +5,10 @@ } .header-inner { + padding-top: 100px; + +mobile() { - padding: 50px 0 35px; + padding-top: 50px; } } @@ -14,6 +16,14 @@ padding-bottom: 60px; } +.content { + padding-top: 70px; + + +mobile() { + padding-top: 35px; + } +} + embed { display: block; margin: 0 auto 25px auto; diff --git a/source/css/_schemes/Muse/_sub-menu.styl b/source/css/_schemes/Muse/_sub-menu.styl new file mode 100644 index 0000000000..59bf193432 --- /dev/null +++ b/source/css/_schemes/Muse/_sub-menu.styl @@ -0,0 +1,7 @@ +.sub-menu { + margin: 10px 0; + + .menu-item { + display: inline-block; + } +} diff --git a/source/css/_schemes/Muse/index.styl b/source/css/_schemes/Muse/index.styl index be5917d3d5..959b7ae7d4 100644 --- a/source/css/_schemes/Muse/index.styl +++ b/source/css/_schemes/Muse/index.styl @@ -1,4 +1,5 @@ @import '_layout'; @import '_header'; @import '_menu'; +@import '_sub-menu'; @import '_sidebar'; diff --git a/source/css/_schemes/Pisces/_sub-menu.styl b/source/css/_schemes/Pisces/_sub-menu.styl index 1fd996dae3..480187fc52 100644 --- a/source/css/_schemes/Pisces/_sub-menu.styl +++ b/source/css/_schemes/Pisces/_sub-menu.styl @@ -15,6 +15,12 @@ background: initial; color: $sidebar-highlight; } + + if (!hexo-config('menu_settings.badges')) { + &::after { + content: initial !important; + } + } } } @@ -27,11 +33,5 @@ background: white; border-bottom-color: $sidebar-highlight; } - - if (!hexo-config('menu_settings.badges')) { - &::after { - content: initial; - } - } } } diff --git a/source/css/_variables/base.styl b/source/css/_variables/base.styl index 82c8081b65..9a2ecb965a 100644 --- a/source/css/_variables/base.styl +++ b/source/css/_variables/base.styl @@ -106,11 +106,12 @@ $line-height-code-block = 1.6; // Can't be less than 1.3; // Z-index master list // -------------------------------------------------- -$zindex-1 = 100; -$zindex-2 = 200; -$zindex-3 = 300; -$zindex-4 = 400; -$zindex-5 = 500; +$zindex-0 = 1000 +$zindex-1 = 1100; +$zindex-2 = 1200; +$zindex-3 = 1300; +$zindex-4 = 1400; +$zindex-5 = 1500; // Table