diff --git a/.gitignore b/.gitignore index 3bf2c51..73e3d20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .DS_Store +*.DS_Store +*/.DS_Store node_modules /dist @@ -22,3 +24,4 @@ package-lock.json *.njsproj *.sln *.sw? +source/.DS_Store diff --git a/_config.yml b/_config.yml index c9cfabf..aa262bc 100644 --- a/_config.yml +++ b/_config.yml @@ -90,4 +90,6 @@ linksList: } #默认的cover (默认缩略图) 在没有填写（这里可以替换（可以是api也可以是固定的图）） -default_cover: http://eett.cc/pictures?type=pc&category=fengjing \ No newline at end of file +# https://api.ixiaowai.cn/gqapi/gqapi.php +# https://tuapi.eees.cc/api.php?type=302&category=fengjing +default_cover: https://api.ixiaowai.cn/gqapi/gqapi.php diff --git a/layout/.DS_Store b/layout/.DS_Store index 8906122..ad65053 100644 Binary files a/layout/.DS_Store and b/layout/.DS_Store differ diff --git a/layout/_partial/.DS_Store b/layout/_partial/.DS_Store index 412e290..29be9c0 100644 Binary files a/layout/_partial/.DS_Store and b/layout/_partial/.DS_Store differ diff --git a/layout/categories.ejs b/layout/categories.ejs index c5469aa..213f19d 100644 --- a/layout/categories.ejs +++ b/layout/categories.ejs @@ -7,7 +7,7 @@
<% site.categories.map(function(category,index){ %> <%= category.name %>
diff --git a/source/.DS_Store b/source/.DS_Store index 4e49709..b92e0ae 100644 Binary files a/source/.DS_Store and b/source/.DS_Store differ diff --git a/source/css/highlight/atom-one-dark.less b/source/css/highlight/atom-one-dark.less index de8bf08..086d7e1 100644 --- a/source/css/highlight/atom-one-dark.less +++ b/source/css/highlight/atom-one-dark.less @@ -23,7 +23,7 @@ hue-6-2: #e6c07b overflow-x: auto; padding: 0.5em; color: #abb2bf; - background: #282c34; + background: #292d3e; } .hljs-comment, diff --git a/source/css/pages/categories.less b/source/css/pages/categories.less index cf281ab..70ad7f6 100644 --- a/source/css/pages/categories.less +++ b/source/css/pages/categories.less @@ -3,11 +3,10 @@ .content-style(); &-data { display: flex; - width: 100%; flex-direction: column; - max-width: 800px; - padding: 64px 40px; + padding: 64px 80px; font-size: 18px; + transition: padding 1s; } } @@ -80,13 +79,19 @@ - - -@media screen and (max-width:600px) { - .article-content { - padding: 64px 16px; - .content { - font-size: 1.1em; +@media screen and (max-width:800px) { + .categories-content { + &-data{ + padding: 64px 50px; } } -} \ No newline at end of file +} + +@media screen and (max-width:600px) { + .categories-content { + &-data{ + padding: 64px 16px; + } + } +} + diff --git a/source/css/pages/links.less b/source/css/pages/links.less index 832ae79..1724206 100644 --- a/source/css/pages/links.less +++ b/source/css/pages/links.less @@ -3,10 +3,9 @@ .content-style(); &-data { display: flex; - max-width: 900px; width: 100%; box-sizing: border-box; - padding: 64px 40px; + padding: 64px 80px; font-size: 18px; justify-content: space-between; flex-wrap: wrap; @@ -20,7 +19,7 @@ padding: 20px; margin-right: 10px; border-radius: 10px; - margin-bottom: 50px; + margin-bottom: 20px; background: #ffffff; border: 1px solid #F8F9FB; cursor: pointer; diff --git a/source/css/pages/post.less b/source/css/pages/post.less index 9e24bc1..d0ff76a 100644 --- a/source/css/pages/post.less +++ b/source/css/pages/post.less @@ -50,8 +50,8 @@ display: flex; margin-top: 20px; margin-right: 16px; - padding: 4px 12px; - border-radius: 15px; + padding: 6px 14px; + border-radius: 4px; background: rgba(18,24,58,.06); line-height: 20px; -webkit-transition: background .5s; diff --git a/source/css/pages/tags.less b/source/css/pages/tags.less index fb58ba8..fc9af87 100644 --- a/source/css/pages/tags.less +++ b/source/css/pages/tags.less @@ -5,8 +5,7 @@ display: flex; width: 100%; box-sizing: border-box; - max-width: 900px; - padding: 64px 40px; + padding: 64px 80px; font-size: 1rem; flex-wrap: wrap; transition: all 0.4s ease-in-out; @@ -60,4 +59,21 @@ } } } -} \ No newline at end of file +} + + +@media screen and (max-width:800px) { + .tags-content { + &-data{ + padding: 64px 50px; + } + } +} + +@media screen and (max-width:600px) { + .tags-content { + &-data{ + padding: 64px 16px; + } + } +} \ No newline at end of file diff --git a/source/css/plugin/gitalk.css b/source/css/plugin/gitalk.css index 04f8747..9d50d25 100644 --- a/source/css/plugin/gitalk.css +++ b/source/css/plugin/gitalk.css @@ -1,8 +1,8 @@ #gitalk-container{ padding: 0px 80px; - max-width: 1000px; width: 100%; box-sizing: border-box; + margin: auto; } @media screen and (max-width: 800px) { diff --git a/source/css/public/article_cente.less b/source/css/public/article_cente.less index 1889e75..31fc10d 100644 --- a/source/css/public/article_cente.less +++ b/source/css/public/article_cente.less @@ -1,4 +1,16 @@ #article{ + h1, + h2, + h3, + h4, + h5, + h6 { + position: relative; + font-weight: 600; + outline: none; + color: #12183A; + cursor: pointer; + } h1 { font-size: 32px; font-weight: 900; @@ -18,59 +30,83 @@ margin: 20px 0 15px; } h3 { - font-size: 20px; - margin: 15px 0 10px; + padding: 24px 0; + font-size: 24px; } h4 { font-size: 19px; - margin: 15px 0 10px; + padding: 15px 0 10px; + } + h5 { + font-size: 18px; + padding: 15px 0 10px; } a { - color: #e06c75; - text-decoration: none; position: relative; - top: 0px; - transition: all .3s ease-in-out; - &:hover { - top: -4px; - } + color: #006aff; + text-decoration: none; + outline: 0; + cursor: pointer; + } + hr{ + margin: 24px 0 32px; + height: 4px; + border: none; + background: #F1F5FB; } code { - border-radius: 3px; + border-radius: 8px; li { list-style: none; } } - a{ - display: flex; - align-items: center; - justify-content: center; - width: 100%; - text-align: center; - } img { - max-width: 90%; - max-height: 400px; - border-radius: 5px; - box-shadow: 0 0 3px #c3c3c3; + width: 100%; cursor: pointer; - margin: 0 auto; + margin: 8px 0 0; text-align: center; + border-radius: 10px; + outline: none; + border: 0; } pre { - max-width: 722px; font-size: .85em; line-height: 1.5em; + display: flex; + max-width: 1000px; + position: relative; + &:after { + position: absolute; + left: 20px; + top: 30px; + width: 12px; + height: 12px; + border-radius: 50%; + background: #fc625d; + -webkit-box-shadow: 20px 0 #fdbc40, 40px 0 #35cd4b; + box-shadow: 20px 0 #fdbc40, 40px 0 #35cd4b; + content: ' '; + } code { - padding: 20px; + flex: 1; + text-align: left; + width: fit-content; + padding: 40px 20px 20px 20px; margin: 20px 0; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; } } - p { - margin-top: 6px; - line-height: 1.5em; - font-size: .95em; - letter-spacing: .7px; + p{ + display: block; + margin: 4px 0 16px; + line-height: 30px; + text-align: justify; + font-size: 18px; + color: #12183A; + box-sizing: border-box; } ol { padding: 10px 30px; @@ -84,6 +120,7 @@ li { list-style: none; margin: 10px 16px; + line-height: 30px; &:before { content: "\2022"; color: #006aff; @@ -97,21 +134,28 @@ } blockquote { background: #fafafa; - border-left: 5px solid #e0e2e5; - color: #aaa; - margin-top: 10px; - margin-bottom: 10px; - font-weight: 400; - text-indent: 1em; - font-size: 1em; - padding: 10px; + border-left: 4px solid #e0e2e5; + margin: 15px 0; + padding: 2px; + p{ + margin: 4px 20px; + font-weight: 400; + color: #898FA0; + font-size: 16px; + } } p code,ul li code { - background: #F3F4F4; - color: #f47466; font-size: 1em; - margin: 0 3px; - padding: 0 10px; + margin: 0 4px; + display: inline; + padding: 6px 8px; + font-family: Menlo, Consolas, "DejaVu Sans Mono", monospace; + color: #58586C; + background: #F1F5FB; + border-radius: 3px; + } + p strong{ + font-weight: bold; } table { width: 100%; diff --git a/source/css/public/content.less b/source/css/public/content.less index c1c0dae..d488098 100644 --- a/source/css/public/content.less +++ b/source/css/public/content.less @@ -6,7 +6,6 @@ background: #ffffff; border-radius: 10px; flex-direction: column; - align-items: center; } .content-move-style() { diff --git a/source/css/widget/grouping.less b/source/css/widget/grouping.less index f82a9da..f20e9ac 100644 --- a/source/css/widget/grouping.less +++ b/source/css/widget/grouping.less @@ -1,7 +1,7 @@ .grouping-style(){ display: flex; flex-direction: column; - width: 800px; + width: 900px; padding: 64px 40px; font-size: 1.1rem; transition: all 0.4s ease-in-out;