From 72e192a79513f8fbe02bda4f70923e1a51fef679 Mon Sep 17 00:00:00 2001 From: xaoxuu Date: Fri, 6 Sep 2019 00:55:04 +0800 Subject: [PATCH] update --- source/less/_base.less | 27 +++++++++++++++------------ source/less/_header.less | 5 +++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/source/less/_base.less b/source/less/_base.less index 1b67c92..f33a250 100755 --- a/source/less/_base.less +++ b/source/less/_base.less @@ -62,16 +62,18 @@ fancybox{ align-items: center; align-self: center; align-content: center; - padding: @gap; + // padding: @gap; .title, .logo{ - font-size: @fontsize_h1*3; - line-height: @fontsize_h1*3.3; + font-size: @fontsize_h1*2; margin-top: ~"calc(28vh - 2*@{gap})"; text-align: center; font-weight: bold; } + .title{ + line-height: ~"calc(@{fontsize_h1}*2 + 2*@{gap})"; + } .logo{ - max-height: 128px; + max-height: 100px; max-width: ~"calc(100% - 4*@{gap})"; } @media(max-width: @on_phone){ @@ -86,10 +88,10 @@ fancybox{ margin-top: ~"calc(2vh + 2*@{gap})"; position: relative; max-width: ~"calc(100% - 1*@{gap})"; - width: 1.1*@width_sidebar; - @media(max-width: @on_laptop){ - width: 1.2*@width_sidebar_m; - } + width: 340px; + // @media(max-width: @on_laptop){ + // width: 1.4*@width_sidebar_m; + // } line-height: @height_navbar - @gap; vertical-align: middle; .form { @@ -149,22 +151,23 @@ fancybox{ &.half{ height: ~"calc(60vh - @{gap} - @{height_navbar})"; .title, .logo{ - margin-top: ~"calc(20vh - 4*@{gap})"; + margin-top: ~"calc(22vh - 4*@{gap})"; } @media(max-width: @on_phone){ + height: ~"calc(45vh - @{gap} - @{height_navbar})"; .title, .logo{ - margin-top: ~"calc(32vh - 6*@{gap})"; + margin-top: ~"calc(24vh - 6*@{gap})"; } } .m_search{ - margin-top: 1vh; + margin-top: @gap; } } &, a{ color: @theme_main; } .menu{ - margin-top: 4vh; + margin-top: @gap; ul { display: flex; flex-wrap: wrap; diff --git a/source/less/_header.less b/source/less/_header.less index 38b11fd..c7fbba7 100755 --- a/source/less/_header.less +++ b/source/less/_header.less @@ -67,12 +67,12 @@ } .logo { - padding: 0 @gap; + padding: 0 @gap/2; line-height: @height_navbar; font-size: @fontsize_logo; font-family: @fontfamily_logo; @media(max-width: @on_phone){ - // flex: auto; + padding: 0 @gap; } &.img{ padding: 0 @gap 0 0; @@ -86,6 +86,7 @@ .nav-sub{ .logo { + padding: 0 @gap*1.5; font-size: @fontsize_base; font-family: @fontfamily_base; @media(max-width: @on_phone){