saul365/LoveIt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Dillon
2020-01-30 11:44:21 +08:00
parent c8e612b888 eb1daf1619
commit 733416adaa
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
assets/css/lib/aplayer/Aplayer.dark.scss → assets/css/_aplayer/dark.scss
View File

@@ -83,16 +83,16 @@
text-shadow: -1px -1px 0 #666; text-shadow: -1px -1px 0 #666;
&:before { &:before {
background: -moz-linear-gradient(top, rgba(33,33,33,1) 0%, rgba(255,255,255,0) 100%); background: -moz-linear-gradient(top, rgba(33,33,33,1) 0%, rgba(33,33,33,0) 100%);
background: -webkit-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(33,33,33,0) 100%);
background: linear-gradient(to bottom, rgba(33,33,33,1) 0%,rgba(255,255,255,0) 100%); background: linear-gradient(to bottom, rgba(33,33,33,1) 0%,rgba(33,33,33,0) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#212121', endColorstr='#00212121',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#212121', endColorstr='#00212121',GradientType=0 );
} }
&:after { &:after {
background: -moz-linear-gradient(top, rgba(255,255,255,0) 0%, rgba(33,33,33,0.8) 100%); background: -moz-linear-gradient(top, rgba(33,33,33,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: -webkit-linear-gradient(top, rgba(33,33,33,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%); background: linear-gradient(to bottom, rgba(33,33,33,0) 0%,rgba(33,33,33,0.8) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00212121', endColorstr='#cc212121',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00212121', endColorstr='#cc212121',GradientType=0 );
} }

2
assets/css/_page/_post.scss
View File

@@ -355,6 +355,8 @@
} }
} }
@import "../_aplayer/dark.scss";
.echarts { .echarts {
width: 100%; width: 100%;
height: 30rem; height: 30rem;

4
layouts/partials/scripts.html
View File

@@ -96,8 +96,6 @@
{{ $res := resources.Get "css/lib/aplayer/APlayer.min.css" | resources.Minify }} {{ $res := resources.Get "css/lib/aplayer/APlayer.min.css" | resources.Minify }}
{{ $aplayer_css = printf "<link rel=\"stylesheet\" href=\"%s\">" $res.RelPermalink }} {{ $aplayer_css = printf "<link rel=\"stylesheet\" href=\"%s\">" $res.RelPermalink }}
{{ end }} {{ end }}
{{ $res := resources.Get "css/lib/aplayer/APlayer.dark.scss" | resources.ToCSS | resources.Minify }}
{{ $aplayer_dark_css := printf "<link rel=\"stylesheet\" href=\"%s\">" $res.RelPermalink }}
{{ $aplayer_js := "" }} {{ $aplayer_js := "" }}
{{ if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.aplayer_js }} {{ if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.aplayer_js }}
{{ $aplayer_js = .Site.Params.cdn.aplayer_js }} {{ $aplayer_js = .Site.Params.cdn.aplayer_js }}
@@ -105,7 +103,7 @@
{{ $res := resources.Get "js/lib/aplayer/APlayer.min.js" | resources.Minify }} {{ $res := resources.Get "js/lib/aplayer/APlayer.min.js" | resources.Minify }}
{{ $aplayer_js = printf "<script src=\"%s\"></script>" $res.RelPermalink }} {{ $aplayer_js = printf "<script src=\"%s\"></script>" $res.RelPermalink }}
{{ end }} {{ end }}
{{ $aplayer := delimit (slice $aplayer_css $aplayer_dark_css $aplayer_js) "" }} {{ $aplayer := delimit (slice $aplayer_css $aplayer_js) "" }}
<!-- MetingJS https://github.com/metowolf/MetingJS --> <!-- MetingJS https://github.com/metowolf/MetingJS -->
{{ $meting := "" }} {{ $meting := "" }}
{{ if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.meting_js }} {{ if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.meting_js }}

2
layouts/shortcodes/countdown.html
View File

@@ -8,5 +8,5 @@
{{ else -}} {{ else -}}
{{ .Page.Scratch.Set "countdownMap" $new -}} {{ .Page.Scratch.Set "countdownMap" $new -}}
{{ end -}} {{ end -}}
<div id="{{ $id }}"></div> <div id="{{ $id }}" style={{ .Get "style" | safeCSS }}></div>
{{ end -}} {{ end -}}

2
resources/_gen/assets/scss/css/style.scss_b95b077eb505d5c0aff8055eaced30ad.content
View File

File diff suppressed because one or more lines are too long