Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dillonzq
dillonzq committed Jan 29, 2020
2 parents 088975a + c8e612b commit e502374
Show file tree
Hide file tree
Showing 22 changed files with 255 additions and 413 deletions.
5 changes: 5 additions & 0 deletions assets/css/_page/_post.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,10 @@
@import "../_partial/_post/admonition";

.mermaid {
width: 100%;
margin: 3% auto;
text-align: center;

@import "../_mermaid/neutral/index";

.dark-theme & {
Expand All @@ -364,6 +368,7 @@
height: 0;
padding-bottom: 75%;
margin: 3% auto;
text-align: center;

iframe {
position: absolute;
Expand Down
117 changes: 60 additions & 57 deletions assets/css/_partial/_post/_code.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,11 @@ p > code {
background-color: darken($code-background-color-dark, 5%);
}
}
/* P */ .chroma .p { color: #A9A9B3 }
}

/* Keyword */ .k { color: #859900 }
.code {
/* Parentheses */ .p { color: #A9A9B3 }
/* Keyword */ .k { color: #859900 }
/* KeywordConstant */ .kc { color: #859900; font-weight: bold }
/* KeywordDeclaration */ .kd { color: #859900 }
/* KeywordNamespace */ .kn { color: #dc322f; font-weight: bold }
Expand Down Expand Up @@ -193,60 +195,61 @@ p > code {
.dark-theme & {
background: $code-background-color-dark;

/* Keyword */ .chroma .k { color: #D371E3 }
/* KeywordConstant */ .chroma .kc { color: #D371E3 }
/* KeywordDeclaration */ .chroma .kd { color: #D371E3 }
/* KeywordNamespace */ .chroma .kn { color: #D371E3 }
/* KeywordPseudo */ .chroma .kp { color: #D371E3 }
/* KeywordReserved */ .chroma .kr { color: #D371E3 }
/* KeywordType */ .chroma .kt { color: #8be9fd }
/* NameAttribute */ .chroma .na { color: #41B1F5 }
/* NameBuiltin */ .chroma .nb { color: #8be9fd; font-style: italic }
/* NameClass */ .chroma .nc { color: #E5BF78 }
/* NameFunction */ .chroma .nf { color: #19B8C0 }
/* NameX */ .chroma .nx { color: #F16473 }
/* NameLabel */ .chroma .nl { color: #8be9fd; font-style: italic }
/* NameTag */ .chroma .nt { color: #D371E3 }
/* NameVariable */ .chroma .nv { color: #8be9fd; font-style: italic }
/* NameVariableClass */ .chroma .vc { color: #8be9fd; font-style: italic }
/* NameVariableGlobal */ .chroma .vg { color: #8be9fd; font-style: italic }
/* NameVariableInstance */ .chroma .vi { color: #8be9fd; font-style: italic }
/* LiteralString */ .chroma .s { color: #8BC56F }
/* LiteralStringAffix */ .chroma .sa { color: #8BC56F }
/* LiteralStringBacktick */ .chroma .sb { color: #8BC56F }
/* LiteralStringChar */ .chroma .sc { color: #8BC56F }
/* LiteralStringDelimiter */ .chroma .dl { color: #8BC56F }
/* LiteralStringDoc */ .chroma .sd { color: #8BC56F }
/* LiteralStringDouble */ .chroma .s2 { color: #8BC56F }
/* LiteralStringEscape */ .chroma .se { color: #8BC56F }
/* LiteralStringHeredoc */ .chroma .sh { color: #8BC56F }
/* LiteralStringInterpol */ .chroma .si { color: #8BC56F }
/* LiteralStringOther */ .chroma .sx { color: #8BC56F }
/* LiteralStringRegex */ .chroma .sr { color: #8BC56F }
/* LiteralStringSingle */ .chroma .s1 { color: #8BC56F }
/* LiteralStringSymbol */ .chroma .ss { color: #8BC56F }
/* LiteralNumber */ .chroma .m { color: #bd93f9 }
/* LiteralNumberBin */ .chroma .mb { color: #bd93f9 }
/* LiteralNumberFloat */ .chroma .mf { color: #bd93f9 }
/* LiteralNumberHex */ .chroma .mh { color: #bd93f9 }
/* LiteralNumberInteger */ .chroma .mi { color: #bd93f9 }
/* LiteralNumberIntegerLong */ .chroma .il { color: #bd93f9 }
/* LiteralNumberOct */ .chroma .mo { color: #bd93f9 }
/* Operator */ .chroma .o { color: #D371E3 }
/* OperatorWord */ .chroma .ow { color: #D371E3 }
/* Comment */ .chroma .c { color: #7E848F }
/* CommentHashbang */ .chroma .ch { color: #7E848F }
/* CommentMultiline */ .chroma .cm { color: #7E848F }
/* CommentSingle */ .chroma .c1 { color: #7E848F }
/* CommentSpecial */ .chroma .cs { color: #7E848F }
/* CommentPreproc */ .chroma .cp { color: #D371E3 }
/* CommentPreprocFile */ .chroma .cpf { color: #D371E3 }
/* GenericDeleted */ .chroma .gd { color: #8b080b }
/* GenericEmph */ .chroma .ge { text-decoration: underline }
/* GenericHeading */ .chroma .gh { font-weight: bold }
/* GenericInserted */ .chroma .gi { font-weight: bold }
/* GenericOutput */ .chroma .go { color: #44475a }
/* GenericSubheading */ .chroma .gu { font-weight: bold }
/* GenericUnderline */ .chroma .gl { text-decoration: underline }
/* Parentheses */ .p { color: #A9A9B3 }
/* Keyword */ .k { color: #D371E3 }
/* KeywordConstant */ .kc { color: #D371E3 }
/* KeywordDeclaration */ .kd { color: #D371E3 }
/* KeywordNamespace */ .kn { color: #D371E3 }
/* KeywordPseudo */ .kp { color: #D371E3 }
/* KeywordReserved */ .kr { color: #D371E3 }
/* KeywordType */ .kt { color: #8be9fd }
/* NameAttribute */ .na { color: #41B1F5 }
/* NameBuiltin */ .nb { color: #8be9fd; font-style: italic }
/* NameClass */ .nc { color: #E5BF78 }
/* NameFunction */ .nf { color: #19B8C0 }
/* NameX */ .nx { color: #F16473 }
/* NameLabel */ .nl { color: #8be9fd; font-style: italic }
/* NameTag */ .nt { color: #D371E3 }
/* NameVariable */ .nv { color: #8be9fd; font-style: italic }
/* NameVariableClass */ .vc { color: #8be9fd; font-style: italic }
/* NameVariableGlobal */ .vg { color: #8be9fd; font-style: italic }
/* NameVariableInstance */ .vi { color: #8be9fd; font-style: italic }
/* LiteralString */ .s { color: #8BC56F }
/* LiteralStringAffix */ .sa { color: #8BC56F }
/* LiteralStringBacktick */ .sb { color: #8BC56F }
/* LiteralStringChar */ .sc { color: #8BC56F }
/* LiteralStringDelimiter */ .dl { color: #8BC56F }
/* LiteralStringDoc */ .sd { color: #8BC56F }
/* LiteralStringDouble */ .s2 { color: #8BC56F }
/* LiteralStringEscape */ .se { color: #8BC56F }
/* LiteralStringHeredoc */ .sh { color: #8BC56F }
/* LiteralStringInterpol */ .si { color: #8BC56F }
/* LiteralStringOther */ .sx { color: #8BC56F }
/* LiteralStringRegex */ .sr { color: #8BC56F }
/* LiteralStringSingle */ .s1 { color: #8BC56F }
/* LiteralStringSymbol */ .ss { color: #8BC56F }
/* LiteralNumber */ .m { color: #bd93f9 }
/* LiteralNumberBin */ .mb { color: #bd93f9 }
/* LiteralNumberFloat */ .mf { color: #bd93f9 }
/* LiteralNumberHex */ .mh { color: #bd93f9 }
/* LiteralNumberInteger */ .mi { color: #bd93f9 }
/* LiteralNumberIntegerLong */ .il { color: #bd93f9 }
/* LiteralNumberOct */ .mo { color: #bd93f9 }
/* Operator */ .o { color: #D371E3 }
/* OperatorWord */ .ow { color: #D371E3 }
/* Comment */ .c { color: #7E848F }
/* CommentHashbang */ .ch { color: #7E848F }
/* CommentMultiline */ .cm { color: #7E848F }
/* CommentSingle */ .c1 { color: #7E848F }
/* CommentSpecial */ .cs { color: #7E848F }
/* CommentPreproc */ .cp { color: #D371E3 }
/* CommentPreprocFile */ .cpf { color: #D371E3 }
/* GenericDeleted */ .gd { color: #8b080b }
/* GenericEmph */ .ge { text-decoration: underline }
/* GenericHeading */ .gh { font-weight: bold }
/* GenericInserted */ .gi { font-weight: bold }
/* GenericOutput */ .go { color: #44475a }
/* GenericSubheading */ .gu { font-weight: bold }
/* GenericUnderline */ .gl { text-decoration: underline }
}
}
10 changes: 5 additions & 5 deletions assets/css/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ $global-font-secondary-color-dark: #87878d !default;

$global-link-color: #161209 !default;
$global-link-color-dark: #a9a9b3 !default;
$global-link-hover-color:#2d96bd !default;
$global-link-hover-color-dark:#fff !default;
$global-link-hover-color: #2d96bd !default;
$global-link-hover-color-dark: #fff !default;

$global-border-color: #dcdcdc !default;
$global-border-color-dark: #4a4b50 !default;
Expand All @@ -39,12 +39,12 @@ $pagination-link-active-color: #000 !default;
$pagination-link-active-color-dark: #fff !default;

// Color of the table background.
$table-background-color: white !default;
$table-background-color-dark: #272C34 !default;
$table-background-color: #fff !default;
$table-background-color-dark: #272c34 !default;

// Color of the table thead.
$table-thead-color: #EDEDED !default;
$table-thead-color-dark: #20252B !default;
$table-thead-color-dark: #20252b !default;

// ========== Code ========== //
// Color of the code.
Expand Down
114 changes: 114 additions & 0 deletions assets/css/lib/aplayer/Aplayer.dark.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
.aplayer {
.dark-theme & {
background: #212121;

&.aplayer-withlist {
.aplayer-info {
border-bottom-color: #5c5c5c;
}
}

&.aplayer-fixed {
.aplayer-list {
border-color: #5c5c5c;
}
}

.aplayer-body {
background-color: #212121;
}

.aplayer-info {
border-top-color: #212121;
}

.aplayer-info {
.aplayer-music {
.aplayer-title {
color: #fff;
}

.aplayer-author {
color: #fff;
}
}

.aplayer-controller {
.aplayer-time {
color: #eee;

.aplayer-icon {
path {
fill: #eee;
}
}
}
}
}

.aplayer-list {
background-color: #212121;

&::-webkit-scrollbar-thumb {
background-color: #999;
}

&::-webkit-scrollbar-thumb:hover {
background-color: #bbb;
}

li {
color: #fff;
border-top-color: #666;

&:hover {
background: #4e4e4e;
}

&.aplayer-list-light {
background: #6c6c6c;
}

.aplayer-list-index {
color: #ddd;
}

.aplayer-list-author {
color: #ddd;
}
}
}

.aplayer-lrc {
text-shadow: -1px -1px 0 #666;

&:before {
background: -moz-linear-gradient(top, rgba(33,33,33,1) 0%, rgba(255,255,255,0) 100%);
background: -webkit-linear-gradient(top, rgba(33,33,33,1) 0%,rgba(255,255,255,0) 100%);
background: linear-gradient(to bottom, rgba(33,33,33,1) 0%,rgba(255,255,255,0) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#212121', endColorstr='#00212121',GradientType=0 );
}

&:after {
background: -moz-linear-gradient(top, rgba(255,255,255,0) 0%, rgba(33,33,33,0.8) 100%);
background: -webkit-linear-gradient(top, rgba(255,255,255,0) 0%,rgba(33,33,33,0.8) 100%);
background: linear-gradient(to bottom, rgba(255,255,255,0) 0%,rgba(33,33,33,0.8) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00212121', endColorstr='#cc212121',GradientType=0 );
}

p {
color: #fff;
}
}

.aplayer-miniswitcher {
background: #484848;

.aplayer-icon {
path {
fill: #eee;
}
}
}
}
}
3 changes: 2 additions & 1 deletion assets/css/style.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "_custom";
@import "_variables";

@import "_core/normalize";
Expand All @@ -12,3 +11,5 @@
@import "_partial/pagination";

@import "_core/media";

@import "_custom";
31 changes: 23 additions & 8 deletions assets/js/blog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jQuery(function($) {
_Blog.dynamicToTop = function() {
const min = 300;
var $toTop = $('#dynamic-to-top');
$(window).scroll(function() {
$(window).scroll(() => {
var scrollTop = $(window).scrollTop();
if (typeof document.body.style.maxHeight === 'undefined') {
$toTop.css({
Expand Down Expand Up @@ -103,7 +103,6 @@ jQuery(function($) {
&& (temp = newTocList.children[0].children[0]).tagName === 'UL') {
newTocList = temp;
}

if (newTocList !== oldTocList) toc.replaceChild(newTocList, oldTocList);
};

Expand Down Expand Up @@ -220,19 +219,33 @@ jQuery(function($) {
}
};

_Blog.mermaid = function() {
if (window.mermaidMap) {
const mermaidAPI = mermaid.mermaidAPI
Object.keys(mermaidMap).forEach((id) => {
const element = document.getElementById(id);
mermaidAPI.render("d" + id, mermaidMap[id], (svgCode) => {
element.innerHTML = svgCode;
const svg = element.firstChild;
svg.style.width = "100%"
}, element);
});
}
}

_Blog.echarts = function() {
if (window.echartsMap) {
for (let i = 0; i < echartsArr.length; i++) {
echartsArr[i].dispose();
}
echartsArr = [];
Object.keys(echartsMap).forEach(function(id) {
Object.keys(echartsMap).forEach((id) => {
let myChart = echarts.init(document.getElementById(id), window.isDark ? 'dark' : 'macarons', {renderer: 'svg'});
myChart.setOption(echartsMap[id]);
echartsArr.push(myChart);
});
window.addEventListener("resize", function() {
this.setTimeout(function(){
this.setTimeout(() => {
for (let i = 0; i < echartsArr.length; i++) {
echartsArr[i].resize();
}
Expand All @@ -256,15 +269,16 @@ jQuery(function($) {
if (window.typeitArr) {
for (let i = 0; i < typeitArr.length; i++) {
const group = typeitArr[i];
(function typeone (i) {
(function typeone(i) {
const content = document.getElementById(`r${group[i]}`).innerHTML;
if (i === group.length - 1) {
new TypeIt(`#${group[i]}`, {
strings: document.getElementById(`r${group[i]}`).innerHTML,
strings: content,
}).go();
return;
}
let instance = new TypeIt(`#${group[i]}`, {
strings: document.getElementById(`r${group[i]}`).innerHTML,
strings: content,
afterComplete: () => {
instance.destroy();
typeone(i + 1);
Expand All @@ -275,13 +289,14 @@ jQuery(function($) {
}
};

$(document).ready(function() {
$(document).ready(() => {
_Blog.toggleMobileMenu();
_Blog.toggleTheme();
_Blog.changeTitle();
_Blog.dynamicToTop();
_Blog.chroma();
_Blog.responsiveTable();
_Blog.mermaid();
_Blog.echarts();
_Blog.countdown();
_Blog.typeit();
Expand Down
Loading

0 comments on commit e502374

Please sign in to comment.