配色方案调整
This commit is contained in:
parent
905096ab1d
commit
2a821fce6a
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,5 +11,6 @@ public/
|
|||||||
themes/yilia/source/css/
|
themes/yilia/source/css/
|
||||||
themes/yilia/source/js/
|
themes/yilia/source/js/
|
||||||
themes/yilia/source/fonts/
|
themes/yilia/source/fonts/
|
||||||
|
themes/yilia/source/images/
|
||||||
themes/yilia/layout/_partial/css.ejs
|
themes/yilia/layout/_partial/css.ejs
|
||||||
themes/yilia/layout/_partial/script.ejs
|
themes/yilia/layout/_partial/script.ejs
|
||||||
@ -5,7 +5,7 @@
|
|||||||
<%- partial('post/date', {class_name: 'archive-article-date', date_format: null}) %>
|
<%- partial('post/date', {class_name: 'archive-article-date', date_format: null}) %>
|
||||||
</div>
|
</div>
|
||||||
<%- partial('post/title', {class_name: 'archive-article-title'}) %>
|
<%- partial('post/title', {class_name: 'archive-article-title'}) %>
|
||||||
<div class="article-info info-on-right">
|
<div class="article-info">
|
||||||
<%- partial('post/tag') %>
|
<%- partial('post/tag') %>
|
||||||
<%- partial('post/category') %>
|
<%- partial('post/category') %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -5,16 +5,16 @@
|
|||||||
<%
|
<%
|
||||||
var title = page.title;
|
var title = page.title;
|
||||||
if (is_archive()){
|
if (is_archive()){
|
||||||
title = 'Archives';
|
title = __('archives');
|
||||||
if (is_month()){
|
if (is_month()){
|
||||||
title += ': ' + page.year + '/' + page.month;
|
title += ': ' + page.year + '/' + page.month;
|
||||||
} else if (is_year()){
|
} else if (is_year()){
|
||||||
title += ': ' + page.year;
|
title += ': ' + page.year;
|
||||||
}
|
}
|
||||||
} else if (is_category()){
|
} else if (is_category()){
|
||||||
title = 'Category: ' + page.category;
|
title = __('category') + ': ' + page.category;
|
||||||
} else if (is_tag()){
|
} else if (is_tag()){
|
||||||
title = 'Tag: ' + page.tag;
|
title = __('tag') + ': ' + page.tag;
|
||||||
}
|
}
|
||||||
%>
|
%>
|
||||||
<meta name="renderer" content="webkit">
|
<meta name="renderer" content="webkit">
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
<ul class="article-tag-list">
|
<ul class="article-tag-list">
|
||||||
<% post.categories.forEach(function(category, i){ %>
|
<% post.categories.forEach(function(category, i){ %>
|
||||||
<li class="article-tag-list-item">
|
<li class="article-tag-list-item">
|
||||||
<a href="<%=url_for(category.path) %>" class="js-tag article-tag-list-link color<%= category.name.length % 5 + 1 %>"><%-category.name%></a>
|
<a href="<%=url_for(category.path) %>" class="js-tag article-tag-list-link color<%= category.name.length % 7 + 1 %>"><%-category.name%></a>
|
||||||
</li>
|
</li>
|
||||||
<% }) %>
|
<% }) %>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
<ul class="article-tag-list">
|
<ul class="article-tag-list">
|
||||||
<% post.tags.forEach(function(tag, i){ %>
|
<% post.tags.forEach(function(tag, i){ %>
|
||||||
<li class="article-tag-list-item">
|
<li class="article-tag-list-item">
|
||||||
<a href="<%= url_for(tag.path) %>" class="js-tag article-tag-list-link color<%= tag.name.length % 5 + 1 %>"><%-tag.name%></a>
|
<a href="<%= url_for(tag.path) %>" class="js-tag article-tag-list-link color<%= tag.name.length % 7 + 1 %>"><%-tag.name%></a>
|
||||||
</li>
|
</li>
|
||||||
<% }) %>
|
<% }) %>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@ -43,7 +43,7 @@
|
|||||||
<ul class="article-tag-list" v-show="showTags">
|
<ul class="article-tag-list" v-show="showTags">
|
||||||
<% site.tags.forEach(function(tag, i){ %>
|
<% site.tags.forEach(function(tag, i){ %>
|
||||||
<li class="article-tag-list-item">
|
<li class="article-tag-list-item">
|
||||||
<a href="javascript:void(0)" @click="chose('<%-tag.name%>','#')" class="js-tag color<%= tag.name.length % 5 + 1 %>"><%-tag.name%></a>
|
<a href="javascript:void(0)" @click="chose('<%-tag.name%>','#')" class="js-tag color<%= tag.name.length % 7 + 1 %>"><%-tag.name%></a>
|
||||||
</li>
|
</li>
|
||||||
<% }) %>
|
<% }) %>
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
@ -51,7 +51,7 @@
|
|||||||
<ul class="article-tag-list" v-show="showCategories">
|
<ul class="article-tag-list" v-show="showCategories">
|
||||||
<% site.categories.forEach(function(category, i){ %>
|
<% site.categories.forEach(function(category, i){ %>
|
||||||
<li class="article-tag-list-item">
|
<li class="article-tag-list-item">
|
||||||
<a href="javascript:void(0)" @click="chose('<%-category.name%>','$')" class="js-tag color<%= category.name.length % 5 + 1 %>"><%-category.name%></a>
|
<a href="javascript:void(0)" @click="chose('<%-category.name%>','$')" class="js-tag color<%= category.name.length % 7 + 1 %>"><%-category.name%></a>
|
||||||
</li>
|
</li>
|
||||||
<% }) %>
|
<% }) %>
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
|
|||||||
@ -16,12 +16,9 @@
|
|||||||
<% } %>
|
<% } %>
|
||||||
<div class="tag-cloud">
|
<div class="tag-cloud">
|
||||||
<%- tagcloud({
|
<%- tagcloud({
|
||||||
min_font: 16,
|
min_font: 20,
|
||||||
max_font: 35,
|
max_font: 35,
|
||||||
amount: 999,
|
amount: 999
|
||||||
color: true,
|
|
||||||
start_color: 'gray',
|
|
||||||
end_color: 'black',
|
|
||||||
}) %>
|
}) %>
|
||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
@ -4,6 +4,7 @@
|
|||||||
padding-right: 60px;
|
padding-right: 60px;
|
||||||
border-bottom: 1px solid #eee;
|
border-bottom: 1px solid #eee;
|
||||||
background: $colorBg;
|
background: $colorBg;
|
||||||
|
@extend %trans;
|
||||||
&:first-child{
|
&:first-child{
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
}
|
}
|
||||||
@ -35,6 +36,7 @@
|
|||||||
padding:20px 0;
|
padding:20px 0;
|
||||||
border-bottom: 1px solid #eee;
|
border-bottom: 1px solid #eee;
|
||||||
border-top: 1px solid #fff;
|
border-top: 1px solid #fff;
|
||||||
|
transition: border-color 0.2s ease-in;
|
||||||
position: relative;
|
position: relative;
|
||||||
&:first-child{
|
&:first-child{
|
||||||
border-top: none;
|
border-top: none;
|
||||||
@ -79,17 +81,10 @@
|
|||||||
min-height: 36px;
|
min-height: 36px;
|
||||||
}
|
}
|
||||||
.article-meta{
|
.article-meta{
|
||||||
position: relative;
|
position: absolute;
|
||||||
float: right;
|
top: 10px;
|
||||||
margin-top: -10px;
|
.article-date time{
|
||||||
color: #555;
|
color: $colorA;
|
||||||
background: none;
|
|
||||||
text-align: right;
|
|
||||||
width: auto;
|
|
||||||
.article-date{
|
|
||||||
time{
|
|
||||||
color: $colorA;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.archive-article-date, .article-tag-list{
|
.archive-article-date, .article-tag-list{
|
||||||
margin-right: 30px;
|
margin-right: 30px;
|
||||||
@ -101,9 +96,6 @@
|
|||||||
}
|
}
|
||||||
.archive-article-date{
|
.archive-article-date{
|
||||||
cursor: default;
|
cursor: default;
|
||||||
font-size: 12px;
|
|
||||||
margin-bottom: 5px;
|
|
||||||
margin-top: -10px;
|
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
}
|
}
|
||||||
.article-category{
|
.article-category{
|
||||||
|
|||||||
@ -49,9 +49,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.article-meta{
|
.article-meta{
|
||||||
width: 150px;
|
|
||||||
font-size: 14;
|
|
||||||
text-align: right;
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
top: 23px;
|
top: 23px;
|
||||||
@ -86,10 +83,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.article-info.info-on-right{
|
|
||||||
margin: 10px 0 0 0;
|
|
||||||
float: right;
|
|
||||||
}
|
|
||||||
.article-info-index.article-info{
|
.article-info-index.article-info{
|
||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
margin: 30px $articlePadding 0 $articlePadding;
|
margin: 30px $articlePadding 0 $articlePadding;
|
||||||
|
|||||||
@ -244,9 +244,6 @@ html, body, #container {
|
|||||||
top: -30px;
|
top: -30px;
|
||||||
color: #aaa;
|
color: #aaa;
|
||||||
}
|
}
|
||||||
.info-on-right{
|
|
||||||
float: initial;
|
|
||||||
}
|
|
||||||
.archives-wrap{
|
.archives-wrap{
|
||||||
margin: 10px 10px 0px;
|
margin: 10px 10px 0px;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
|
|||||||
@ -73,4 +73,8 @@ body.night {
|
|||||||
background: $mainBg_night;
|
background: $mainBg_night;
|
||||||
color: #bf7676;
|
color: #bf7676;
|
||||||
}
|
}
|
||||||
|
// 分类列表
|
||||||
|
.category-list li.category-list-item {
|
||||||
|
border-color: $borderColor_night;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -5,8 +5,12 @@
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin: 0 1em .5em 0;
|
margin: 0 1em .5em 0;
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
border: 1px solid #d3d3d3;
|
border: 1px solid $colorBorder;
|
||||||
font-size: 1.2rem;
|
font-size: 1.2rem;
|
||||||
|
@extend %trans;
|
||||||
|
&:hover {
|
||||||
|
background:rgba(204, 204, 204, 0.3);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.category-count {
|
.category-count {
|
||||||
@ -22,5 +26,21 @@
|
|||||||
a {
|
a {
|
||||||
margin: 0 20px;
|
margin: 0 20px;
|
||||||
word-break: keep-all;
|
word-break: keep-all;
|
||||||
|
position: relative;
|
||||||
|
&:hover::before {
|
||||||
|
width: 100%;
|
||||||
|
left: 0;
|
||||||
|
right: auto;
|
||||||
|
}
|
||||||
|
&::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
width: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
height: 2px;
|
||||||
|
background: $colorLink;
|
||||||
|
transition: width .3s ease;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -39,38 +39,20 @@
|
|||||||
left: 2px;
|
left: 2px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
a.color1{
|
// 标签背景色
|
||||||
background: #FF945C;
|
$tagcolorlist: #88acdb #ffa07a #f08080 #76becc #918597 #6fc0e4 #bc8f8f;
|
||||||
&::before{
|
|
||||||
border-right-color: #FF945C;
|
@for $index from 1 to length($tagcolorlist)+1 {
|
||||||
}
|
a.color#{$index}{
|
||||||
}
|
background: nth($tagcolorlist,$index);
|
||||||
a.color2{
|
&::before{
|
||||||
background: #cc8167;
|
border-right-color: nth($tagcolorlist,$index);
|
||||||
&::before{
|
}
|
||||||
border-right-color: #cc8167;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
a.color3{
|
|
||||||
background: #BA8F6C;
|
|
||||||
&::before{
|
|
||||||
border-right-color: #BA8F6C;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
a.color4{
|
|
||||||
background: #94635c;
|
|
||||||
&::before{
|
|
||||||
border-right-color:#94635c;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
a.color5{
|
|
||||||
background: #7B5D5F;
|
|
||||||
&::before{
|
|
||||||
border-right-color:#7B5D5F;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.article-tag-list{
|
.article-tag-list{
|
||||||
.article-tag-list-item{
|
.article-tag-list-item{
|
||||||
float: left;
|
float: left;
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB |
Loading…
x
Reference in New Issue
Block a user