diff --git a/src/common/css/__less/meida.less b/src/common/css/__less/meida.less index 85ab355..744d371 100644 --- a/src/common/css/__less/meida.less +++ b/src/common/css/__less/meida.less @@ -3,22 +3,22 @@ **/ .choose(@type, @style) when (@type=xs){ - @media (max-width: 768px){ + @media (max-width: 767.9999px){ @style(); } } .choose(@type, @style) when (@type=sm){ - @media (max-width: 920px){ + @media (min-width: 768px) and (max-width: 991.9999px){ @style(); } } .choose(@type, @style) when (@type=md){ - @media (max-width: 1200px){ + @media (min-width: 992px) and (max-width: 1199.9999px) { @style(); } } .choose(@type, @style) when (@type=lg){ - @media (max-width: 1366px){ + @media (min-width: 1200px) { @style(); } } diff --git a/src/css/index/index.less b/src/css/index/index.less index ec44611..a416323 100644 --- a/src/css/index/index.less +++ b/src/css/index/index.less @@ -52,6 +52,7 @@ .motto{ text-align: center; font-size: 20px; + margin: 6px 0; } .panel{ diff --git a/src/html/__layout/layout.pug b/src/html/__layout/layout.pug index fac9ddd..8624b57 100644 --- a/src/html/__layout/layout.pug +++ b/src/html/__layout/layout.pug @@ -3,6 +3,11 @@ html(lang="zh-cn") head block title title #{title} + meta(name="description" content="一个简单的工具站,demo站") + meta(name="keyword" content="工具,博客,demo") + meta(name="author" content="温小鱼儿") + //- meta(name="viewport" content="width=device-width, initial-scale=1, user-scalable=no") + meta(name="viewport" content="width=800, initial-scale=1.0") include ../__include/head.pug block head body diff --git a/src/html/about.pug b/src/html/about.pug index 7bf9de3..c1bf025 100644 --- a/src/html/about.pug +++ b/src/html/about.pug @@ -5,4 +5,8 @@ block title - var title = "关于" block content - p 关于 \ No newline at end of file + .container.page + include __include/header + include __include/person + .line + p sadsadas \ No newline at end of file diff --git a/src/html/index.pug b/src/html/index.pug index ba5a4e5..88f54f1 100644 --- a/src/html/index.pug +++ b/src/html/index.pug @@ -10,4 +10,7 @@ block content include __include/header include __include/person .line - .motto.hidden-xs 衣带渐宽终不悔 \ No newline at end of file + .motto.hidden-xs 衣带渐宽终不悔 + .row + .col-lg-12.col-md-6.col-sm-6.card 1231 + .col-lg-12.col-md-6.col-sm-6.card 1231 \ No newline at end of file