diff --git a/layout/includes/footer.pug b/layout/includes/footer.pug index fead0bd..c47f2ed 100644 --- a/layout/includes/footer.pug +++ b/layout/includes/footer.pug @@ -1,52 +1,33 @@ -#footer_deal - if theme.footer.footer_icons.enable - each i in theme.footer.footer_icons.left - if i.class == "in" - a.deal_link(href=`${i.link}`, title=`${i.desrc}`) - i(class=`${i.icon}`) - else if i.class == "out" - a.deal_link(target='_blank', rel='noopener external nofollow', href=`${i.link}`, title=`${i.desrc}`) - i(class=`${i.icon}`) - else - a.deal_link(href=`${i.link}`, title=`${i.desrc}`) - i(class=`${i.icon}`) - img.footer_mini_logo.entered.loading(title='返回顶部' onclick='btf.scrollToDest(0, 500)' src=`${theme.footer.footer_logo.url}` data-ll-status='loading') - if theme.footer.footer_icons.enable - each i in theme.footer.footer_icons.right - if i.class == "in" - a.deal_link(href=`${i.link}`, title=`${i.desrc}`) - i(class=`${i.icon}`) - else if i.class == "out" - a.deal_link(target='_blank', rel='noopener external nofollow', href=`${i.link}`, title=`${i.desrc}`) - i(class=`${i.icon}`) - else - a.deal_link(href=`${i.link}`, title=`${i.desrc}`) - i(class=`${i.icon}`) -#Jay-footer - each item in theme.footer.footer_group.footer_group_link - .footer-group - h3.footer-title=item.group_title - .footer-links - each i in item.footer_links - if i.class == "in" - a.footer-item(href=`${i.link}`)=i.text - else if i.class == "out" - a.footer-item(target='_blank', href=`${i.link}`)=i.text - else - a.footer-item(href=`${i.link}`)=i.text -#footer-banner - .footer-banner-links - .footer-banner-left - .footer-banner-left - #footer-banner-tips=`${theme.footer.text}` - - .footer-banner-right - a.footer-banner-link(href="https://hexo.io/zh-cn/" title="Hexo")=theme.footer.framework - a.footer-banner-link | - a.footer-banner-link(href="/archives/49841/" title="theme") 主题：Dynasty - a.footer-banner-link | - a.footer-banner-link(href="/about/" title="about") 关于 - a.footer-banner-link | - a.footer-banner-link.cc(href="/cc/" title="cc协议") - i.fab.fa-creative-commons - span 协议。 \ No newline at end of file +.footer + #in + .title + img(src=url_for(theme.footer.footer_logo.url) style='border-radius:100vh;box-shadow:0 8px 12px -3px #4259ef23') + .author + span.name=config.author + .descr=config.subtitle + if theme.footer.footer_icons.enable + .links + each i in theme.footer.footer_icons.icons + if i.class == "in" + a.deal_link(href=`${i.link}`, title=`${i.desrc}`) + i(class=`${i.icon}` style='font-size:25px') + else if i.class == "out" + a.deal_link(target='_blank', rel='noopener external nofollow', href=`${i.link}`, title=`${i.desrc}`) + i(class=`${i.icon}` style='font-size:25px') + else + a.deal_link(href=`${i.link}`, title=`${i.desrc}`) + i(class=`${i.icon}` style='font-size:25px') + about.about + a.footer-button(href="/about/" style='box-shadow:0 8px 12px -3px #ee7d7936;background:#F04A63;border-radius:100vh;') + i.dys.caozuo-wailian + span 了解更多 + a.footer-button(href="/cc/" style='box-shadow:0 8px 12px -3px #87ee7936;background:#57BD6A;border-radius:100vh;') + i.dys.creativecommons + span 转载协议 + div.frame + span HEXO + i.dys.heart-beat(style='font-size:20px') + span Dynasty + //- p(style="margin:5px 10px 5px 10px;height:20px") + a.active(href="https://cdnnb.cn") + img(src="https://img.shields.io/badge/本站由失控的防御系统提供加速防御支持-green?style=flat&logo=Claris") \ No newline at end of file diff --git a/layout/includes/head.pug b/layout/includes/head.pug index d8ff883..db8b1a0 100644 --- a/layout/includes/head.pug +++ b/layout/includes/head.pug @@ -40,7 +40,7 @@ if (theme.pwa && theme.pwa.enable) //- main css link(rel='stylesheet', href=url_for(theme.asset.main_css)) -link(rel='stylesheet', href=url_for(theme.asset.fontawesomeV6) media="print" onload="this.media='all'") +//- link(rel='stylesheet', href=url_for(theme.asset.fontawesomeV6) media="print" onload="this.media='all'") if (theme.snackbar && theme.snackbar.enable) link(rel='stylesheet', href=url_for(theme.asset.snackbar_css) media="print" onload="this.media='all'") @@ -55,7 +55,7 @@ if theme.fancybox !=partial('includes/head/analytics', {}, {cache: true}) //- font -if theme.blog_title_font &&　theme.blog_title_font.font_link +if theme.blog_title_font && theme.blog_title_font.font_link link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'") //- global config diff --git a/layout/includes/header/index.pug b/layout/includes/header/index.pug index aab6c6f..7867412 100644 --- a/layout/includes/header/index.pug +++ b/layout/includes/header/index.pug @@ -39,18 +39,7 @@ header#page-header(class=isHomeClass style=bg_img) use(href='#gentle-wave', x='48', y='3') use(href='#gentle-wave', x='48', y='5') use(href='#gentle-wave', x='48', y='7') - else if is_home() - //- #site-info - h1#site-title=site_title - if theme.subtitle.enable - - var loadSubJs = true - #site-subtitle - span#subtitle - if(theme.social) - #site_social_icons - !=fragment_cache('social', function(){return partial('includes/header/social')}) - #scroll-down - i.fas.fa-angle-down.scroll-down-effects + else if is_home() else #page-site-info h1#site-title=site_title \ No newline at end of file diff --git a/layout/includes/header/menu_item.pug b/layout/includes/header/menu_item.pug index a1744f7..ef69bea 100644 --- a/layout/includes/header/menu_item.pug +++ b/layout/includes/header/menu_item.pug @@ -1,12 +1,12 @@ if theme.nav.menu - .menus_items + .menus_items#menus-items each value, label in theme.nav.menu if typeof value !== 'object' .menus_item - const valueArray = value.split('||') a.site-page(href=url_for(trim(valueArray[0]))) if valueArray[1] - i.fa-fw(class=trim(valueArray[1])) + i(class=trim(valueArray[1])) span=' '+label else .menus_item @@ -14,14 +14,14 @@ if theme.nav.menu - const hideClass = labelArray[2] && trim(labelArray[2]) === 'hide' ? 'hide' : '' a.site-page.group(class=`${hideClass}` href='javascript:void(0);') if labelArray[1] - i.fa-fw(class=trim(labelArray[1])) + i(class=trim(labelArray[1])) span=' '+ trim(labelArray[0]) - i.fas.fa-chevron-down + i.dys.arrowdown ul.menus_item_child each val,lab in value - const valArray = val.split('||') li a.site-page.child(href=url_for(trim(valArray[0]))) if valArray[1] - i.fa-fw(class=trim(valArray[1])) + i(class=trim(valArray[1])) span=' '+ lab \ No newline at end of file diff --git a/layout/includes/header/nav.pug b/layout/includes/header/nav.pug index 8e5f68d..4c83c03 100644 --- a/layout/includes/header/nav.pug +++ b/layout/includes/header/nav.pug @@ -6,36 +6,45 @@ nav#nav span#blog_name a#site-name(href=url_for('/')) .title #[=theme.nav.title.title] - i.fa-solid.fa-house + i.dys.home else span#blog_name(style="margin-left:-5px;height:30px;width:30px") a#site-name(href=url_for('/')) img(src=url_for(theme.nav.title.title) style="width:30px;height:30px;border-radius:100vh;") - #toggle-menu(style='margin:auto;') + + .nav-menus#nav-menus + #toggle-menu(style='margin:0 10px 0 5px;') a.site-page(style='display:flex; align-items:center; height:35px;') - i.fas.fa-bars-progress.fa-fw + i.dys.apps(style='font-size: 25px;') | 菜单 - !=partial('includes/header/menu_item', {}, {cache: true}) + !=partial('includes/header/menu_item', {}, {cache: true}) + + .notebar#notebar a.link(href="https://travellings.cn/go.html" style='margin-right:10px') - i.fas.fa-bus + i.dys.tower(style='font-size: 22px;') + if (theme.algolia_search.enable || theme.local_search.enable) div.nav-button#search-button a.site-page.social-icon.search .search-button-text - i.fas.fa-search.fa-fw + i.dys.searchico(style='font-size:25px') //- span 搜索 else - div.nav-button - a.site-page.social-icon.search - .search-button-text - i.fas.fa-search.fa-fw - span 未开启 - - #buttons - a.link(onclick='showconsolebtn()') - i.fas.fa-gear.fa-spin + div.nav-button + a.site-page.social-icon.search + .search-button-text + i.dys.searchico(style='font-size:25px') + span 未开启 + //- div.nav-button + a.link(onclick='showconsolebtn()') + i.dys.apps(style='font-size: 26px;') + + #buttons.conbtn(onclick='btf.scrollToDest(0,500)') + a.link + i.dys.arrowup(style='font-size: 26px;') + span#percent diff --git a/layout/includes/header/post-info.pug b/layout/includes/header/post-info.pug index 92ae5b5..461015c 100644 --- a/layout/includes/header/post-info.pug +++ b/layout/includes/header/post-info.pug @@ -7,19 +7,19 @@ if (theme.post_meta.post.date_type) span.post-meta-date if (theme.post_meta.post.date_type === 'both') - i.far.fa-calendar-alt.fa-fw.post-meta-icon + i.dys.time.post-meta-icon span.post-meta-label= _p('post.created') time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))=date(page.date, config.date_format) span.post-meta-separator | - i.fas.fa-history.fa-fw.post-meta-icon + i.dys.shijianzhou.post-meta-icon span.post-meta-label= _p('post.updated') time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))=date(page.updated, config.date_format) else - let data_type_update = theme.post_meta.post.date_type === 'updated' - let date_type = data_type_update ? 'updated' : 'date' - - let date_icon = data_type_update ? 'fas fa-history' :'far fa-calendar-alt' + - let date_icon = data_type_update ? 'dys shijianzhou' :'dys time' - let date_title = data_type_update ? _p('post.updated') : _p('post.created') - i.fa-fw.post-meta-icon(class=date_icon) + i.post-meta-icon(class=date_icon) span.post-meta-label= date_title time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))=date(page[date_type], config.date_format) if (theme.post_meta.post.categories && page.categories.data.length > 0) @@ -28,10 +28,10 @@ span.post-meta-separator | each item, index in page.categories.data - i.fas.fa-inbox.fa-fw.post-meta-icon + i.dys.-disk.post-meta-icon a(href=url_for(item.path)).post-meta-categories #[=item.name] if (index < page.categories.data.length - 1) - i.fas.fa-angle-right.post-meta-separator + i.dys.arrow-right.post-meta-separator .meta-secondline - let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read) @@ -39,13 +39,13 @@ span.post-meta-separator | span.post-meta-wordcount if theme.wordcount.post_wordcount - i.far.fa-file-word.fa-fw.post-meta-icon + i.far.fa-file-word.post-meta-icon span.post-meta-label= _p('post.wordcount') + ':' span.word-count= wordcount(page.content) if theme.wordcount.min2read span.post-meta-separator | if theme.wordcount.min2read - i.far.fa-clock.fa-fw.post-meta-icon + i.far.fa-clock.post-meta-icon span.post-meta-label= _p('post.min2read') + ':' span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit') @@ -53,7 +53,7 @@ mixin pvBlock(parent_id,parent_class,parent_title) span.post-meta-separator | span(class=parent_class id=parent_id data-flag-title=page.title) - i.far.fa-eye.fa-fw.post-meta-icon + i.dys.view.post-meta-icon span.post-meta-label=_p('post.page_pv') + ':' if block block @@ -63,27 +63,27 @@ if commentUse[0] === 'Valine' && theme.valine.visitor +pvBlock(url_for(page.path),'leancloud_visitors',page.title) span.leancloud-visitors-count - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani else if commentUse[0] === 'Waline' && theme.waline.pageview +pvBlock('','','') span.waline-pageview-count(data-path=url_for(page.path)) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani else if commentUse[0] === 'Twikoo' && theme.twikoo.visitor +pvBlock('','','') span#twikoo_visitors - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani else if commentUse[0] === 'Artalk' && theme.artalk.visitor +pvBlock('','','') span#ArtalkPV - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani else if theme.busuanzi.page_pv +pvBlock('','post-meta-pv-cv','') span#busuanzi_value_page_pv - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani else if theme.busuanzi.page_pv +pvBlock('','post-meta-pv-cv','') span#busuanzi_value_page_pv - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani if comments.count && !comments.lazyload && page.comments !== false && comments.use - var whichCount = comments.use[0] @@ -91,7 +91,7 @@ mixin countBlock span.post-meta-separator | span.post-meta-commentcount - i.far.fa-comments.fa-fw.post-meta-icon + i.far.fa-comments.post-meta-icon span.post-meta-label= _p('post.comments') + ':' if block block @@ -101,32 +101,32 @@ +countBlock span.disqus-comment-count a(href=full_url_for(page.path) + '#disqus_thread') - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Disqusjs' +countBlock a(href=full_url_for(page.path) + '#disqusjs') span.disqus-comment-count(data-disqus-url=full_url_for(page.path)) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Valine' +countBlock a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl") span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount") - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Waline' +countBlock a(href=url_for(page.path) + '#post-comment') span.waline-comment-count(data-path=url_for(page.path)) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Gitalk' +countBlock a(href=url_for(page.path) + '#post-comment') span.gitalk-comment-count - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Twikoo' +countBlock a(href=url_for(page.path) + '#post-comment') span#twikoo-count - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Facebook Comments' +countBlock a(href=url_for(page.path) + '#post-comment') @@ -135,9 +135,9 @@ +countBlock a(href=url_for(page.path) + '#post-comment') span.remark42__counter(data-url=urlNoIndex()) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Artalk' +countBlock a(href=url_for(page.path) + '#post-comment') span.artalk-count - i.fa-solid.fa-spinner.fa-spin \ No newline at end of file + i.dys.spinner3.spin.ani \ No newline at end of file diff --git a/layout/includes/hometop.pug b/layout/includes/hometop.pug index e6de737..2330457 100644 --- a/layout/includes/hometop.pug +++ b/layout/includes/hometop.pug @@ -1,7 +1,5 @@ - var hometop = theme.hometop - var fposts = theme.hometop.featured_posts -- const { effect,loop,source,sub,startDelay,typeSpeed,backSpeed } = theme.hometop -- let subContent = subtitle || new Array() .hometop .hometopin @@ -10,7 +8,10 @@ .in span.title=hometop.title.title .subtitle - .swiper-container.sublist + - var loadSubJs = true + span#subtitle + span ▂ + //- .swiper-container.sublist .swiper-wrapper each item in hometop.subtitle .swiper-slide=`${item}` @@ -29,16 +30,17 @@ !=getarray_bar("category") a.category-bar-more(href=url_for(fposts.categroies_more_url)) 更多分类 .group1 - .recent-top-post-group#recent-top-post-group.hometop_item + include swiper.pug + //- .recent-top-post-group#recent-top-post-group.hometop_item .recent-post-top#recent-post-top .topGroup#topGroup if fposts.posts each i in fposts.posts - .recent-post-item#recent-post-item + .recent-post-item#recent-post-item(onclick=`pjax.loadUrl('${url_for(i.link)}')`) .post_cover.left_radius a(href=url_for(i.link), title=i.title) img.post_bg.entered.loaded(src=url_for(i.cover) onerror="this.onerror=null,this.src='/img/404.png'") - .recent-post-info(href=url_for(i.link)) + .recent-post-info a.article-title(href=url_for(i.link), title=i.title)= i.title if hometop.style === 1 .hometop-webinfo.hometop_item @@ -88,21 +90,4 @@ use(href='#gentle-wave', x='48', y='0') use(href='#gentle-wave', x='48', y='3') use(href='#gentle-wave', x='48', y='5') - use(href='#gentle-wave', x='48', y='7') - -- subContent = subContent.length ? subContent : new Array(config.subtitle) -//- script. - function subtitleType () { - if (!{effect}) { - window.typed = new Typed(".subtitle", { - strings: !{JSON.stringify(subContent)}, - startDelay: !{startDelay}, - typeSpeed: !{typeSpeed}, - loop: !{loop}, - backSpeed: !{backSpeed} - }) - } else { - document.getElementById("subtitle").innerHTML = '!{subContent[0]}' - } - } - subtitleType() \ No newline at end of file + use(href='#gentle-wave', x='48', y='7') \ No newline at end of file diff --git a/layout/includes/layout.pug b/layout/includes/layout.pug index d6c412a..7525637 100644 --- a/layout/includes/layout.pug +++ b/layout/includes/layout.pug @@ -7,16 +7,15 @@ doctype html html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside) head include ./head.pug - script(src='/js/fish.load.js') link(rel="stylesheet", href="/css/color.css") link(rel="stylesheet", href="https://cdn.jsdelivr.net/npm/element-ui@2.15.6/packages/theme-chalk/lib/index.css") - link(rel='preload' as='font' type='font/ttf' href='/font/alifangyuan.ttf' crossorigin='anonymous') + //- link(rel='preload' as='font' type='font/ttf' href='/font/alifangyuan.ttf' crossorigin='anonymous') link(rel="stylesheet", href="https://unpkg.com/swiper@8/swiper-bundle.min.css") - script(src=" https://cdn.jsdelivr.net/npm/jquery@3.7.0/dist/jquery.min.js") + script(src=" https://unpkg.com/jquery@3.7.0/dist/jquery.min.js") script(async='' src='/js/vue.min.js') script(async='' src='/js/element-ui.js') script(async='' data-pjax='' src="/js/scroll.js") - script(async='' data-pjax='' src="/js/vue-bar.js") + script(async='' data-pjax='' src="/js/vue-bar.js") body script(src="https://unpkg.com/swiper@8/swiper-bundle.min.js") if theme.preloader.enable @@ -43,6 +42,10 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside include widget/index.pug if (is_page()) block content + + + + else main#content-inner.layout(class=hideAside) if body @@ -63,8 +66,7 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside else - var footer_bg = '' - footer#footer(style=footer_bg) - !=partial('includes/footer', {}, {cache: true}) + !=partial('includes/footer', {}, {cache: true}) else include ./404.pug @@ -72,27 +74,25 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside include ./rightside.pug !=partial('includes/third-party/search/index', {}, {cache: true}) include ./additional-js.pug - .totopbutton(onclick="btf.scrollToDest(0,500)") - i.fas.fa-arrow-up - span#percent 0 - include ./waves.pug + .totopbutton#totopbtn(onclick="showconsolebtn()") + i #console-pannel #pannel .console-item .console-button(onclick='hideaside()') - i.fas.fa-arrows-alt-h + i.dys.server .text 侧栏隐显 .console-item .console-button(onclick='toggleTheme()') - i.fas.fa-adjust + i.dys.yueliang .text 暗色模式 .console-item .console-button(onclick='hidehometop()') - i.fas.fa-grip-vertical + i.dys.nail .text 顶部隐显 .console-item .console-button(onclick='toRandomPost()') - i.fas.fa-shuffle + i.dys.shuffle .text 随机文章 script(src="/js/custom.js") script(src="/js/random.js") \ No newline at end of file diff --git a/layout/includes/mixins/article-sort.pug b/layout/includes/mixins/article-sort.pug index 01e9ef2..0eed82e 100644 --- a/layout/includes/mixins/article-sort.pug +++ b/layout/includes/mixins/article-sort.pug @@ -14,7 +14,7 @@ mixin articleSort(posts) img(src=url_for(article.cover) alt=title onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'`) .article-sort-item-info .article-sort-item-time - i.far.fa-calendar-alt + i.dys.time time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))= date(article.date, config.date_format) a.article-sort-item-title(href=url_for(article.path) title=title)= title - }) \ No newline at end of file diff --git a/layout/includes/mixins/post-ui.pug b/layout/includes/mixins/post-ui.pug index 3ba2e4b..415b935 100644 --- a/layout/includes/mixins/post-ui.pug +++ b/layout/includes/mixins/post-ui.pug @@ -16,23 +16,23 @@ mixin postUI(posts) .article-meta-wrap if (is_home() && (article.top || article.sticky > 0)) span.article-meta - i.fas.fa-thumbtack.sticky + i.dys.nail span.sticky= _p('sticky') span.article-meta-separator | if (theme.post_meta.page.date_type) span.post-meta-date if (theme.post_meta.page.date_type === 'both') - i.far.fa-calendar-alt + i.dys.time span.article-meta-label=_p('post.created') time.post-meta-date-created(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date))=date(article.date, config.date_format) span.article-meta-separator | - i.fas.fa-history + i.dys.archives span.article-meta-label=_p('post.updated') time.post-meta-date-updated(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated))=date(article.updated, config.date_format) else - let data_type_updated = theme.post_meta.page.date_type === 'updated' - let date_type = data_type_updated ? 'updated' : 'date' - - let date_icon = data_type_updated ? 'fas fa-history' :'far fa-calendar-alt' + - let date_icon = data_type_updated ? 'fas fa-history' :'dys time' - let date_title = data_type_updated ? _p('post.updated') : _p('post.created') i(class=date_icon) span.article-meta-label=date_title @@ -40,7 +40,7 @@ mixin postUI(posts) if (theme.post_meta.page.categories && article.categories.data.length > 0) span.article-meta span.article-meta-separator | - i.fas.fa-inbox + i.dys.archives each item, index in article.categories.data a(href=url_for(item.path)).article-meta__categories #[=item.name] if (index < article.categories.data.length - 1) @@ -48,7 +48,7 @@ mixin postUI(posts) if (theme.post_meta.page.tags && article.tags.data.length > 0) span.article-meta.tags span.article-meta-separator | - i.fas.fa-tag + i.dys.tag each item, index in article.tags.data a(href=url_for(item.path)).article-meta__tags #[=item.name] if (index < article.tags.data.length - 1) @@ -58,7 +58,7 @@ mixin postUI(posts) - needLoadCountJs = true span.article-meta span.article-meta-separator | - i.fas.fa-comments + i.dys.comment if block block span.article-meta-label= ' ' + _p('card_post_count') @@ -68,26 +68,26 @@ mixin postUI(posts) when 'Disqus' +countBlockInIndex a(href=full_url_for(link) + '#disqus_thread') - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Disqusjs' +countBlockInIndex a(href=full_url_for(link) + '#disqusjs') span.disqus-comment-count(data-disqus-url=full_url_for(link)) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Valine' +countBlockInIndex a(href=url_for(link) + '#post-comment') span.valine-comment-count(data-xid=url_for(link)) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Waline' +countBlockInIndex a(href=url_for(link) + '#post-comment') span.waline-comment-count(id=url_for(link)) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Twikoo' +countBlockInIndex a.twikoo-count(href=url_for(link) + '#post-comment') - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Facebook Comments' +countBlockInIndex a(href=url_for(link) + '#post-comment') @@ -96,12 +96,12 @@ mixin postUI(posts) +countBlockInIndex a(href=url_for(link) + '#post-comment') span.remark42__counter(data-url=urlNoIndex(article.permalink)) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani when 'Artalk' +countBlockInIndex a(href=url_for(link) + '#post-comment') span.artalk-count(data-page-key=url_for(link)) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani if theme.ad && theme.ad.index if (index + 1) % 3 == 0 diff --git a/layout/includes/page/about.pug b/layout/includes/page/about.pug index 6d340b6..8560a83 100644 --- a/layout/includes/page/about.pug +++ b/layout/includes/page/about.pug @@ -48,25 +48,39 @@ .skills-style-group .tags-group-all .tags-group-wrapper - each i in site.data.creativity + //- each i in site.data.creativity - const evenNum = i.creativity_list.filter((x, index) => index % 2 === 0); - const oddNum = i.creativity_list.filter((x, index) => index % 2 === 1); each item, index in i.creativity_list if ((index+1 <= evenNum.length) && (index+1 <= oddNum.length)) - .tags-group-icon-pair - .tags-group-icon(style=`background: ${evenNum[index].color}`) - img.no-lightbox(title=evenNum[index].name, src=evenNum[index].icon) - .tags-group-icon(style=`background: ${oddNum[index].color}`) - img.no-lightbox(title=oddNum[index].name, src=oddNum[index].icon) - .skills-list - each i in site.data.creativity - each item, index in i.creativity_list - .skill-info - .skill-icon(style=`background: ${item.color}`) - img.no-lightbox(title=item.name, src=item.icon) - .skill-name - span=item.name - .etc ... + .tags-group-icon-pair + .tags-group-icon(style=`background: #b8f0ae`) + img.no-lightbox(title='vue', src='https://bu.dusays.com/2023/04/09/643293b6788bd.png') + .tags-group-icon(style=`background: #222`) + img.no-lightbox(title='React', src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii0xMS41IC0xMC4yMzE3NCAyMyAyMC40NjM0OCI+CiAgPHRpdGxlPlJlYWN0IExvZ288L3RpdGxlPgogIDxjaXJjbGUgY3g9IjAiIGN5PSIwIiByPSIyLjA1IiBmaWxsPSIjNjFkYWZiIi8+CiAgPGcgc3Ryb2tlPSIjNjFkYWZiIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiPgogICAgPGVsbGlwc2Ugcng9IjExIiByeT0iNC4yIi8+CiAgICA8ZWxsaXBzZSByeD0iMTEiIHJ5PSI0LjIiIHRyYW5zZm9ybT0icm90YXRlKDYwKSIvPgogICAgPGVsbGlwc2Ugcng9IjExIiByeT0iNC4yIiB0cmFuc2Zvcm09InJvdGF0ZSgxMjApIi8+CiAgPC9nPgo8L3N2Zz4K') + .tags-group-icon-pair + .tags-group-icon(style=`background: #57b6e6`) + img.no-lightbox(title='Docker', src='https://bu.dusays.com/2023/04/28/644bdead5d78f.webp') + .tags-group-icon(style=`background: #4082c3`) + img.no-lightbox(title='Photoshop', src='https://bu.dusays.com/2023/04/28/644bdead69ce6.webp') + .tags-group-icon-pair + .tags-group-icon(style=`background: #b8f0ae`) + img.no-lightbox(title='Node', src='https://npm.elemecdn.com/anzhiyu-blog@2.1.1/img/svg/node-logo.svg') + .tags-group-icon(style=`background: #000`) + img.no-lightbox(title='Python', src='https://bu.dusays.com/2023/04/28/644bdead6dc5f.webp') + .tags-group-icon-pair + .tags-group-icon(style=`background: #937df7`) + img.no-lightbox(title='vite', src='https://npm.elemecdn.com/anzhiyu-blog@2.0.8/img/svg/vite-logo.svg') + .tags-group-icon(style=`background: #2c51db`) + img.no-lightbox(title='css3', src='https://bu.dusays.com/2023/04/21/644284024536b.webp') + .tags-group-icon-pair + .tags-group-icon(style=`background: #f7cb4f`) + img.no-lightbox(title='JS', src='https://bu.dusays.com/2023/04/21/6442840245873.webp') + .tags-group-icon(style=`background: #e9572b`) + img.no-lightbox(title='HTML', src='https://bu.dusays.com/2023/04/21/6442840244ea8.webp') + .tags-group-icon-pair + .tags-group-icon(style=`background: #df5b40`) + img.no-lightbox(title='Git', src='https://bu.dusays.com/2023/04/21/6442840245495.webp') .author-content-item.careers .card-content .author-content-item-tips 生涯 @@ -80,8 +94,8 @@ .author-content .author-content-item.personalities .author-content-item-tips 人格 - span.author-content-item-title=`${theme.about_page.personalities}` - .title2(style='color:#ac899c') INTP-A + span.author-content-item-title=`${theme.about_page.personalities_name}` + .title2(style='color:#ac899c')=theme.about_page.personalities_type .post-tips | 在 a(href='https://www.16personalities.com/', target='_blank', rel='noopener nofollow') 16personalities @@ -129,22 +143,15 @@ .author-content-item-tips 致谢 span.author-content-item-title 赞赏名单 .author-content-item-description 感谢因为有你们，让我更加有创作的动力。 - each i in site.data.reward - - let rawData = [...i.reward_list] - .reward-list-all - - let reward_list_amount = i.reward_list.sort((a,b)=>b.amount - a.amount) - each item, index in reward_list_amount - .reward-list-item - .reward-list-item-name=item.name - .reward-list-bottom-group - if item.amount >= 50 - .reward-list-item-money(style='background:var(--anzhiyu-yellow)')=`¥${item.amount}` - else - .reward-list-item-money=`¥${item.amount + (item.suffix ? item.suffix : "")}` - .datatime.reward-list-item-time(datatime=item.datatime)=new Date(item.datatime).toISOString().slice(0, -14) - .reward-list-updateDate - | 最新更新时间： - time.datatime.reward-list-updateDate-time(datatime=rawData[0].datatime)=new Date(rawData[0].datatime).toISOString().slice(0, -14) + each item in theme.about_page.reward + .reward-list-item + .reward-list-item-name=item.name + .reward-list-bottom-group + if item.amount >= 50 + .reward-list-item-money(style='background:#FFC93E')=`¥${item.amount}` + else + .reward-list-item-money=`¥${item.amount + (item.suffix ? item.suffix : "")}` + .datatime.reward-list-item-time(datatime=item.datatime)=new Date(item.datatime).toISOString().slice(0, -14) script. (() => { diff --git a/layout/includes/pagination.pug b/layout/includes/pagination.pug index cc9c3ca..2a0b5f8 100644 --- a/layout/includes/pagination.pug +++ b/layout/includes/pagination.pug @@ -1,7 +1,7 @@ - var options = { - prev_text: '', - next_text: '', + prev_text: '', + next_text: '', mid_size: 1, escape: false } diff --git a/layout/includes/post/post-copyright.pug b/layout/includes/post/post-copyright.pug index 824f782..0cacf14 100644 --- a/layout/includes/post/post-copyright.pug +++ b/layout/includes/post/post-copyright.pug @@ -26,5 +26,5 @@ if theme.post_copyright.enable && page.copyright !== false h 许可协议 .post-copyright-cc-info a.icon(rel='noopener' target='_blank' title='Creative Commons' href='https://creativecommons.org/') - i.fab.fa-creative-commons + i.dys.creativecommons a(rel='noopener' target='_blank' title='CC BY 4.0' href='https://creativecommons.org/licenses/by/4.0/deed.zh') CC BY 4.0 \ No newline at end of file diff --git a/layout/includes/rightside.pug b/layout/includes/rightside.pug index 716f07d..8190809 100644 --- a/layout/includes/rightside.pug +++ b/layout/includes/rightside.pug @@ -20,7 +20,7 @@ mixin rightsideItem(array) when 'toc' if showToc button#mobile-toc-button.close(type="button" title=_p("rightside.toc")) - i.fas.fa-list-ul + i.dys.shujuwj //-when 'chat' if chat_btn button#chat_btn(type="button" title=_p("rightside.chat")) diff --git a/layout/includes/swiper.pug b/layout/includes/swiper.pug new file mode 100644 index 0000000..d486318 --- /dev/null +++ b/layout/includes/swiper.pug @@ -0,0 +1,26 @@ +- var fposts = theme.hometop.featured_posts + +.recent-post-item#swiperBar(style='border:none!important;') + #ark-swiper-container + .swiper-wrapper.dht-swiper-wrapper + each item, i in fposts.posts + //- 内容版块 + .swiper-slide.dht-swiper-item(onclick=`pjax.loadUrl('${url_for(item.link)}')`) + //- 封面 + .dht-swiper-item-cover(onclick=`pjax.loadUrl('${url_for(item.link)}')`) + img.article-cover(src=item.cover title='') + //- 标题和描述 + .dht-swiper-item-info(onclick=`pjax.loadUrl('${url_for(item.link)}')`) + a.dht-swiper-item-title + .dht-swiper-item-title-link= item.title + a.dht-swiper-item-description + .dht-swiper-item-description-text=item.descr + .swiper-scrollbar + .swiper-button-prev + .swiper-button-next + + style. + #ark-swiper-container .swiper-scrollbar-drag { + background: linear-gradient(to left, #ff4500, #ffa500, #ffd700, #90ee90, #0ff, #1e90ff, #9370db, #ff69b4, #ff4500); + box-shadow: 0 0 0 2px #fff + } \ No newline at end of file diff --git a/layout/includes/third-party/comments/index.pug b/layout/includes/third-party/comments/index.pug index 0821ae5..d2c048c 100644 --- a/layout/includes/third-party/comments/index.pug +++ b/layout/includes/third-party/comments/index.pug @@ -3,7 +3,7 @@ hr #post-comment .comment-head .comment-headline - i.fas.fa-comments.fa-fw + i.fas.fa-comments. span= ' ' + _p('comment') if theme.comments.use.length > 1 diff --git a/layout/includes/third-party/search/local-search.pug b/layout/includes/third-party/search/local-search.pug index 895a478..cd5df66 100644 --- a/layout/includes/third-party/search/local-search.pug +++ b/layout/includes/third-party/search/local-search.pug @@ -6,7 +6,7 @@ i.fas.fa-times #loading-database.is-center - i.fas.fa-spinner.fa-pulse + i.dys.spinner3.spin.ani.fa-pulse span= ' ' + _p("search.load_data") .search-wrap diff --git a/layout/includes/third-party/subtitle.pug b/layout/includes/third-party/subtitle.pug index 9236757..cc145d6 100644 --- a/layout/includes/third-party/subtitle.pug +++ b/layout/includes/third-party/subtitle.pug @@ -1,128 +1,36 @@ - const { effect,loop,source,sub,startDelay,typeSpeed,backSpeed } = theme.subtitle - let subContent = sub || new Array() - -case source - when 1 - script. - function subtitleType () { - fetch('https://v1.hitokoto.cn') - .then(response => response.json()) - .then(data => { - if (!{effect}) { - const from = '出自 ' + data.from - const sub = !{JSON.stringify(subContent)} - sub.unshift(data.hitokoto, from) - window.typed = new Typed('#subtitle', { - strings: sub, - startDelay: !{startDelay}, - typeSpeed: !{typeSpeed}, - loop: !{loop}, - backSpeed: !{backSpeed}, - }) - } else { - document.getElementById('subtitle').innerHTML = data.hitokoto - } - }) - } - - if (!{effect}) { - if (typeof Typed === 'function') { - subtitleType() - } else { - getScript('!{url_for(theme.asset.typed)}').then(subtitleType) - } - } else { - subtitleType() - } - - when 2 - script. - function subtitleType () { - getScript('https://yijuzhan.com/api/word.php?m=js').then(() => { - const con = str[0] - if (!{effect}) { - const from = '出自 ' + str[1] - const sub = !{JSON.stringify(subContent)} - sub.unshift(con, from) - window.typed = new Typed('#subtitle', { - strings: sub, - startDelay: !{startDelay}, - typeSpeed: !{typeSpeed}, - loop: !{loop}, - backSpeed: !{backSpeed}, - }) - } else { - document.getElementById('subtitle').innerHTML = con - } - }) - } - - if (!{effect}) { - if (typeof Typed === 'function') { - subtitleType() - } else { - getScript('!{url_for(theme.asset.typed)}').then(subtitleType) - } - } else { - subtitleType() - } - - when 3 - script. - function subtitleType () { - getScript('https://sdk.jinrishici.com/v2/browser/jinrishici.js').then(() => { - jinrishici.load(result =>{ - if (!{effect}) { - const sub = !{JSON.stringify(subContent)} - const content = result.data.content - sub.unshift(content) - window.typed = new Typed('#subtitle', { - strings: sub, - startDelay: !{startDelay}, - typeSpeed: !{typeSpeed}, - loop: !{loop}, - backSpeed: !{backSpeed}, - }) - } else { - document.getElementById('subtitle').innerHTML = result.data.content - } - }) - }) - } - - if (!{effect}) { - if (typeof Typed === 'function') { - subtitleType() - } else { - getScript('!{url_for(theme.asset.typed)}').then(subtitleType) - } - } else { - subtitleType() - } - - default - - subContent = subContent.length ? subContent : new Array(config.subtitle) - script. - function subtitleType () { - if (!{effect}) { - window.typed = new Typed("#subtitle", { - strings: !{JSON.stringify(subContent)}, - startDelay: !{startDelay}, - typeSpeed: !{typeSpeed}, - loop: !{loop}, - backSpeed: !{backSpeed} - }) - } else { - document.getElementById("subtitle").innerHTML = '!{subContent[0]}' - } - } - - if (!{effect}) { - if (typeof Typed === 'function') { - subtitleType() - } else { - getScript('!{url_for(theme.asset.typed)}').then(subtitleType) - } - } else { - subtitleType() - } +- subContent = subContent.length ? subContent : new Array(config.subtitle) +//- script. + function subtitleType () { + if (!{effect}) { + window.typed = new Typed("#subtitle", { + strings: !{JSON.stringify(subContent)}, + startDelay: 10, + typeSpeed: 80, + loop: !{loop}, + showCursor: false, + backSpeed: 70 + }) + } + } + if (!{effect}) { + if (typeof Typed === 'function') { + subtitleType() + } else { + getScript('!{url_for(theme.asset.typed)}').then(subtitleType) + } + } + +script(src="/js/typed.js") +script. + var typed = new Typed("#subtitle", { + strings: !{JSON.stringify(subContent)}, + startDelay: 10, + typeSpeed: 80, + loop: !{loop}, + showCursor: false, + backSpeed: 70 + }); + +//- !{JSON.stringify(subContent)} \ No newline at end of file diff --git a/layout/includes/widget/card_author.pug b/layout/includes/widget/card_author.pug index 49a4b50..7b1fbda 100644 --- a/layout/includes/widget/card_author.pug +++ b/layout/includes/widget/card_author.pug @@ -7,9 +7,10 @@ if theme.aside.card_author.enable .avatar-img img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar") .loading-image-dot + img(src="https://pic.imgdb.cn/item/65032bf5661c6c8e542969ff.webp", alt="") .banner-button-group a.banner-button(href="/about/") - i.fas.fa-circle-chevron-right + i.dys.caozuo-wailian span.banner-button-te xt 了解更多 hrl.line(style="margin-top: 10px") \ No newline at end of file diff --git a/layout/includes/widget/card_post_toc.pug b/layout/includes/widget/card_post_toc.pug index dcd4d93..7995870 100644 --- a/layout/includes/widget/card_post_toc.pug +++ b/layout/includes/widget/card_post_toc.pug @@ -4,12 +4,11 @@ #card-toc.card-widget .item-headline - i.fas.fa-stream + i.dys.categroy span= _p('aside.card_toc') span.toc-percentage if (page.encrypt == true) .toc-content.toc-div-class(class=tocExpandClass style="display:none")!=toc(page.origin, {list_number: tocNumber}) else - .toc-content(class=tocExpandClass)!=toc(page.content, {list_number: tocNumber}) -hrl.line \ No newline at end of file + .toc-content(class=tocExpandClass)!=toc(page.content, {list_number: tocNumber}) \ No newline at end of file diff --git a/layout/includes/widget/card_tags.pug b/layout/includes/widget/card_tags.pug index 7490fc7..b345dbb 100644 --- a/layout/includes/widget/card_tags.pug +++ b/layout/includes/widget/card_tags.pug @@ -2,7 +2,7 @@ if theme.aside.card_tags.enable if site.tags.length .card-widget.card-tags .item-headline - i.fas.fa-tags + i.dys.tag span= _p('aside.card_tags') - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40 @@ -10,12 +10,10 @@ if theme.aside.card_tags.enable .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.15, maxfontsize: 1.45, limit: tagLimit, unit: 'em'}) else .card-tag-cloud!= tagcloud({min_font: 1.1, max_font: 1.5, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'}) - hrl.line if theme.aside.card_categories.enable if site.categories.length .card-widget.card-categories !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 , expand: theme.aside.card_categories.expand }) - hrl.line if theme.aside.card_archives.enable .card-widget.card-archives - let type = theme.aside.card_archives.type || 'monthly' diff --git a/layout/includes/widget/card_webinfo.pug b/layout/includes/widget/card_webinfo.pug index 105b0a0..f9d04c3 100644 --- a/layout/includes/widget/card_webinfo.pug +++ b/layout/includes/widget/card_webinfo.pug @@ -1,32 +1,32 @@ .card-widget.card-webinfo - .item-headline - i.fas.fa-chart-line.fa-bounce + .item-headline(style='width:fit-content;margin:auto;') + i.dys.shujukanban(style='font-size:20px;margin-right:5px') span= _p('aside.card_webinfo.headline') .webinfo .webinfo-item .item-name - i.fas.fa-folder-open.fa-beat + i.dys.-disk(style='font-size:20px') .text 文章总数 .item-count= site.posts.length .webinfo-item .item-name - i.fas.fa-eye.fa-shake + i.dys.view(style='font-size:20px') .text 总访问量 .item-count#busuanzi_value_site_pv .webinfo-item .item-name - i.fas.fa-user.fa-shake + i.dys.groupico(style='font-size:20px') .text 访问人次 .item-count#busuanzi_value_site_uv .webinfo-item .item-name - i.fas.fa-pen-to-square.fa-beat + i.dys.postico(style='font-size:20px') .text 全站字数 .item-count=totalcount(site) .webinfo-item .item-name - i.fas.fa-upload.fa-shake + i.dys.upload(style='font-size:20px') .text 最后更新 .item-count#last-push-date(data-lastPushDate=date_xml(Date.now())) - i.fa-solid.fa-spinner.fa-spin + i.dys.spinner3.spin.ani diff --git a/layout/includes/widget/index.pug b/layout/includes/widget/index.pug index a89c1a6..90e731f 100644 --- a/layout/includes/widget/index.pug +++ b/layout/includes/widget/index.pug @@ -14,7 +14,7 @@ else #card-toc.card-widget .item-headline - i.fas.fa-stream + i.dys.categroy span 抱歉，该文章无目录 hrl.line !=partial('includes/widget/card_tags', {}, {cache: true}) diff --git a/scripts/helpers/aside_archives.js b/scripts/helpers/aside_archives.js index 779c1d4..466e67a 100644 --- a/scripts/helpers/aside_archives.js +++ b/scripts/helpers/aside_archives.js @@ -69,7 +69,7 @@ hexo.extend.helper.register('aside_archives', function (options = {}) { const len = data.length const Judge = limit === 0 ? len : Math.min(len, limit) - result += `
${this._p('aside.card_archives')}` + result += `
${this._p('aside.card_archives')}` if (len > Judge) { result += ` diff --git a/scripts/helpers/aside_categories.js b/scripts/helpers/aside_categories.js index 0e60b8e..3ac327d 100644 --- a/scripts/helpers/aside_categories.js +++ b/scripts/helpers/aside_categories.js @@ -87,7 +87,7 @@ hexo.extend.helper.register('aside_categories', function (categories, options) { } return `
- + ${this._p('aside.card_categories')} ${moreButton()}
diff --git a/scripts/helpers/random.js b/scripts/helpers/random.js index 47c8f55..8a4e3ae 100644 --- a/scripts/helpers/random.js +++ b/scripts/helpers/random.js @@ -9,19 +9,7 @@ hexo.extend.generator.register('random', function (locals) { data: `var posts=${JSON.stringify(posts)}; function toRandomPost() { window.open('/'+posts[Math.floor(Math.random() * posts.length)],"_self"); - new Vue({ - data: function () { - this.$notify({ - title: "跳转中", - message: "前往随机文章", - position: 'top-left', - offset: 50, - showClose: true, - type: "success", - duration: 4000 - }); - } - }); + nav.randompost() };` } }) \ No newline at end of file diff --git a/scripts/helpers/related_post.js b/scripts/helpers/related_post.js index 6809ac7..c6f3671 100644 --- a/scripts/helpers/related_post.js +++ b/scripts/helpers/related_post.js @@ -46,7 +46,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { if (relatedPosts.length > 0) { result += '
' - result += `
${headlineLang}
` + result += `
${headlineLang}
` result += '
' for (let i = 0; i < Math.min(relatedPosts.length, limitNum); i++) { @@ -58,9 +58,9 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) { result += `
` result += `cover` if (dateType === 'created') { - result += `
${this.date(relatedPosts[i].created, hexoConfig.date_format)}
` + result += `
${this.date(relatedPosts[i].created, hexoConfig.date_format)}
` } else { - result += `
${this.date(relatedPosts[i].updated, hexoConfig.date_format)}
` + result += `
${this.date(relatedPosts[i].updated, hexoConfig.date_format)}
` } result += `
${title}
` result += '
' diff --git a/source/css/_custom/about.css b/source/css/_custom/about.css index 4476beb..8cd8685 100644 --- a/source/css/_custom/about.css +++ b/source/css/_custom/about.css @@ -1233,12 +1233,6 @@ transform: translateX(-50%); } } -.author-content-item.skills:hover .skills-style-group .tags-group-all { - opacity: 0; -} -.author-content-item.skills:hover .skills-style-group .skills-list { - opacity: 1; -} .site-card-group .site-card .info { margin-top: 0; diff --git a/source/css/_custom/waves.css b/source/css/_custom/animations.css similarity index 86% rename from source/css/_custom/waves.css rename to source/css/_custom/animations.css index 94efa42..4baa5e9 100644 --- a/source/css/_custom/waves.css +++ b/source/css/_custom/animations.css @@ -5,7 +5,7 @@ position: relative; bottom: -11px; top: 12px; - z-index: 5; + z-index: 0; } .waves-area .waves-svg { width: 100%; @@ -69,4 +69,19 @@ .post-bg .main-hero-waves-area { top: 470px !important; +} + +/* 旋转动画-class-spin */ +@keyframes rotate { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(1turn); + } +} + +.spin { + display: block; + animation: rotate 2s linear infinite; } \ No newline at end of file diff --git a/source/css/_custom/aside.css b/source/css/_custom/aside.css index 3c90f1e..ae95374 100644 --- a/source/css/_custom/aside.css +++ b/source/css/_custom/aside.css @@ -1,13 +1,13 @@ #aside-content .card-widget { - background: transparent !important; box-shadow: unset !important; + border: 1px solid var(--border); } /* 作者打招呼 */ div#author-info__sayhi { text-align: left; color: var(--heo-font); - background: var(--heo-white-op); + background: var(--heo-white); font-size: 12px; margin-right: auto; padding: 2px 8px; @@ -115,6 +115,7 @@ div#author-info__sayhi { display: flex; align-items: center; z-index: 1; + background-color: var(--heo-background); transition: 0.3s; cursor: pointer; } diff --git a/source/css/_custom/console.styl b/source/css/_custom/console.styl index 86e03c7..2f8bfeb 100644 --- a/source/css/_custom/console.styl +++ b/source/css/_custom/console.styl @@ -23,10 +23,12 @@ color: var(--heo-font) #console-pannel + scale: 0 position: fixed - top: -100px + top: calc(50% - (190px/2)) + z-index 10 display: block - transition: top .5s + transition: .2s color: #fff width: 100% height: fit-content @@ -35,11 +37,25 @@ #pannel max-width: 410px align-items: center - display flex + background: #000000b5 + display grid + grid-template-columns: repeat(2, 1fr) + grid-template-rows: repeat(2, 1fr) + grid-gap: 50px + width fit-content justify-content: center margin: auto - border-radius: 100vh + border-radius: 20px padding: 10px + &::after + content: ''; + left: calc(50% - (45px / 2)); + position: absolute; + border-radius: 100vh; + background: #fff; + height: 45px; + box-shadow: 0 0 0 5px rgba(255,255,255,.22), inset 0 0 0 5px #aaa; + width: 45px; #console-pannel .console-item .console-button display: flex @@ -53,15 +69,15 @@ display flex align-items: center margin: 0 1% - background: #0006 border-radius: 20px justify-content: center - backdrop-filter: blur(20px) saturate(180%) - -webkit-backdrop-filter: blur(20px) saturate(180%) #console-pannel .console-item .console-button i font-size: 25px - flex: 1 + height 40px + display: flex + align-items: center + justify-content: center #console-pannel .close-button right: 20px @@ -72,51 +88,69 @@ bottom: 15px overflow: hidden right: 15px - background: #94ddee + background: #000000b5 border-radius: 100vh - border: 2.5px solid #00d0ff - height: 80px - width: 80px + height: 62px + width: 62px z-index: 10000 user-select: none [data-theme="dark"] .totopbutton background: #3d3d3d - border: 2.5px solid #F2B94B + border: 1px solid #9A515A .totopbutton - transition: all .3s - span#percent + i + justify-content: center + align-items: center + display: flex + color: #fff + background: #fff + width: 40px + height: 40px + box-shadow: 0 0 0 5px #ffffff38, inset 0 0 0 5px #aaa + text-shadow: 2px 1px #000 + font-weight: 700 + border-radius: 100vh + margin: auto + z-index inherit + top: calc(50% - (40px / 2)) + position: relative font-size: 30px + +.conbtn a + span#percent justify-content: center width 100% align-items: center display: flex font-weight: 700 - opacity 1 + scale: 1 + transition: .2s color: #fff text-shadow: 2px 1px #000 margin: auto z-index inherit - top: 6px - position: absolute + position: relative i - font-size: 30px justify-content: center align-items: center display: flex color: #fff text-shadow: 2px 1px #000 - opacity 0 + scale: 0 + transition: .2s + left 7px font-weight: 700 margin: auto z-index inherit - top: 20px - position: relative + top: -6px + position: absolute +.conbtn &:hover i - opacity 1 + scale: 1 &:hover span#percent - opacity 0 + scale: 0 .totopbutton .main-hero-waves-area width: 100% @@ -135,10 +169,10 @@ [data-theme="dark"] .totopbutton .main-hero-waves-area .parallax>use:nth-child(1) - fill: #F2B94Bbd + fill: #9A515Abd .parallax>use:nth-child(2) - fill: #F2B94B82 + fill: #9A515A82 .parallax>use:nth-child(3) - fill: #F2B94B36 + fill: #9A515A36 .parallax>use:nth-child(4) - fill: #F2B94B \ No newline at end of file + fill: #9A515A \ No newline at end of file diff --git a/source/css/_custom/custom.css b/source/css/_custom/custom.css index b1570ca..78c9b94 100644 --- a/source/css/_custom/custom.css +++ b/source/css/_custom/custom.css @@ -77,6 +77,7 @@ hrl.line { ::-webkit-scrollbar { width: 8px; height: 8px; + position: absolute; } ::-webkit-scrollbar-track { @@ -86,16 +87,7 @@ hrl.line { ::-webkit-scrollbar-thumb { background: var(--cover-box-shadow-color); - background-image: -webkit-linear-gradient( - 45deg, - rgba(255, 255, 255, 0.4) 25%, - transparent 25%, - transparent 50%, - rgba(255, 255, 255, 0.4) 50%, - rgba(255, 255, 255, 0.4) 75%, - transparent 75%, - transparent - ); + background: var(--heo-theme); border-radius: 2em; } @@ -134,7 +126,7 @@ main#content-inner { } [data-theme="dark"] #recent-posts>.recent-post-item { - background: var(--heo-theme) right !important; + background: #2E313D !important; } [data-theme="dark"] #footer-banner { diff --git a/source/css/_custom/flink.css b/source/css/_custom/flink.css index 3154dd1..d490a59 100644 --- a/source/css/_custom/flink.css +++ b/source/css/_custom/flink.css @@ -11,6 +11,13 @@ border-top: 3px dashed var(--heo-theme); padding-top: 5px; } -.flink .btns a { - width: 24% !important; +@media screen and (min-width: 1024px) { + .flink .btns a { + width: 24% !important; + } +} +@media screen and (max-width: 450px) { + .flink .btns a { + width: 100% !important; + } } \ No newline at end of file diff --git a/source/css/_custom/font.css b/source/css/_custom/font.css index f3345a6..3f21649 100644 --- a/source/css/_custom/font.css +++ b/source/css/_custom/font.css @@ -1,10 +1,6 @@ -@font-face{ - font-family:'alifont' ; /* 字体名自定义即可 */ - src:url('/font/alifangyuan.ttf'); /* 字体文件路径 */ - font-display : swap; -} + body { - font-family: alifont; - font-size: 17px; + font-family: "PingFang SC","Hiragino Sans GB","Microsoft YaHei"; + font-size: 16px; font-weight: 600; } \ No newline at end of file diff --git a/source/css/_custom/footer.css b/source/css/_custom/footer.css index b5e545f..9c77578 100644 --- a/source/css/_custom/footer.css +++ b/source/css/_custom/footer.css @@ -34,8 +34,7 @@ div#footer_deal { a.deal_link { display: flex; - margin: 1rem 27px; - color: var(--Jay-card-bg); + margin: 10px 15px 5px; border-radius: 3rem; width: 32px; height: 32px; @@ -46,8 +45,7 @@ a.deal_link { } a.deal_link:hover { - color: var(--Jay-white); - background: var(--Jay-main) + scale: 1.3; } img.footer_mini_logo { diff --git a/source/css/_custom/hometop.styl b/source/css/_custom/hometop.styl index cc5f221..0f345a8 100644 --- a/source/css/_custom/hometop.styl +++ b/source/css/_custom/hometop.styl @@ -65,6 +65,8 @@ .recent-post-top .recent-post-item .recent-post-info padding: 0.3rem 0.5rem 0.3rem 0.5rem !important; transition: 0.3s; + a + color: var(--heo-font) .recent-post-top .recent-post-item .post_cover a height: 100px; @@ -82,7 +84,7 @@ align-content: center; padding-top: .5rem; font-weight: bold; - font-size: 0.8rem !important; + font-size: 17px !important; padding: 0 !important; .hometop img @@ -94,6 +96,9 @@ margin-right: 1% display: inline-block +.category-bar-item a, .tag-bar-more, .category-bar-more + color: var(--heo-font) + .hometop-webinfo display: block padding: 15px @@ -178,7 +183,6 @@ .hometop content: '' position: relative - background-attachment: fixed top: -90px padding-top 70px width: 100% @@ -209,6 +213,7 @@ width: 100% color: hexo-config('hometop.title.color') && unquote(hexo-config('hometop.title.color')) align-items: center + text-shadow: 0 0 3px #000 if hexo-config('hometop.style') == 1 height: 200px text-align: center @@ -232,12 +237,18 @@ .blog-title .subtitle font-size: 25px - font-weight: 700 - height: 1.5em + font-weight: 700 + z-index 0 + position relative + height: 2em overflow: hidden .sublist height: 100% +@media screen and (max-width: 400px) + .blog-title .subtitle + font-size: 19px + .inbar img width: 164px margin-right: 10px diff --git a/source/css/_custom/iconfont.css b/source/css/_custom/iconfont.css new file mode 100644 index 0000000..2490917 --- /dev/null +++ b/source/css/_custom/iconfont.css @@ -0,0 +1,902 @@ +@font-face { + font-family: "dys"; /* Project id 4221034 */ + src: url('//at.alicdn.com/t/c/font_4221034_o4heeq0yo2.woff2?t=1693585984310') format('woff2'), + url('//at.alicdn.com/t/c/font_4221034_o4heeq0yo2.woff?t=1693585984310') format('woff'), + url('//at.alicdn.com/t/c/font_4221034_o4heeq0yo2.ttf?t=1693585984310') format('truetype'); +} + +.dys { + font-family: "dys" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.dashboard:before { + content: "\e88b"; +} + +.apps:before { + content: "\e849"; +} + +.tower:before { + content: "\e885"; +} + +.spinner3:before { + content: "\e855"; +} + +.left_double:before { + content: "\e677"; +} + +.right_double:before { + content: "\e678"; +} + +.jingliren_o:before { + content: "\ebc4"; +} + +.arrow-right:before { + content: "\e660"; +} + +.arrow-left:before { + content: "\e667"; +} + +.searchico:before { + content: "\e648"; +} + +.creativecommons:before { + content: "\ea87"; +} + +.music:before { + content: "\e79a"; +} + +.dashang:before { + content: "\e657"; +} + +.shuffle:before { + content: "\ea75"; +} + +.dashang-01:before { + content: "\e658"; +} + +.robot:before { + content: "\eb62"; +} + +.theme:before { + content: "\eb6f"; +} + +.dollar:before { + content: "\eba1"; +} + +.server:before { + content: "\e642"; +} + +.archives:before { + content: "\e666"; +} + +.moshubang:before { + content: "\ec5b"; +} + +.shujuwj:before { + content: "\ec5c"; +} + +.bike:before { + content: "\ec69"; +} + +.mysql:before { + content: "\ec6d"; +} + +.car:before { + content: "\ec6e"; +} + +.sand1:before { + content: "\e643"; +} + +.maths:before { + content: "\e644"; +} + +.bug:before { + content: "\e8e8"; +} + +.heart:before { + content: "\eca1"; +} + +.Acrobat-File:before { + content: "\e77a"; +} + +.Butterfly:before { + content: "\e8f3"; +} + +.Excel:before { + content: "\e998"; +} + +.Word:before { + content: "\e99a"; +} + +.Illustrator:before { + content: "\e99d"; +} + +.Photoshop:before { + content: "\e9a2"; +} + +.Powerpoint:before { + content: "\e9a3"; +} + +.Atom:before { + content: "\ec1c"; +} + +.Adobe:before { + content: "\edd6"; +} + +.redpacket:before { + content: "\e71d"; +} + +.Dimension:before { + content: "\e66a"; +} + +.Git:before { + content: "\e649"; +} + +.Git1:before { + content: "\e64a"; +} + +.Git2:before { + content: "\e64b"; +} + +.Git3:before { + content: "\e64c"; +} + +.door:before { + content: "\e832"; +} + +.envelope:before { + content: "\e944"; +} + +.camera:before { + content: "\e9ed"; +} + +.disk:before { + content: "\e71f"; +} + +.study:before { + content: "\e6b8"; +} + +.Pdf:before { + content: "\e83c"; +} + +.remove:before { + content: "\e84f"; +} + +.attack:before { + content: "\e64f"; +} + +.groupico:before { + content: "\e650"; +} + +.muma:before { + content: "\e651"; +} + +.no:before { + content: "\e652"; +} + +.company:before { + content: "\e67a"; +} + +.motion:before { + content: "\e653"; +} + +.surgery:before { + content: "\e704"; +} + +.compass:before { + content: "\e659"; +} + +.pass:before { + content: "\e65c"; +} + +.shield:before { + content: "\e65d"; +} + +.Fishing:before { + content: "\e6cd"; +} + +.bilibili:before { + content: "\e75d"; +} + +.shuyu:before { + content: "\e65e"; +} + +.heart-beat:before { + content: "\e663"; +} + +.gear:before { + content: "\e8b7"; +} + +.jingdong:before { + content: "\e65f"; +} + +.git1:before { + content: "\e6a8"; +} + +.coins:before { + content: "\e837"; +} + +.shuidi:before { + content: "\e682"; +} + +.console:before { + content: "\e6ca"; +} + +.linux:before { + content: "\e669"; +} + +.php_elephant:before { + content: "\e67e"; +} + +.defense:before { + content: "\e79b"; +} + +.github:before { + content: "\e6ea"; +} + +.nodejs:before { + content: "\e703"; +} + +.rocket:before { + content: "\e713"; +} + +.telegram:before { + content: "\e727"; +} + +.adobexd:before { + content: "\eb36"; +} + +.adobepremiere:before { + content: "\eb37"; +} + +.archlinux:before { + content: "\eb42"; +} + +.shield2:before { + content: "\e66b"; +} + +.siwangdengji:before { + content: "\e66d"; +} + +.no-equal:before { + content: "\ec96"; +} + +.equal:before { + content: "\ec99"; +} + +.Slashit:before { + content: "\e66e"; +} + +.prison:before { + content: "\e883"; +} + +.baidu:before { + content: "\e8cb"; +} + +.hand:before { + content: "\e91a"; +} + +.gesture:before { + content: "\e6cf"; +} + +.nail:before { + content: "\e869"; +} + +.xiaochengxu1:before { + content: "\e66f"; +} + +.partnership:before { + content: "\e6ec"; +} + +.no-pass:before { + content: "\e6ce"; +} + +.shoudiantong:before { + content: "\e6d1"; +} + +.git-pull-request-outline:before { + content: "\e9ba"; +} + +.diaoyu:before { + content: "\e670"; +} + +.weiruan1:before { + content: "\e671"; +} + +.tizi:before { + content: "\e75e"; +} + +.blog:before { + content: "\eaf9"; +} + +.php:before { + content: "\ec17"; +} + +.vuejs:before { + content: "\ec2c"; +} + +.Mysql:before { + content: "\e764"; +} + +.virus:before { + content: "\e672"; +} + +.a-bianzu38:before { + content: "\e750"; +} + +.hospital:before { + content: "\e673"; +} + +.dunpai-no:before { + content: "\e674"; +} + +.yueliang:before { + content: "\e6b6"; +} + +.zhikongzhongxin-xian:before { + content: "\e67d"; +} + +.a-191_cgs:before { + content: "\e773"; +} + +.vip:before { + content: "\e874"; +} + +.dis:before { + content: "\e7d3"; +} + +.a-005_quantou:before { + content: "\e675"; +} + +.web-search:before { + content: "\e681"; +} + +.milk:before { + content: "\10121"; +} + +.clash:before { + content: "\e676"; +} + +.bijiben:before { + content: "\e600"; +} + +.renzhengyonghu:before { + content: "\e601"; +} + +.cart-full:before { + content: "\e602"; +} + +.weiruan:before { + content: "\e603"; +} + +.tushu:before { + content: "\e604"; +} + +.mao:before { + content: "\e605"; +} + +.codeico:before { + content: "\e60c"; +} + +.copy:before { + content: "\e60e"; +} + +.font:before { + content: "\e620"; +} + +.upload:before { + content: "\e656"; +} + +.warning:before { + content: "\e606"; +} + +.git:before { + content: "\e799"; +} + +.postico:before { + content: "\e759"; +} + +.download2:before { + content: "\e714"; +} + +.youxiyouxiji:before { + content: "\e61e"; +} + +.backpack:before { + content: "\e629"; +} + +.iconfonticonfonticons:before { + content: "\e61c"; +} + +.jiahao:before { + content: "\e726"; +} + +.taobao:before { + content: "\e755"; +} + +.wxbgongju:before { + content: "\e61b"; +} + +.cart:before { + content: "\e63f"; +} + +.zhengque:before { + content: "\e664"; +} + +.kefu:before { + content: "\e621"; +} + +.ipad:before { + content: "\e622"; +} + +.copy1:before { + content: "\e744"; +} + +.duoyuyan:before { + content: "\e654"; +} + +.plane:before { + content: "\e655"; +} + +.huoche:before { + content: "\e65b"; +} + +.qian:before { + content: "\e662"; +} + +.dianhua:before { + content: "\e797"; +} + +.ouyuan:before { + content: "\e7fc"; +} + +.law:before { + content: "\e61f"; +} + +.shield3:before { + content: "\e647"; +} + +.shouye:before { + content: "\e637"; +} + +.gugegoogle115:before { + content: "\e8ff"; +} + +.dunpai:before { + content: "\e645"; +} + +.woshiyisheng:before { + content: "\e6d4"; +} + +.download:before { + content: "\e60a"; +} + +.jiaoya:before { + content: "\e635"; +} + +.wailian_icon:before { + content: "\e63e"; +} + +.wordpresswordpress5:before { + content: "\e73c"; +} + +.horn:before { + content: "\e611"; +} + +.chrome-o:before { + content: "\e646"; +} + +.toxic:before { + content: "\e640"; +} + +.bus:before { + content: "\e614"; +} + +.comment:before { + content: "\e607"; +} + +.qzone:before { + content: "\e608"; +} + +.category:before { + content: "\e609"; +} + +.qq:before { + content: "\e60b"; +} + +.mail:before { + content: "\e60d"; +} + +.tag:before { + content: "\e610"; +} + +.time:before { + content: "\e612"; +} + +.view:before { + content: "\e613"; +} + +.weixin:before { + content: "\e615"; +} + +.weibo:before { + content: "\e616"; +} + +.cloud:before { + content: "\e617"; +} + +.earth:before { + content: "\e618"; +} + +.pengyou:before { + content: "\e619"; +} + +.android:before { + content: "\e61a"; +} + +.apple:before { + content: "\e61d"; +} + +.feed:before { + content: "\e623"; +} + +.cuowuguanbiquxiao-xianxingyuankuang:before { + content: "\e8e7"; +} + +.shijianzhou:before { + content: "\e69a"; +} + +.shu:before { + content: "\e624"; +} + +.banshou_Line:before { + content: "\e64e"; +} + +.shanguangdengdakai:before { + content: "\e873"; +} + +.tishi:before { + content: "\e881"; +} + +.di-tie:before { + content: "\e8c3"; +} + +.dengpao:before { + content: "\e625"; +} + +.new:before { + content: "\e626"; +} + +.star:before { + content: "\e627"; +} + +.hot:before { + content: "\e628"; +} + +.arrowup:before { + content: "\e62a"; +} + +.arrowdown:before { + content: "\e62b"; +} + +.editor:before { + content: "\e62c"; +} + +.linkico:before { + content: "\e62d"; +} + +.menu:before { + content: "\e62e"; +} + +.canju:before { + content: "\e62f"; +} + +.fenlei2:before { + content: "\e630"; +} + +.home:before { + content: "\e631"; +} + +.caozuo-wailian:before { + content: "\e711"; +} + +.remen:before { + content: "\e8f4"; +} + +.jianyu:before { + content: "\e6f7"; +} + +.-disk:before { + content: "\e661"; +} + +.offical:before { + content: "\eb63"; +} + +.shujukanban:before { + content: "\eb66"; +} + +.adobedreamweaver:before { + content: "\e632"; +} + +.vim:before { + content: "\e63c"; +} + +.python:before { + content: "\e665"; +} + +.upload1:before { + content: "\e6b7"; +} + +.jiatingguanxi:before { + content: "\e6eb"; +} + +.yu:before { + content: "\e633"; +} + +.chuidiao:before { + content: "\e634"; +} + +.renshixuexiao:before { + content: "\e636"; +} + +.shougongji:before { + content: "\e709"; +} + +.code1:before { + content: "\e7fd"; +} + +.fist:before { + content: "\e638"; +} + +.language:before { + content: "\e639"; +} + +.HTML:before { + content: "\e87d"; +} + +.Gitlab:before { + content: "\e87f"; +} + +.erji:before { + content: "\e63a"; +} + +.pen:before { + content: "\e63b"; +} + +.computer:before { + content: "\e63d"; +} + +.dog:before { + content: "\e712"; +} + +.sun:before { + content: "\e641"; +} + +.gzlo:before { + content: "\eb53"; +} diff --git a/source/css/_custom/nav.css b/source/css/_custom/nav.styl similarity index 95% rename from source/css/_custom/nav.css rename to source/css/_custom/nav.styl index 8f726ce..00cb437 100644 --- a/source/css/_custom/nav.css +++ b/source/css/_custom/nav.styl @@ -7,6 +7,13 @@ #nav-totop:hover .totopbtn i { opacity: 1; } +span#blog_name { + display: block; + animation: rotate 2s linear infinite; +} +span#blog_name:hover { + animation: none; +} #nav-totop #percent { font-size: 12px; background: var(--anzhiyu-white); @@ -146,13 +153,16 @@ ul.menus_item_child { #nav #buttons { height: 40px; + z-index: -1; align-items: center; display: flex; justify-content: center; min-width: 40px; + left: calc(100% + 7px); + transition: .2s cubic-bezier(0.09, -0.01, 0.01, 2.05); border-radius: 100vh; + position: absolute; background: #000; - margin-left: 10px; } #nav .menus_items .menus_item:hover .menus_item_child { @@ -176,6 +186,7 @@ ul.menus_item_child { #nav .menus_items .menus_item { border-radius: 100vh; justify-content: center; + font-size: 23px; padding: 0 10px !important; } #nav .menus_items .menus_item .menus_item_child { @@ -443,12 +454,6 @@ center#name-container { cursor: pointer; position: relative; } - -@media screen and (min-width: 1300px) { - #nav a:hover { - transform: scale(1.03); - } -} .back-home-button .back-menu-list .back-menu-item:hover .back-menu-item-text { color: var(--anzhiyu-white); } @@ -493,9 +498,21 @@ div#navbar { max-width: 1200px; border-radius: 100vh; background: #000; + transition: .3s cubic-bezier(0.58, 0.02, 1, 1) height: 40px; position: relative; padding: 0 .7rem; align-items: center; justify-content: center; -} \ No newline at end of file +} + +.notebar + color: #fff + display none + margin: auto + +#nav-blog-name + color: #fff + transition: .2s + text-wrap: nowrap + height: inherit \ No newline at end of file diff --git a/source/css/_custom/swiper.css b/source/css/_custom/swiper.css new file mode 100644 index 0000000..5fb81e6 --- /dev/null +++ b/source/css/_custom/swiper.css @@ -0,0 +1,270 @@ +@import url("https://fonts.googleapis.com/css?family=Fira+Sans:400,500,600,700,800"); +* { + box-sizing: border-box; +} + + + +.blog-slider { + width: 100%; + position: relative; + border-radius: 12px 8px 8px 12px; + margin: auto; + background: var(--global-bg) + + padding: 10px; + + transition: all .3s; +} + +@media screen and (max-width: 768px) { + .blog-slider { + + min-height: 350px; + height: auto; + margin-top: 110px; + margin-bottom: 10px; + } +} +@media screen and (max-height: 500px) and (min-width: 992px) { + .blog-slider { + height: 350px; + } +} +.blog-slider__item { + display: flex; + align-items: center; +} +@media screen and (max-width: 768px) { + .blog-slider__item { + flex-direction: column; + } +} +.blog-slider__item.swiper-slide-active .blog-slider__img img { + opacity: 1; + transition-delay: .3s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > * { + opacity: 1; + transform: none; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(1) { + transition-delay: 0.3s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(2) { + transition-delay: 0.4s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(3) { + transition-delay: 0.5s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(4) { + transition-delay: 0.6s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(5) { + transition-delay: 0.7s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(6) { + transition-delay: 0.8s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(7) { + transition-delay: 0.9s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(8) { + transition-delay: 1s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(9) { + transition-delay: 1.1s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(10) { + transition-delay: 1.2s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(11) { + transition-delay: 1.3s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(12) { + transition-delay: 1.4s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(13) { + transition-delay: 1.5s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(14) { + transition-delay: 1.6s; +} +.blog-slider__item.swiper-slide-active .blog-slider__content > *:nth-child(15) { + transition-delay: 1.7s; +} +.blog-slider__img { + width: 200px; + flex-shrink: 0; + height: 200px; + padding:10px; + border-radius: 5px; + transform: translateX(0px); + overflow: hidden; +} +.blog-slider__img:after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + + border-radius: 5px; + opacity: 0.8; +} +.blog-slider__img img { + width: 100%; + height: 100%; + object-fit: cover; + display: block; + opacity: 0; + border-radius: 5px; + transition: all .3s; +} +@media screen and (max-width: 768px) { + .blog-slider__img { + transform: translateY(-50%); + width: 90%; + } +} +@media screen and (max-width: 576px) { + .blog-slider__img { + width: 95%; + } +} +@media screen and (max-height: 500px) and (min-width: 992px) { + .blog-slider__img { + height: 270px; + } +} +.blog-slider__content { + padding-right: 50px; + padding-left: 50px; +} +@media screen and (max-width: 768px) { + .blog-slider__content { + margin-top: -80px; + text-align: center; + padding: 0 30px; + } +} +@media screen and (max-width: 576px) { + .blog-slider__content { + padding-left: 10px; + padding-right: 10px; + } +} +.blog-slider__content > * { + opacity: 0; + transform: translateY(25px); + transition: all .4s; +} +.blog-slider__code { + color: var(--font-color); + margin-bottom: 0px; + display: block; + font-weight: 500; +} +.blog-slider__title { + font-size: 18px; + font-weight: 700; + color: var(--font-color); + margin-bottom: 15px; + -webkit-line-clamp: 1; + display: -webkit-box; + overflow: hidden; + -webkit-box-orient: vertical; +} +.blog-slider__text { + color: var(--font-color); + -webkit-line-clamp: 1; + display: -webkit-box; + overflow: hidden; + -webkit-box-orient: vertical; + margin-bottom: 15px; + line-height: 1.5em; +} +.blog-slider__button { + display: inline-flex; + background-color: var(--btn-bg); + padding: 4px 14px; + border-radius: 8px; + color: var(--btn-color); + text-decoration: none; + font-weight: 500; + justify-content: center; + text-align: center; + letter-spacing: 1px; +} +.blog-slider__button:hover{ + background-color: var(--btn-hover-color); + color: var(--btn-color); +} +@media screen and (max-width: 576px) { + .blog-slider__button { + width: 100%; + width: 100%; + } +} +.blog-slider .swiper-container-horizontal > .swiper-pagination-bullets, .blog-slider .swiper-pagination-custom, .blog-slider .swiper-pagination-fraction { + bottom: 10px; + left: 0; + width: 100%; +} +.blog-slider__pagination { + position: absolute; + z-index: 21; + right: 20px; + width: 11px !important; + text-align: center; + left: auto !important; + top: 50%; + bottom: auto !important; + transform: translateY(-50%); +} +@media screen and (max-width: 768px) { + .blog-slider__pagination { + transform: translateX(-50%); + left: 50% !important; + top: 320px; + width: 100% !important; + display: flex; + justify-content: center; + align-items: center; + } +} +.blog-slider__pagination.swiper-pagination-bullets .swiper-pagination-bullet { + margin: 8px 0; +} +@media screen and (max-width: 768px) { + + .blog-slider__pagination.swiper-pagination-bullets .swiper-pagination-bullet { + margin: 0 5px; + } +} +.blog-slider__pagination .swiper-pagination-bullet { + width: 11px; + height: 11px; + display: block; + border-radius: 10px; + background: #858585; + opacity: 0.2; + transition: all .3s; +} +.blog-slider__pagination .swiper-pagination-bullet-active { + opacity: 1; + background: var(--btn-bg); + height: 30px; +} +@media screen and (max-width: 768px) { + .blog-slider__pagination .swiper-pagination-bullet-active { + height: 11px; + width: 30px; + } +} +.blog-slider__button{display:none} +@media screen and (max-width: 768px) { + .blog-slider__button{display:inline-flex} + .blog-slider__text{margin-bottom:40px} +} \ No newline at end of file diff --git a/source/css/_custom/swiperbar.styl b/source/css/_custom/swiperbar.styl new file mode 100644 index 0000000..5507752 --- /dev/null +++ b/source/css/_custom/swiperbar.styl @@ -0,0 +1,171 @@ +.recent-post-item + &#swiperBar + @media screen and (min-width: 768px) + width: 59%; + width: 100% + margin: 0 1% + position: relative + #ark-swiper-container + width: 100%; + border: 2px solid var(--heo-background) + box-shadow: 0 0 0 1px var(--heo-background) + height: inherit; + overflow: hidden; + position: relative; + border-radius: 15px; + .dht-swiper-wrapper + width: 100%; + height: 200px; + display: flex; + flex-direction: row; + .dht-swiper-item + position: relative + width: 100%; + height: 200px; + display: flex; + flex-direction: row; + overflow: hidden; + border-radius: 15px; + box-shadow: 0 0 3px inset var(--ark-post-item-box-shadow); + .dht-swiper-item-cover + filter: brightness(.85) + height: 100%; + display: flex; + position: absolute; + top: 0 + left: 0 + align-items: center; + justify-content: center; + overflow: hidden; + z-index: 0 + img + object-fit: cover; + width: 100%; + height: 100% + z-index: 1; + .dht-swiper-item-time + width: 350px; + color: #fff; + font-size: 25px; + text-shadow: 2px 2px 3px black; + background: rgba(153, 54, 44,0.8); + font-family: 'UnidreamLED'; + display: flex; + position: absolute; + height: 30px; + top: calc(50% - 15px); + left: calc(50% - 175px); + align-items: center; + justify-content: center; + z-index: 2; + span + margin: 0 3px + .dht-swiper-item-info + max-height: 120px + height inherit + flex-direction: column; + height: 100%; + display: flex; + position: absolute + top: 0 + right: 0 + align-items: center; + justify-content: space-between; + flex-direction: column; + overflow: hidden; + z-index: 0; + a.dht-swiper-item-title + width: 100%; + height: 80px; + color: #fff; + text-shadow: 0 0 5px black + font-family: 'TaikoMagic'; + text-align: center; + display: flex; + align-items: center; + justify-content: center; + .dht-swiper-item-title-link + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + ark_post_item_link_hover() + .dht-swiper-item-description + color: #fff; + display: flex; + text-align: start; + text-shadow: 0 0 5px black + height: 130px; + align-items: center; + .dht-swiper-item-description-text + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + .dht-swiper-item-decoration + width: 150px; + height: 150px; + opacity: 0.3; + position: absolute; + top: calc(50% - 75px); + left: calc(50% - 75px); + z-index: -1 + .dht-swiper-pagination + bottom: 5px; + left: 0; + right: 0; + margin: 0 auto; +//宽屏样式 +@media screen and (min-width:768px) + .recent-post-item + &#swiperBar + height: 164px; + #ark-swiper-container + .dht-swiper-wrapper + .dht-swiper-item + .dht-swiper-item-cover + width: 100%; + .dht-swiper-item-time + transform: rotateZ(-45deg); + .dht-swiper-item-info + width: 100%; + a.dht-swiper-item-title + padding: 15px 20px 0 60px; + font-size: 30px; + .dht-swiper-item-title-link + -webkit-line-clamp: 2 + .dht-swiper-item-description + width: 85% + margin auto + font-size: 16px; + line-height: 30px; + .dht-swiper-item-description-text + -webkit-line-clamp: 3 + width: 100% + text-align: center + +@media screen and (max-width:768px) + .recent-post-item + &#swiperBar + height: 200px; + padding: 0px 0px + #ark-swiper-container + .dht-swiper-wrapper + .dht-swiper-item + .dht-swiper-item-cover + width: 100%; + .dht-swiper-item-time + transform: rotateZ(-60deg); + .dht-swiper-item-info + width: 100%; + padding: 0 30px; + a.dht-swiper-item-title + padding: 10px 16px 0 45px; + font-size: 25px; + line-height: 1.3 + .dht-swiper-item-title-link + -webkit-line-clamp: 2 + .dht-swiper-item-description + padding: 0px 15px 10px 5px; + font-size: 17px; + .dht-swiper-item-description-text + -webkit-line-clamp: 4 + line-height: 1.3 \ No newline at end of file diff --git a/source/css/_custom/tag.styl b/source/css/_custom/tag.styl index 8b0e23f..7e5273f 100644 --- a/source/css/_custom/tag.styl +++ b/source/css/_custom/tag.styl @@ -10,11 +10,10 @@ .card-tag-cloud a color: var(--heo-font) !important - border-radius: 9px + border-bottom: 2px dashed var(--border) padding: 3px 10px !important margin-bottom: 2% font-size: 16px !important - background: var(--heo-theme) .card-tag-cloud, #aside-cat-list, .card-archive-list max-height: 135px @@ -27,8 +26,7 @@ li.card-category-list-item, li.card-archive-list-item width: 48% - background: var(--heo-theme) - border-radius: 9px + border-bottom: 2px dashed var(--border) margin-bottom: 2% margin-right: 2% display: inline-block diff --git a/source/css/_global/function.styl b/source/css/_global/function.styl index dd899eb..602e33d 100644 --- a/source/css/_global/function.styl +++ b/source/css/_global/function.styl @@ -202,13 +202,6 @@ if hexo-config('enter_transitions') 100% opacity: 0 -@keyframes avatar_turn_around - from - transform: rotate(0) - - to - transform: rotate(360deg) - @keyframes sub_menus 0% opacity: 0 diff --git a/source/css/_layout/aside.styl b/source/css/_layout/aside.styl index 6bb6a90..6a98a9e 100644 --- a/source/css/_layout/aside.styl +++ b/source/css/_layout/aside.styl @@ -69,6 +69,8 @@ padding-left: 10px .item-headline + width: fit-content + margin auto !important padding-bottom: 6px font-size: 1.2em @@ -300,22 +302,26 @@ color: #FF0000 .avatar-img - overflow: hidden margin: 0 auto width: 110px height: 110px border: 4px solid #fff border-radius: 70px + transition: .3s + + &:hover + transform: scale(1.1) + + .loading-image-dot + img + transform: rotate(-25deg) img width: 100% height: 100% - transition: filter 375ms ease-in .2s, transform .3s + border-radius: 100% object-fit: cover - &:hover - transform: rotate(360deg) - .site-data display: table width: 100% diff --git a/source/css/_layout/footer.styl b/source/css/_layout/footer.styl index 3fb1d39..1970d6b 100644 --- a/source/css/_layout/footer.styl +++ b/source/css/_layout/footer.styl @@ -1,35 +1,53 @@ -#footer - position: relative - background: $light-blue - background-attachment: scroll - background-position: bottom - background-size: cover - - if hexo-config('footer_bg') != false - &:before - position: absolute - width: 100% - height: 100% - background-color: alpha($dark-black, .5) - content: '' - -#footer-wrap - position: relative - padding: 40px 20px - color: var(--light-grey) - text-align: center - - a - color: var(--light-grey) - - &:hover - text-decoration: underline - - .footer-separator - margin: 0 4px - - .icp-icon - padding: 0 4px - max-height: 1.4em - width: auto - vertical-align: text-bottom +.footer + padding: 15px + #in + background: var(--footer-bg) + width 100% + padding 0 15px 15px 15px + text-align: center + border: 1px solid var(--border) + max-width: 1200px + margin: 0 auto 20px + border-radius: 18px + @media screen and (max-width: 768px) + margin: auto !important + border-radius: 18px 18px 0 0 + .title + display flex + flex-direction: column-reverse + text-align: center + img + position: relative + height: 66px + width 66px + border-radius: 100vh + top: -33px + left: calc(50% - 33px) + .author + margin-top -33px + text-align: center + span.name + font-weight: bolder + font-size: 25px + .links + margin-bottom: 20px + display flex + flex-wrap: wrap + justify-content: center + a + color: var(--heo-font) + font-size: 25px + .frame + margin-top: 20px + font-size: 18px + font-weight: bolder + i + margin: 0 3px + about.about + a.footer-button + padding: 15px + margin: 6px + color: #fff + i + line-height: 2 + margin-right: 2px \ No newline at end of file diff --git a/source/css/_layout/head.styl b/source/css/_layout/head.styl index 64abc11..79507a5 100644 --- a/source/css/_layout/head.styl +++ b/source/css/_layout/head.styl @@ -102,6 +102,7 @@ #post-info position: absolute bottom: 35% + padding: 0 0 0 20px max-width: 1200px width: 100% text-align: left @@ -274,7 +275,8 @@ &:hover .menus_item_child - display: block + display: flex + scale: 1 & > a > i:last-child transform: rotate(180deg) @@ -286,14 +288,19 @@ .menus_item_child position: absolute right: 0 - display: none + display: flex + flex-direction: column + border-radius: 20px + scale: 0 + transition: .25s cubic-bezier(0.25, 0.1, 0.62, 1.7) + background: #000 !important margin-top: 8px padding: 0 width: max-content border-radius: 5px background-color: var(--sidebar-bg) box-shadow: 0 5px 20px -4px rgba($dark-black, .5) - animation: sub_menus .3s .1s ease both + transform: translateY(0) !important &:before position: absolute diff --git a/source/css/_layout/loading.styl b/source/css/_layout/loading.styl index 00958ea..0d2c80f 100644 --- a/source/css/_layout/loading.styl +++ b/source/css/_layout/loading.styl @@ -31,13 +31,18 @@ if hexo-config('preloader') .loading-image-dot width: 30px; height: 30px; - background: #6bdf8f; + display: flex + align-items: center + justify-content: center position: absolute; border-radius: 50%; border: 6px solid #fff; top: 50%; left: 50%; transform: translate(18px, 24px); + img + height: 26px + width: 26px @keyframes loadingAction 0% { diff --git a/source/css/_layout/post.styl b/source/css/_layout/post.styl index 39fac11..6da93a2 100644 --- a/source/css/_layout/post.styl +++ b/source/css/_layout/post.styl @@ -184,9 +184,9 @@ beautify() position absolute right -26px top -120px - content '\f25e' + content "\ea87" font-size 200px - font-family 'Font Awesome 5 Brands' + font-family dys opacity .2 &:hover diff --git a/source/css/_layout/sidebar.styl b/source/css/_layout/sidebar.styl index eff453e..c0bdff0 100644 --- a/source/css/_layout/sidebar.styl +++ b/source/css/_layout/sidebar.styl @@ -50,7 +50,7 @@ background: var(--text-bg-hover) i:first-child - width: 15% + font-size: 20px text-align: left &.group diff --git a/source/css/_page/homepage.styl b/source/css/_page/homepage.styl index 6cd2614..100ad10 100644 --- a/source/css/_page/homepage.styl +++ b/source/css/_page/homepage.styl @@ -60,6 +60,8 @@ & >.recent-post-info padding: 0 40px width: 57% + height 100% + max-height: 150px +maxWidth768() padding: 20px 20px 30px diff --git a/source/css/_search/index.styl b/source/css/_search/index.styl index fb9fde8..2de0211 100644 --- a/source/css/_search/index.styl +++ b/source/css/_search/index.styl @@ -40,4 +40,12 @@ [data-theme="dark"] #search-mask - background: #0000007a \ No newline at end of file + background: #0000007a + +div#search-mask::after + content: '-- 点击空白处关闭 --' + position: fixed + bottom: 0 + font-weight: 100 + text-align: center + width: 100% \ No newline at end of file diff --git a/source/css/_tags/note.styl b/source/css/_tags/note.styl index b902ebc..e4c6952 100644 --- a/source/css/_tags/note.styl +++ b/source/css/_tags/note.styl @@ -115,6 +115,7 @@ &:not(.no-icon) &::before content: lookup('$note-' + $type + '-icon') + font-family: dys &:not(.modern) &::before diff --git a/source/css/color.css b/source/css/color.css index 8b190e0..bd875e5 100644 --- a/source/css/color.css +++ b/source/css/color.css @@ -1,5 +1,4 @@ :root{ - --heo-white: #fff; --loading-bg: #ffffff7a; --heo-black: #000; --heo-none: rgba(0,0,0,0); @@ -31,10 +30,11 @@ background: #0000007a; --border: #e3e8f7; --select-bg: #425AEF; --select: #fff; + --heo-white: #fff; --search-border-color: #181c27; --heo-theme: #71e5ff; --nav-bg: #ffffffb0; - --footer-bg: #EFF2FA; + --footer-bg: #eaedf7; --hrl-line: #71e5ff; --bg: #F7F9FE; --heo-theme-op: #4259ef23; @@ -70,8 +70,9 @@ background: #0000007a; --heo-inline-code: #fff; --search-border-color: #e3e8f7; --border: #3d3d3f; + --heo-white: #000; --select-bg: #425aef; - --footer-bg: #fff0; + --footer-bg: #2e313d; --select: #fff; --heo-theme: linear-gradient(101deg, #7f2638, #973644, #9b565f, #b79494); --hrl-line: #994A55; diff --git a/source/css/var.styl b/source/css/var.styl index 839fc14..66b4543 100644 --- a/source/css/var.styl +++ b/source/css/var.styl @@ -107,7 +107,7 @@ $note-types = 'default' 'primary' 'info' 'success' 'warning' 'danger' $note-default-border = #777 $note-default-bg = lighten(spin($note-default-border, 0), 94% + $lbg) $note-default-text = $note-default-border -$note-default-icon = '\f0a9' +$note-default-icon = "\e881" $note-modern-default-border = #e1e1e1 $note-modern-default-bg = lighten(spin($note-modern-default-border, 10), 60% + ($lbg * 4)) $note-modern-default-text = #666 @@ -116,7 +116,7 @@ $note-modern-default-hover = darken(spin($note-modern-default-text, -10), 32%) $note-primary-border = #6f42c1 $note-primary-bg = lighten(spin($note-primary-border, 10), 92% + $lbg) $note-primary-text = $note-primary-border -$note-primary-icon = '\f055' +$note-primary-icon = "\e881" $note-modern-primary-border = #e1c2ff $note-modern-primary-bg = lighten(spin($note-modern-primary-border, 10), 40% + ($lbg * 4)) $note-modern-primary-text = #6f42c1 @@ -125,7 +125,7 @@ $note-modern-primary-hover = darken(spin($note-modern-primary-text, -10), 22%) $note-info-border = #428bca $note-info-bg = lighten(spin($note-info-border, -10), 91% + $lbg) $note-info-text = $note-info-border -$note-info-icon = '\f05a' +$note-info-icon = "\e881" $note-modern-info-border = #b3e5ef $note-modern-info-bg = lighten(spin($note-modern-info-border, 10), 50% + ($lbg * 4)) $note-modern-info-text = #31708f @@ -134,7 +134,7 @@ $note-modern-info-hover = darken(spin($note-modern-info-text, -10), 32%) $note-success-border = #5cb85c $note-success-bg = lighten(spin($note-success-border, 10), 90% + $lbg) $note-success-text = $note-success-border -$note-success-icon = '\f058' +$note-success-icon = "\e664" $note-modern-success-border = #d0e6be $note-modern-success-bg = lighten(spin($note-modern-success-border, 10), 40% + ($lbg * 4)) $note-modern-success-text = #3c763d @@ -143,7 +143,7 @@ $note-modern-success-hover = darken(spin($note-modern-success-text, -10), 27%) $note-warning-border = #f0ad4e $note-warning-bg = lighten(spin($note-warning-border, 10), 88% + $lbg) $note-warning-text = $note-warning-border -$note-warning-icon = '\f06a' +$note-warning-icon = "\e84f" $note-modern-warning-border = #fae4cd $note-modern-warning-bg = lighten(spin($note-modern-warning-border, 10), 43% + ($lbg * 4)) $note-modern-warning-text = #8a6d3b @@ -152,7 +152,7 @@ $note-modern-warning-hover = darken(spin($note-modern-warning-text, -10), 18%) $note-danger-border = #d9534f $note-danger-bg = lighten(spin($note-danger-border, -10), 92% + $lbg) $note-danger-text = $note-danger-border -$note-danger-icon = '\f056' +$note-danger-icon = "\e84f" $note-modern-danger-border = #ebcdd2 $note-modern-danger-bg = lighten(spin($note-modern-danger-border, 10), 35% + ($lbg * 4)) $note-modern-danger-text = #a94442 diff --git a/source/font/font-min.txt b/source/font/font-min.txt deleted file mode 100644 index 631bc37..0000000 --- a/source/font/font-min.txt +++ /dev/null @@ -1,6796 +0,0 @@ -# Latin -0000-00FF -# Chinese Characters https://blog.csdn.net/COCO56/article/details/87618925 -3002 -FF1F -FF01 -FF0C -3001 -FF1B -FF1A -300C -300D -300E -300F -2018 -2019 -201C -201D -FF08 -FF09 -3014 -3015 -3010 -3011 -2014 -2026 -2013 -FF0E -300A -300B -3008 -3009 -# Chinese Simplified https://www.ansell-uebersetzungen.com/gbuni.html -4E00 -4E01 -4E03 -4E07 -4E08 -4E09 -4E0A -4E0B -4E0C -4E0D -4E0E -4E10 -4E11 -4E13 -4E14 -4E15 -4E16 -4E18 -4E19 -4E1A -4E1B -4E1C -4E1D -4E1E -4E22 -4E24 -4E25 -4E27 -4E28 -4E2A -4E2B -4E2C -4E2D -4E30 -4E32 -4E34 -4E36 -4E38 -4E39 -4E3A -4E3B -4E3D -4E3E -4E3F -4E43 -4E45 -4E47 -4E48 -4E49 -4E4B -4E4C -4E4D -4E4E -4E4F -4E50 -4E52 -4E53 -4E54 -4E56 -4E58 -4E59 -4E5C -4E5D -4E5E -4E5F -4E60 -4E61 -4E66 -4E69 -4E70 -4E71 -4E73 -4E7E -4E86 -4E88 -4E89 -4E8B -4E8C -4E8D -4E8E -4E8F -4E91 -4E92 -4E93 -4E94 -4E95 -4E98 -4E9A -4E9B -4E9F -4EA0 -4EA1 -4EA2 -4EA4 -4EA5 -4EA6 -4EA7 -4EA8 -4EA9 -4EAB -4EAC -4EAD -4EAE -4EB2 -4EB3 -4EB5 -4EBA -4EBB -4EBF -4EC0 -4EC1 -4EC2 -4EC3 -4EC4 -4EC5 -4EC6 -4EC7 -4EC9 -4ECA -4ECB -4ECD -4ECE -4ED1 -4ED3 -4ED4 -4ED5 -4ED6 -4ED7 -4ED8 -4ED9 -4EDD -4EDE -4EDF -4EE1 -4EE3 -4EE4 -4EE5 -4EE8 -4EEA -4EEB -4EEC -4EF0 -4EF2 -4EF3 -4EF5 -4EF6 -4EF7 -4EFB -4EFD -4EFF -4F01 -4F09 -4F0A -4F0D -4F0E -4F0F -4F10 -4F11 -4F17 -4F18 -4F19 -4F1A -4F1B -4F1E -4F1F -4F20 -4F22 -4F24 -4F25 -4F26 -4F27 -4F2A -4F2B -4F2F -4F30 -4F32 -4F34 -4F36 -4F38 -4F3A -4F3C -4F3D -4F43 -4F46 -4F4D -4F4E -4F4F -4F50 -4F51 -4F53 -4F55 -4F57 -4F58 -4F59 -4F5A -4F5B -4F5C -4F5D -4F5E -4F5F -4F60 -4F63 -4F64 -4F65 -4F67 -4F69 -4F6C -4F6F -4F70 -4F73 -4F74 -4F76 -4F7B -4F7C -4F7E -4F7F -4F83 -4F84 -4F88 -4F89 -4F8B -4F8D -4F8F -4F91 -4F94 -4F97 -4F9B -4F9D -4FA0 -4FA3 -4FA5 -4FA6 -4FA7 -4FA8 -4FA9 -4FAA -4FAC -4FAE -4FAF -4FB5 -4FBF -4FC3 -4FC4 -4FC5 -4FCA -4FCE -4FCF -4FD0 -4FD1 -4FD7 -4FD8 -4FDA -4FDC -4FDD -4FDE -4FDF -4FE1 -4FE3 -4FE6 -4FE8 -4FE9 -4FEA -4FED -4FEE -4FEF -4FF1 -4FF3 -4FF8 -4FFA -4FFE -500C -500D -500F -5012 -5014 -5018 -5019 -501A -501C -501F -5021 -5025 -5026 -5028 -5029 -502A -502C -502D -502E -503A -503C -503E -5043 -5047 -5048 -504C -504E -504F -5055 -505A -505C -5065 -506C -5076 -5077 -507B -507E -507F -5080 -5085 -5088 -508D -50A3 -50A5 -50A7 -50A8 -50A9 -50AC -50B2 -50BA -50BB -50CF -50D6 -50DA -50E6 -50E7 -50EC -50ED -50EE -50F3 -50F5 -50FB -5106 -5107 -510B -5112 -5121 -513F -5140 -5141 -5143 -5144 -5145 -5146 -5148 -5149 -514B -514D -5151 -5154 -5155 -5156 -515A -515C -5162 -5165 -5168 -516B -516C -516D -516E -5170 -5171 -5173 -5174 -5175 -5176 -5177 -5178 -5179 -517B -517C -517D -5180 -5181 -5182 -5185 -5188 -5189 -518C -518D -5192 -5195 -5196 -5197 -5199 -519B -519C -51A0 -51A2 -51A4 -51A5 -51AB -51AC -51AF -51B0 -51B1 -51B2 -51B3 -51B5 -51B6 -51B7 -51BB -51BC -51BD -51C0 -51C4 -51C6 -51C7 -51C9 -51CB -51CC -51CF -51D1 -51DB -51DD -51E0 -51E1 -51E4 -51EB -51ED -51EF -51F0 -51F3 -51F5 -51F6 -51F8 -51F9 -51FA -51FB -51FC -51FD -51FF -5200 -5201 -5202 -5203 -5206 -5207 -5208 -520A -520D -520E -5211 -5212 -5216 -5217 -5218 -5219 -521A -521B -521D -5220 -5224 -5228 -5229 -522B -522D -522E -5230 -5233 -5236 -5237 -5238 -5239 -523A -523B -523D -523F -5240 -5241 -5242 -5243 -524A -524C -524D -5250 -5251 -5254 -5256 -525C -525E -5261 -5265 -5267 -5269 -526A -526F -5272 -527D -527F -5281 -5282 -5288 -5290 -5293 -529B -529D -529E -529F -52A0 -52A1 -52A2 -52A3 -52A8 -52A9 -52AA -52AB -52AC -52AD -52B1 -52B2 -52B3 -52BE -52BF -52C3 -52C7 -52C9 -52CB -52D0 -52D2 -52D6 -52D8 -52DF -52E4 -52F0 -52F9 -52FA -52FE -52FF -5300 -5305 -5306 -5308 -530D -530F -5310 -5315 -5316 -5317 -5319 -531A -531D -5320 -5321 -5323 -5326 -532A -532E -5339 -533A -533B -533E -533F -5341 -5343 -5345 -5347 -5348 -5349 -534A -534E -534F -5351 -5352 -5353 -5355 -5356 -5357 -535A -535C -535E -535F -5360 -5361 -5362 -5363 -5364 -5366 -5367 -5369 -536B -536E -536F -5370 -5371 -5373 -5374 -5375 -5377 -5378 -537A -537F -5382 -5384 -5385 -5386 -5389 -538B -538C -538D -5395 -5398 -539A -539D -539F -53A2 -53A3 -53A5 -53A6 -53A8 -53A9 -53AE -53B6 -53BB -53BF -53C1 -53C2 -53C8 -53C9 -53CA -53CB -53CC -53CD -53D1 -53D4 -53D6 -53D7 -53D8 -53D9 -53DB -53DF -53E0 -53E3 -53E4 -53E5 -53E6 -53E8 -53E9 -53EA -53EB -53EC -53ED -53EE -53EF -53F0 -53F1 -53F2 -53F3 -53F5 -53F6 -53F7 -53F8 -53F9 -53FB -53FC -53FD -5401 -5403 -5404 -5406 -5408 -5409 -540A -540C -540D -540E -540F -5410 -5411 -5412 -5413 -5415 -5416 -5417 -541B -541D -541E -541F -5420 -5421 -5423 -5426 -5427 -5428 -5429 -542B -542C -542D -542E -542F -5431 -5432 -5434 -5435 -5438 -5439 -543B -543C -543E -5440 -5443 -5446 -5448 -544A -544B -5450 -5452 -5453 -5454 -5455 -5456 -5457 -5458 -5459 -545B -545C -5462 -5464 -5466 -5468 -5471 -5472 -5473 -5475 -5476 -5477 -5478 -547B -547C -547D -5480 -5482 -5484 -5486 -548B -548C -548E -548F -5490 -5492 -5494 -5495 -5496 -5499 -549A -549B -549D -54A3 -54A4 -54A6 -54A7 -54A8 -54A9 -54AA -54AB -54AC -54AD -54AF -54B1 -54B3 -54B4 -54B8 -54BB -54BD -54BF -54C0 -54C1 -54C2 -54C4 -54C6 -54C7 -54C8 -54C9 -54CC -54CD -54CE -54CF -54D0 -54D1 -54D2 -54D3 -54D4 -54D5 -54D7 -54D9 -54DA -54DC -54DD -54DE -54DF -54E5 -54E6 -54E7 -54E8 -54E9 -54EA -54ED -54EE -54F2 -54F3 -54FA -54FC -54FD -54FF -5501 -5506 -5507 -5509 -550F -5510 -5511 -5514 -551B -5520 -5522 -5523 -5524 -5527 -552A -552C -552E -552F -5530 -5531 -5533 -5537 -553C -553E -553F -5541 -5543 -5544 -5546 -5549 -554A -5550 -5555 -5556 -555C -5561 -5564 -5565 -5566 -5567 -556A -556C -556D -556E -5575 -5576 -5577 -5578 -557B -557C -557E -5580 -5581 -5582 -5583 -5584 -5587 -5588 -5589 -558A -558B -558F -5591 -5594 -5598 -5599 -559C -559D -559F -55A7 -55B1 -55B3 -55B5 -55B7 -55B9 -55BB -55BD -55BE -55C4 -55C5 -55C9 -55CC -55CD -55D1 -55D2 -55D3 -55D4 -55D6 -55DC -55DD -55DF -55E1 -55E3 -55E4 -55E5 -55E6 -55E8 -55EA -55EB -55EC -55EF -55F2 -55F3 -55F5 -55F7 -55FD -55FE -5600 -5601 -5608 -5609 -560C -560E -560F -5618 -561B -561E -561F -5623 -5624 -5627 -562C -562D -5631 -5632 -5634 -5636 -5639 -563B -563F -564C -564D -564E -5654 -5657 -5658 -5659 -565C -5662 -5664 -5668 -5669 -566A -566B -566C -5671 -5676 -567B -567C -5685 -5686 -568E -568F -5693 -56A3 -56AF -56B7 -56BC -56CA -56D4 -56D7 -56DA -56DB -56DD -56DE -56DF -56E0 -56E1 -56E2 -56E4 -56EB -56ED -56F0 -56F1 -56F4 -56F5 -56F9 -56FA -56FD -56FE -56FF -5703 -5704 -5706 -5708 -5709 -570A -571C -571F -5723 -5728 -5729 -572A -572C -572D -572E -572F -5730 -5733 -5739 -573A -573B -573E -5740 -5742 -5747 -574A -574C -574D -574E -574F -5750 -5751 -5757 -575A -575B -575C -575D -575E -575F -5760 -5761 -5764 -5766 -5768 -5769 -576A -576B -576D -576F -5773 -5776 -5777 -577B -577C -5782 -5783 -5784 -5785 -5786 -578B -578C -5792 -5793 -579B -57A0 -57A1 -57A2 -57A3 -57A4 -57A6 -57A7 -57A9 -57AB -57AD -57AE -57B2 -57B4 -57B8 -57C2 -57C3 -57CB -57CE -57CF -57D2 -57D4 -57D5 -57D8 -57D9 -57DA -57DD -57DF -57E0 -57E4 -57ED -57EF -57F4 -57F8 -57F9 -57FA -57FD -5800 -5802 -5806 -5807 -580B -580D -5811 -5815 -5819 -581E -5820 -5821 -5824 -582A -5830 -5835 -5844 -584C -584D -5851 -5854 -5858 -585E -5865 -586B -586C -587E -5880 -5881 -5883 -5885 -5889 -5892 -5893 -5899 -589A -589E -589F -58A8 -58A9 -58BC -58C1 -58C5 -58D1 -58D5 -58E4 -58EB -58EC -58EE -58F0 -58F3 -58F6 -58F9 -5902 -5904 -5907 -590D -590F -5914 -5915 -5916 -5919 -591A -591C -591F -5924 -5925 -5927 -5929 -592A -592B -592D -592E -592F -5931 -5934 -5937 -5938 -5939 -593A -593C -5941 -5942 -5944 -5947 -5948 -5949 -594B -594E -594F -5951 -5954 -5955 -5956 -5957 -5958 -595A -5960 -5962 -5965 -5973 -5974 -5976 -5978 -5979 -597D -5981 -5982 -5983 -5984 -5986 -5987 -5988 -598A -598D -5992 -5993 -5996 -5997 -5999 -599E -59A3 -59A4 -59A5 -59A8 -59A9 -59AA -59AB -59AE -59AF -59B2 -59B9 -59BB -59BE -59C6 -59CA -59CB -59D0 -59D1 -59D2 -59D3 -59D4 -59D7 -59D8 -59DA -59DC -59DD -59E3 -59E5 -59E8 -59EC -59F9 -59FB -59FF -5A01 -5A03 -5A04 -5A05 -5A06 -5A07 -5A08 -5A09 -5A0C -5A11 -5A13 -5A18 -5A1C -5A1F -5A20 -5A23 -5A25 -5A29 -5A31 -5A32 -5A34 -5A36 -5A3C -5A40 -5A46 -5A49 -5A4A -5A55 -5A5A -5A62 -5A67 -5A6A -5A74 -5A75 -5A76 -5A77 -5A7A -5A7F -5A92 -5A9A -5A9B -5AAA -5AB2 -5AB3 -5AB5 -5AB8 -5ABE -5AC1 -5AC2 -5AC9 -5ACC -5AD2 -5AD4 -5AD6 -5AD8 -5ADC -5AE0 -5AE1 -5AE3 -5AE6 -5AE9 -5AEB -5AF1 -5B09 -5B16 -5B17 -5B32 -5B34 -5B37 -5B40 -5B50 -5B51 -5B53 -5B54 -5B55 -5B57 -5B58 -5B59 -5B5A -5B5B -5B5C -5B5D -5B5F -5B62 -5B63 -5B64 -5B65 -5B66 -5B69 -5B6A -5B6C -5B70 -5B71 -5B73 -5B75 -5B7A -5B7D -5B80 -5B81 -5B83 -5B84 -5B85 -5B87 -5B88 -5B89 -5B8B -5B8C -5B8F -5B93 -5B95 -5B97 -5B98 -5B99 -5B9A -5B9B -5B9C -5B9D -5B9E -5BA0 -5BA1 -5BA2 -5BA3 -5BA4 -5BA5 -5BA6 -5BAA -5BAB -5BB0 -5BB3 -5BB4 -5BB5 -5BB6 -5BB8 -5BB9 -5BBD -5BBE -5BBF -5BC2 -5BC4 -5BC5 -5BC6 -5BC7 -5BCC -5BD0 -5BD2 -5BD3 -5BDD -5BDE -5BDF -5BE1 -5BE4 -5BE5 -5BE8 -5BEE -5BF0 -5BF8 -5BF9 -5BFA -5BFB -5BFC -5BFF -5C01 -5C04 -5C06 -5C09 -5C0A -5C0F -5C11 -5C14 -5C15 -5C16 -5C18 -5C1A -5C1C -5C1D -5C22 -5C24 -5C25 -5C27 -5C2C -5C31 -5C34 -5C38 -5C39 -5C3A -5C3B -5C3C -5C3D -5C3E -5C3F -5C40 -5C41 -5C42 -5C45 -5C48 -5C49 -5C4A -5C4B -5C4E -5C4F -5C50 -5C51 -5C55 -5C59 -5C5E -5C60 -5C61 -5C63 -5C65 -5C66 -5C6E -5C6F -5C71 -5C79 -5C7A -5C7F -5C81 -5C82 -5C88 -5C8C -5C8D -5C90 -5C91 -5C94 -5C96 -5C97 -5C98 -5C99 -5C9A -5C9B -5C9C -5CA2 -5CA3 -5CA9 -5CAB -5CAC -5CAD -5CB1 -5CB3 -5CB5 -5CB7 -5CB8 -5CBD -5CBF -5CC1 -5CC4 -5CCB -5CD2 -5CD9 -5CE1 -5CE4 -5CE5 -5CE6 -5CE8 -5CEA -5CED -5CF0 -5CFB -5D02 -5D03 -5D06 -5D07 -5D0E -5D14 -5D16 -5D1B -5D1E -5D24 -5D26 -5D27 -5D29 -5D2D -5D2E -5D34 -5D3D -5D3E -5D47 -5D4A -5D4B -5D4C -5D58 -5D5B -5D5D -5D69 -5D6B -5D6C -5D6F -5D74 -5D82 -5D99 -5D9D -5DB7 -5DC5 -5DCD -5DDB -5DDD -5DDE -5DE1 -5DE2 -5DE5 -5DE6 -5DE7 -5DE8 -5DE9 -5DEB -5DEE -5DEF -5DF1 -5DF2 -5DF3 -5DF4 -5DF7 -5DFD -5DFE -5E01 -5E02 -5E03 -5E05 -5E06 -5E08 -5E0C -5E0F -5E10 -5E11 -5E14 -5E15 -5E16 -5E18 -5E19 -5E1A -5E1B -5E1C -5E1D -5E26 -5E27 -5E2D -5E2E -5E31 -5E37 -5E38 -5E3B -5E3C -5E3D -5E42 -5E44 -5E45 -5E4C -5E54 -5E55 -5E5B -5E5E -5E61 -5E62 -5E72 -5E73 -5E74 -5E76 -5E78 -5E7A -5E7B -5E7C -5E7D -5E7F -5E80 -5E84 -5E86 -5E87 -5E8A -5E8B -5E8F -5E90 -5E91 -5E93 -5E94 -5E95 -5E96 -5E97 -5E99 -5E9A -5E9C -5E9E -5E9F -5EA0 -5EA5 -5EA6 -5EA7 -5EAD -5EB3 -5EB5 -5EB6 -5EB7 -5EB8 -5EB9 -5EBE -5EC9 -5ECA -5ED1 -5ED2 -5ED3 -5ED6 -5EDB -5EE8 -5EEA -5EF4 -5EF6 -5EF7 -5EFA -5EFE -5EFF -5F00 -5F01 -5F02 -5F03 -5F04 -5F08 -5F0A -5F0B -5F0F -5F11 -5F13 -5F15 -5F17 -5F18 -5F1B -5F1F -5F20 -5F25 -5F26 -5F27 -5F29 -5F2A -5F2D -5F2F -5F31 -5F39 -5F3A -5F3C -5F40 -5F50 -5F52 -5F53 -5F55 -5F56 -5F57 -5F58 -5F5D -5F61 -5F62 -5F64 -5F66 -5F69 -5F6A -5F6C -5F6D -5F70 -5F71 -5F73 -5F77 -5F79 -5F7B -5F7C -5F80 -5F81 -5F82 -5F84 -5F85 -5F87 -5F88 -5F89 -5F8A -5F8B -5F8C -5F90 -5F92 -5F95 -5F97 -5F98 -5F99 -5F9C -5FA1 -5FA8 -5FAA -5FAD -5FAE -5FB5 -5FB7 -5FBC -5FBD -5FC3 -5FC4 -5FC5 -5FC6 -5FC9 -5FCC -5FCD -5FCF -5FD0 -5FD1 -5FD2 -5FD6 -5FD7 -5FD8 -5FD9 -5FDD -5FE0 -5FE1 -5FE4 -5FE7 -5FEA -5FEB -5FED -5FEE -5FF1 -5FF5 -5FF8 -5FFB -5FFD -5FFE -5FFF -6000 -6001 -6002 -6003 -6004 -6005 -6006 -600A -600D -600E -600F -6012 -6014 -6015 -6016 -6019 -601B -601C -601D -6020 -6021 -6025 -6026 -6027 -6028 -6029 -602A -602B -602F -6035 -603B -603C -603F -6041 -6042 -6043 -604B -604D -6050 -6052 -6055 -6059 -605A -605D -6062 -6063 -6064 -6067 -6068 -6069 -606A -606B -606C -606D -606F -6070 -6073 -6076 -6078 -6079 -607A -607B -607C -607D -607F -6083 -6084 -6089 -608C -608D -6092 -6094 -6096 -609A -609B -609D -609F -60A0 -60A3 -60A6 -60A8 -60AB -60AC -60AD -60AF -60B1 -60B2 -60B4 -60B8 -60BB -60BC -60C5 -60C6 -60CA -60CB -60D1 -60D5 -60D8 -60DA -60DC -60DD -60DF -60E0 -60E6 -60E7 -60E8 -60E9 -60EB -60EC -60ED -60EE -60EF -60F0 -60F3 -60F4 -60F6 -60F9 -60FA -6100 -6101 -6106 -6108 -6109 -610D -610E -610F -6115 -611A -611F -6120 -6123 -6124 -6126 -6127 -612B -613F -6148 -614A -614C -614E -6151 -6155 -615D -6162 -6167 -6168 -6170 -6175 -6177 -618B -618E -6194 -619D -61A7 -61A8 -61A9 -61AC -61B7 -61BE -61C2 -61C8 -61CA -61CB -61D1 -61D2 -61D4 -61E6 -61F5 -61FF -6206 -6208 -620A -620B -620C -620D -620E -620F -6210 -6211 -6212 -6215 -6216 -6217 -6218 -621A -621B -621F -6221 -6222 -6224 -6225 -622A -622C -622E -6233 -6234 -6237 -623D -623E -623F -6240 -6241 -6243 -6247 -6248 -6249 -624B -624C -624D -624E -6251 -6252 -6253 -6254 -6258 -625B -6263 -6266 -6267 -6269 -626A -626B -626C -626D -626E -626F -6270 -6273 -6276 -6279 -627C -627E -627F -6280 -6284 -6289 -628A -6291 -6292 -6293 -6295 -6296 -6297 -6298 -629A -629B -629F -62A0 -62A1 -62A2 -62A4 -62A5 -62A8 -62AB -62AC -62B1 -62B5 -62B9 -62BB -62BC -62BD -62BF -62C2 -62C4 -62C5 -62C6 -62C7 -62C8 -62C9 -62CA -62CC -62CD -62CE -62D0 -62D2 -62D3 -62D4 -62D6 -62D7 -62D8 -62D9 -62DA -62DB -62DC -62DF -62E2 -62E3 -62E5 -62E6 -62E7 -62E8 -62E9 -62EC -62ED -62EE -62EF -62F1 -62F3 -62F4 -62F6 -62F7 -62FC -62FD -62FE -62FF -6301 -6302 -6307 -6308 -6309 -630E -6311 -6316 -631A -631B -631D -631E -631F -6320 -6321 -6322 -6323 -6324 -6325 -6328 -632A -632B -632F -6332 -6339 -633A -633D -6342 -6343 -6345 -6346 -6349 -634B -634C -634D -634E -634F -6350 -6355 -635E -635F -6361 -6362 -6363 -6367 -6369 -636D -636E -6371 -6376 -6377 -637A -637B -6380 -6382 -6387 -6388 -6389 -638A -638C -638E -638F -6390 -6392 -6396 -6398 -63A0 -63A2 -63A3 -63A5 -63A7 -63A8 -63A9 -63AA -63AC -63AD -63AE -63B0 -63B3 -63B4 -63B7 -63B8 -63BA -63BC -63BE -63C4 -63C6 -63C9 -63CD -63CE -63CF -63D0 -63D2 -63D6 -63DE -63E0 -63E1 -63E3 -63E9 -63EA -63ED -63F2 -63F4 -63F6 -63F8 -63FD -63FF -6400 -6401 -6402 -6405 -640B -640C -640F -6410 -6413 -6414 -641B -641C -641E -6420 -6421 -6426 -642A -642C -642D -6434 -643A -643D -643F -6441 -6444 -6445 -6446 -6447 -6448 -644A -6452 -6454 -6458 -645E -6467 -6469 -646D -6478 -6479 -647A -6482 -6484 -6485 -6487 -6491 -6492 -6495 -6496 -6499 -649E -64A4 -64A9 -64AC -64AD -64AE -64B0 -64B5 -64B7 -64B8 -64BA -64BC -64C0 -64C2 -64C5 -64CD -64CE -64D0 -64D2 -64D7 -64D8 -64DE -64E2 -64E4 -64E6 -6500 -6509 -6512 -6518 -6525 -652B -652E -652F -6534 -6535 -6536 -6538 -6539 -653B -653E -653F -6545 -6548 -6549 -654C -654F -6551 -6555 -6556 -6559 -655B -655D -655E -6562 -6563 -6566 -656B -656C -6570 -6572 -6574 -6577 -6587 -658B -658C -6590 -6591 -6593 -6597 -6599 -659B -659C -659F -65A1 -65A4 -65A5 -65A7 -65A9 -65AB -65AD -65AF -65B0 -65B9 -65BC -65BD -65C1 -65C3 -65C4 -65C5 -65C6 -65CB -65CC -65CE -65CF -65D2 -65D6 -65D7 -65E0 -65E2 -65E5 -65E6 -65E7 -65E8 -65E9 -65EC -65ED -65EE -65EF -65F0 -65F1 -65F6 -65F7 -65FA -6600 -6602 -6603 -6606 -660A -660C -660E -660F -6613 -6614 -6615 -6619 -661D -661F -6620 -6625 -6627 -6628 -662D -662F -6631 -6634 -6635 -6636 -663C -663E -6641 -6643 -664B -664C -664F -6652 -6653 -6654 -6655 -6656 -6657 -665A -665F -6661 -6664 -6666 -6668 -666E -666F -6670 -6674 -6676 -6677 -667A -667E -6682 -6684 -6687 -668C -6691 -6696 -6697 -669D -66A7 -66A8 -66AE -66B4 -66B9 -66BE -66D9 -66DB -66DC -66DD -66E6 -66E9 -66F0 -66F2 -66F3 -66F4 -66F7 -66F9 -66FC -66FE -66FF -6700 -6708 -6709 -670A -670B -670D -6710 -6714 -6715 -6717 -671B -671D -671F -6726 -6728 -672A -672B -672C -672D -672F -6731 -6734 -6735 -673A -673D -6740 -6742 -6743 -6746 -6748 -6749 -674C -674E -674F -6750 -6751 -6753 -6756 -675C -675E -675F -6760 -6761 -6765 -6768 -6769 -676A -676D -676F -6770 -6772 -6773 -6775 -6777 -677C -677E -677F -6781 -6784 -6787 -6789 -678B -6790 -6795 -6797 -6798 -679A -679C -679D -679E -67A2 -67A3 -67A5 -67A7 -67A8 -67AA -67AB -67AD -67AF -67B0 -67B3 -67B5 -67B6 -67B7 -67B8 -67C1 -67C3 -67C4 -67CF -67D0 -67D1 -67D2 -67D3 -67D4 -67D8 -67D9 -67DA -67DC -67DD -67DE -67E0 -67E2 -67E5 -67E9 -67EC -67EF -67F0 -67F1 -67F3 -67F4 -67FD -67FF -6800 -6805 -6807 -6808 -6809 -680A -680B -680C -680E -680F -6811 -6813 -6816 -6817 -681D -6821 -6829 -682A -6832 -6833 -6837 -6838 -6839 -683C -683D -683E -6840 -6841 -6842 -6843 -6844 -6845 -6846 -6848 -6849 -684A -684C -684E -6850 -6851 -6853 -6854 -6855 -6860 -6861 -6862 -6863 -6864 -6865 -6866 -6867 -6868 -6869 -686B -6874 -6876 -6877 -6881 -6883 -6885 -6886 -688F -6893 -6897 -68A2 -68A6 -68A7 -68A8 -68AD -68AF -68B0 -68B3 -68B5 -68C0 -68C2 -68C9 -68CB -68CD -68D2 -68D5 -68D8 -68DA -68E0 -68E3 -68EE -68F0 -68F1 -68F5 -68F9 -68FA -68FC -6901 -6905 -690B -690D -690E -6910 -6912 -691F -6920 -6924 -692D -6930 -6934 -6939 -693D -693F -6942 -6954 -6957 -695A -695D -695E -6960 -6963 -6966 -696B -696E -6971 -6977 -6978 -6979 -697C -6980 -6982 -6984 -6986 -6987 -6988 -6989 -698D -6994 -6995 -6998 -699B -699C -69A7 -69A8 -69AB -69AD -69B1 -69B4 -69B7 -69BB -69C1 -69CA -69CC -69CE -69D0 -69D4 -69DB -69DF -69E0 -69ED -69F2 -69FD -69FF -6A0A -6A17 -6A18 -6A1F -6A21 -6A28 -6A2A -6A2F -6A31 -6A35 -6A3D -6A3E -6A44 -6A47 -6A50 -6A58 -6A59 -6A5B -6A61 -6A65 -6A71 -6A79 -6A7C -6A80 -6A84 -6A8E -6A90 -6A91 -6A97 -6AA0 -6AA9 -6AAB -6AAC -6B20 -6B21 -6B22 -6B23 -6B24 -6B27 -6B32 -6B37 -6B39 -6B3A -6B3E -6B43 -6B46 -6B47 -6B49 -6B4C -6B59 -6B62 -6B63 -6B64 -6B65 -6B66 -6B67 -6B6A -6B79 -6B7B -6B7C -6B81 -6B82 -6B83 -6B84 -6B86 -6B87 -6B89 -6B8A -6B8B -6B8D -6B92 -6B93 -6B96 -6B9A -6B9B -6BA1 -6BAA -6BB3 -6BB4 -6BB5 -6BB7 -6BBF -6BC1 -6BC2 -6BC5 -6BCB -6BCD -6BCF -6BD2 -6BD3 -6BD4 -6BD5 -6BD6 -6BD7 -6BD9 -6BDB -6BE1 -6BEA -6BEB -6BEF -6BF3 -6BF5 -6BF9 -6BFD -6C05 -6C06 -6C07 -6C0D -6C0F -6C10 -6C11 -6C13 -6C14 -6C15 -6C16 -6C18 -6C19 -6C1A -6C1B -6C1F -6C21 -6C22 -6C24 -6C26 -6C27 -6C28 -6C29 -6C2A -6C2E -6C2F -6C30 -6C32 -6C34 -6C35 -6C38 -6C3D -6C40 -6C41 -6C42 -6C46 -6C47 -6C49 -6C4A -6C50 -6C54 -6C55 -6C57 -6C5B -6C5C -6C5D -6C5E -6C5F -6C60 -6C61 -6C64 -6C68 -6C69 -6C6A -6C70 -6C72 -6C74 -6C76 -6C79 -6C7D -6C7E -6C81 -6C82 -6C83 -6C85 -6C86 -6C88 -6C89 -6C8C -6C8F -6C90 -6C93 -6C94 -6C99 -6C9B -6C9F -6CA1 -6CA3 -6CA4 -6CA5 -6CA6 -6CA7 -6CA9 -6CAA -6CAB -6CAD -6CAE -6CB1 -6CB2 -6CB3 -6CB8 -6CB9 -6CBB -6CBC -6CBD -6CBE -6CBF -6CC4 -6CC5 -6CC9 -6CCA -6CCC -6CD0 -6CD3 -6CD4 -6CD5 -6CD6 -6CD7 -6CDB -6CDE -6CE0 -6CE1 -6CE2 -6CE3 -6CE5 -6CE8 -6CEA -6CEB -6CEE -6CEF -6CF0 -6CF1 -6CF3 -6CF5 -6CF6 -6CF7 -6CF8 -6CFA -6CFB -6CFC -6CFD -6CFE -6D01 -6D04 -6D07 -6D0B -6D0C -6D0E -6D12 -6D17 -6D19 -6D1A -6D1B -6D1E -6D25 -6D27 -6D2A -6D2B -6D2E -6D31 -6D32 -6D33 -6D35 -6D39 -6D3B -6D3C -6D3D -6D3E -6D41 -6D43 -6D45 -6D46 -6D47 -6D48 -6D4A -6D4B -6D4D -6D4E -6D4F -6D51 -6D52 -6D53 -6D54 -6D59 -6D5A -6D5C -6D5E -6D60 -6D63 -6D66 -6D69 -6D6A -6D6E -6D6F -6D74 -6D77 -6D78 -6D7C -6D82 -6D85 -6D88 -6D89 -6D8C -6D8E -6D91 -6D93 -6D94 -6D95 -6D9B -6D9D -6D9E -6D9F -6DA0 -6DA1 -6DA3 -6DA4 -6DA6 -6DA7 -6DA8 -6DA9 -6DAA -6DAB -6DAE -6DAF -6DB2 -6DB5 -6DB8 -6DBF -6DC0 -6DC4 -6DC5 -6DC6 -6DC7 -6DCB -6DCC -6DD1 -6DD6 -6DD8 -6DD9 -6DDD -6DDE -6DE0 -6DE1 -6DE4 -6DE6 -6DEB -6DEC -6DEE -6DF1 -6DF3 -6DF7 -6DF9 -6DFB -6DFC -6E05 -6E0A -6E0C -6E0D -6E0E -6E10 -6E11 -6E14 -6E16 -6E17 -6E1A -6E1D -6E20 -6E21 -6E23 -6E24 -6E25 -6E29 -6E2B -6E2D -6E2F -6E32 -6E34 -6E38 -6E3A -6E43 -6E44 -6E4D -6E4E -6E53 -6E54 -6E56 -6E58 -6E5B -6E5F -6E6B -6E6E -6E7E -6E7F -6E83 -6E85 -6E86 -6E89 -6E8F -6E90 -6E98 -6E9C -6E9F -6EA2 -6EA5 -6EA7 -6EAA -6EAF -6EB1 -6EB2 -6EB4 -6EB6 -6EB7 -6EBA -6EBB -6EBD -6EC1 -6EC2 -6EC7 -6ECB -6ECF -6ED1 -6ED3 -6ED4 -6ED5 -6ED7 -6EDA -6EDE -6EDF -6EE0 -6EE1 -6EE2 -6EE4 -6EE5 -6EE6 -6EE8 -6EE9 -6EF4 -6EF9 -6F02 -6F06 -6F09 -6F0F -6F13 -6F14 -6F15 -6F20 -6F24 -6F29 -6F2A -6F2B -6F2D -6F2F -6F31 -6F33 -6F36 -6F3E -6F46 -6F47 -6F4B -6F4D -6F58 -6F5C -6F5E -6F62 -6F66 -6F6D -6F6E -6F72 -6F74 -6F78 -6F7A -6F7C -6F84 -6F88 -6F89 -6F8C -6F8D -6F8E -6F9C -6FA1 -6FA7 -6FB3 -6FB6 -6FB9 -6FC0 -6FC2 -6FC9 -6FD1 -6FD2 -6FDE -6FE0 -6FE1 -6FEE -6FEF -7011 -701A -701B -7023 -7035 -7039 -704C -704F -705E -706B -706C -706D -706F -7070 -7075 -7076 -7078 -707C -707E -707F -7080 -7085 -7089 -708A -708E -7092 -7094 -7095 -7096 -7099 -709C -709D -70AB -70AC -70AD -70AE -70AF -70B1 -70B3 -70B7 -70B8 -70B9 -70BB -70BC -70BD -70C0 -70C1 -70C2 -70C3 -70C8 -70CA -70D8 -70D9 -70DB -70DF -70E4 -70E6 -70E7 -70E8 -70E9 -70EB -70EC -70ED -70EF -70F7 -70F9 -70FD -7109 -710A -7110 -7113 -7115 -7116 -7118 -7119 -711A -7126 -712F -7130 -7131 -7136 -7145 -714A -714C -714E -715C -715E -7164 -7166 -7167 -7168 -716E -7172 -7173 -7178 -717A -717D -7184 -718A -718F -7194 -7198 -7199 -719F -71A0 -71A8 -71AC -71B3 -71B5 -71B9 -71C3 -71CE -71D4 -71D5 -71E0 -71E5 -71E7 -71EE -71F9 -7206 -721D -7228 -722A -722C -7230 -7231 -7235 -7236 -7237 -7238 -7239 -723B -723D -723F -7247 -7248 -724C -724D -7252 -7256 -7259 -725B -725D -725F -7261 -7262 -7266 -7267 -7269 -726E -726F -7272 -7275 -7279 -727A -727E -727F -7280 -7281 -7284 -728A -728B -728D -728F -7292 -729F -72AC -72AD -72AF -72B0 -72B4 -72B6 -72B7 -72B8 -72B9 -72C1 -72C2 -72C3 -72C4 -72C8 -72CD -72CE -72D0 -72D2 -72D7 -72D9 -72DE -72E0 -72E1 -72E8 -72E9 -72EC -72ED -72EE -72EF -72F0 -72F1 -72F2 -72F3 -72F4 -72F7 -72F8 -72FA -72FB -72FC -7301 -7303 -730A -730E -7313 -7315 -7316 -7317 -731B -731C -731D -731E -7321 -7322 -7325 -7329 -732A -732B -732C -732E -7331 -7334 -7337 -7338 -7339 -733E -733F -734D -7350 -7352 -7357 -7360 -736C -736D -736F -737E -7384 -7387 -7389 -738B -738E -7391 -7396 -739B -739F -73A2 -73A9 -73AB -73AE -73AF -73B0 -73B2 -73B3 -73B7 -73BA -73BB -73C0 -73C2 -73C8 -73C9 -73CA -73CD -73CF -73D0 -73D1 -73D9 -73DE -73E0 -73E5 -73E7 -73E9 -73ED -73F2 -7403 -7405 -7406 -7409 -740A -740F -7410 -741A -741B -7422 -7425 -7426 -7428 -742A -742C -742E -7430 -7433 -7434 -7435 -7436 -743C -7441 -7455 -7457 -7459 -745A -745B -745C -745E -745F -746D -7470 -7476 -7477 -747E -7480 -7481 -7483 -7487 -748B -748E -7490 -749C -749E -74A7 -74A8 -74A9 -74BA -74D2 -74DC -74DE -74E0 -74E2 -74E3 -74E4 -74E6 -74EE -74EF -74F4 -74F6 -74F7 -74FF -7504 -750D -750F -7511 -7513 -7518 -7519 -751A -751C -751F -7525 -7528 -7529 -752B -752C -752D -752F -7530 -7531 -7532 -7533 -7535 -7537 -7538 -753A -753B -753E -7540 -7545 -7548 -754B -754C -754E -754F -7554 -7559 -755A -755B -755C -7565 -7566 -756A -7572 -7574 -7578 -7579 -757F -7583 -7586 -758B -758F -7591 -7592 -7594 -7596 -7597 -7599 -759A -759D -759F -75A0 -75A1 -75A3 -75A4 -75A5 -75AB -75AC -75AE -75AF -75B0 -75B1 -75B2 -75B3 -75B4 -75B5 -75B8 -75B9 -75BC -75BD -75BE -75C2 -75C3 -75C4 -75C5 -75C7 -75C8 -75C9 -75CA -75CD -75D2 -75D4 -75D5 -75D6 -75D8 -75DB -75DE -75E2 -75E3 -75E4 -75E6 -75E7 -75E8 -75EA -75EB -75F0 -75F1 -75F4 -75F9 -75FC -75FF -7600 -7601 -7603 -7605 -760A -760C -7610 -7615 -7617 -7618 -7619 -761B -761F -7620 -7622 -7624 -7625 -7626 -7629 -762A -762B -762D -7630 -7633 -7634 -7635 -7638 -763C -763E -763F -7640 -7643 -764C -764D -7654 -7656 -765C -765E -7663 -766B -766F -7678 -767B -767D -767E -7682 -7684 -7686 -7687 -7688 -768B -768E -7691 -7693 -7696 -7699 -76A4 -76AE -76B1 -76B2 -76B4 -76BF -76C2 -76C5 -76C6 -76C8 -76CA -76CD -76CE -76CF -76D0 -76D1 -76D2 -76D4 -76D6 -76D7 -76D8 -76DB -76DF -76E5 -76EE -76EF -76F1 -76F2 -76F4 -76F8 -76F9 -76FC -76FE -7701 -7704 -7707 -7708 -7709 -770B -770D -7719 -771A -771F -7720 -7722 -7726 -7728 -7729 -772D -772F -7735 -7736 -7737 -7738 -773A -773C -7740 -7741 -7743 -7747 -7750 -7751 -775A -775B -7761 -7762 -7763 -7765 -7766 -7768 -776B -776C -7779 -777D -777E -777F -7780 -7784 -7785 -778C -778D -778E -7791 -7792 -779F -77A0 -77A2 -77A5 -77A7 -77A9 -77AA -77AC -77B0 -77B3 -77B5 -77BB -77BD -77BF -77CD -77D7 -77DB -77DC -77E2 -77E3 -77E5 -77E7 -77E9 -77EB -77EC -77ED -77EE -77F3 -77F6 -77F8 -77FD -77FE -77FF -7800 -7801 -7802 -7809 -780C -780D -7811 -7812 -7814 -7816 -7817 -7818 -781A -781C -781D -781F -7823 -7825 -7826 -7827 -7829 -782C -782D -7830 -7834 -7837 -7838 -7839 -783A -783B -783C -783E -7840 -7845 -7847 -784C -784E -7850 -7852 -7855 -7856 -7857 -785D -786A -786B -786C -786D -786E -7877 -787C -7887 -7889 -788C -788D -788E -7891 -7893 -7897 -7898 -789A -789B -789C -789F -78A1 -78A3 -78A5 -78A7 -78B0 -78B1 -78B2 -78B3 -78B4 -78B9 -78BE -78C1 -78C5 -78C9 -78CA -78CB -78D0 -78D4 -78D5 -78D9 -78E8 -78EC -78F2 -78F4 -78F7 -78FA -7901 -7905 -7913 -791E -7924 -7934 -793A -793B -793C -793E -7940 -7941 -7946 -7948 -7949 -7953 -7956 -7957 -795A -795B -795C -795D -795E -795F -7960 -7962 -7965 -7967 -7968 -796D -796F -7977 -7978 -797A -7980 -7981 -7984 -7985 -798A -798F -799A -79A7 -79B3 -79B9 -79BA -79BB -79BD -79BE -79C0 -79C1 -79C3 -79C6 -79C9 -79CB -79CD -79D1 -79D2 -79D5 -79D8 -79DF -79E3 -79E4 -79E6 -79E7 -79E9 -79EB -79ED -79EF -79F0 -79F8 -79FB -79FD -7A00 -7A02 -7A03 -7A06 -7A0B -7A0D -7A0E -7A14 -7A17 -7A1A -7A1E -7A20 -7A23 -7A33 -7A37 -7A39 -7A3B -7A3C -7A3D -7A3F -7A46 -7A51 -7A57 -7A70 -7A74 -7A76 -7A77 -7A78 -7A79 -7A7A -7A7F -7A80 -7A81 -7A83 -7A84 -7A86 -7A88 -7A8D -7A91 -7A92 -7A95 -7A96 -7A97 -7A98 -7A9C -7A9D -7A9F -7AA0 -7AA5 -7AA6 -7AA8 -7AAC -7AAD -7AB3 -7ABF -7ACB -7AD6 -7AD9 -7ADE -7ADF -7AE0 -7AE3 -7AE5 -7AE6 -7AED -7AEF -7AF9 -7AFA -7AFD -7AFF -7B03 -7B04 -7B06 -7B08 -7B0A -7B0B -7B0F -7B11 -7B14 -7B15 -7B19 -7B1B -7B1E -7B20 -7B24 -7B25 -7B26 -7B28 -7B2A -7B2B -7B2C -7B2E -7B31 -7B33 -7B38 -7B3A -7B3C -7B3E -7B45 -7B47 -7B49 -7B4B -7B4C -7B4F -7B50 -7B51 -7B52 -7B54 -7B56 -7B58 -7B5A -7B5B -7B5D -7B60 -7B62 -7B6E -7B71 -7B72 -7B75 -7B77 -7B79 -7B7B -7B7E -7B80 -7B85 -7B8D -7B90 -7B94 -7B95 -7B97 -7B9C -7B9D -7BA1 -7BA2 -7BA6 -7BA7 -7BA8 -7BA9 -7BAA -7BAB -7BAC -7BAD -7BB1 -7BB4 -7BB8 -7BC1 -7BC6 -7BC7 -7BCC -7BD1 -7BD3 -7BD9 -7BDA -7BDD -7BE1 -7BE5 -7BE6 -7BEA -7BEE -7BF1 -7BF7 -7BFC -7BFE -7C07 -7C0B -7C0C -7C0F -7C16 -7C1F -7C26 -7C27 -7C2A -7C38 -7C3F -7C40 -7C41 -7C4D -7C73 -7C74 -7C7B -7C7C -7C7D -7C89 -7C91 -7C92 -7C95 -7C97 -7C98 -7C9C -7C9D -7C9E -7C9F -7CA2 -7CA4 -7CA5 -7CAA -7CAE -7CB1 -7CB2 -7CB3 -7CB9 -7CBC -7CBD -7CBE -7CC1 -7CC5 -7CC7 -7CC8 -7CCA -7CCC -7CCD -7CD5 -7CD6 -7CD7 -7CD9 -7CDC -7CDF -7CE0 -7CE8 -7CEF -7CF8 -7CFB -7D0A -7D20 -7D22 -7D27 -7D2B -7D2F -7D6E -7D77 -7DA6 -7DAE -7E3B -7E41 -7E47 -7E82 -7E9B -7E9F -7EA0 -7EA1 -7EA2 -7EA3 -7EA4 -7EA5 -7EA6 -7EA7 -7EA8 -7EA9 -7EAA -7EAB -7EAC -7EAD -7EAF -7EB0 -7EB1 -7EB2 -7EB3 -7EB5 -7EB6 -7EB7 -7EB8 -7EB9 -7EBA -7EBD -7EBE -7EBF -7EC0 -7EC1 -7EC2 -7EC3 -7EC4 -7EC5 -7EC6 -7EC7 -7EC8 -7EC9 -7ECA -7ECB -7ECC -7ECD -7ECE -7ECF -7ED0 -7ED1 -7ED2 -7ED3 -7ED4 -7ED5 -7ED7 -7ED8 -7ED9 -7EDA -7EDB -7EDC -7EDD -7EDE -7EDF -7EE0 -7EE1 -7EE2 -7EE3 -7EE5 -7EE6 -7EE7 -7EE8 -7EE9 -7EEA -7EEB -7EED -7EEE -7EEF -7EF0 -7EF1 -7EF2 -7EF3 -7EF4 -7EF5 -7EF6 -7EF7 -7EF8 -7EFA -7EFB -7EFC -7EFD -7EFE -7EFF -7F00 -7F01 -7F02 -7F03 -7F04 -7F05 -7F06 -7F07 -7F08 -7F09 -7F0B -7F0C -7F0D -7F0E -7F0F -7F11 -7F12 -7F13 -7F14 -7F15 -7F16 -7F17 -7F18 -7F19 -7F1A -7F1B -7F1C -7F1D -7F1F -7F20 -7F21 -7F22 -7F23 -7F24 -7F25 -7F26 -7F27 -7F28 -7F29 -7F2A -7F2B -7F2C -7F2D -7F2E -7F2F -7F30 -7F31 -7F32 -7F33 -7F34 -7F35 -7F36 -7F38 -7F3A -7F42 -7F44 -7F45 -7F50 -7F51 -7F54 -7F55 -7F57 -7F58 -7F5A -7F5F -7F61 -7F62 -7F68 -7F69 -7F6A -7F6E -7F71 -7F72 -7F74 -7F79 -7F7E -7F81 -7F8A -7F8C -7F8E -7F94 -7F9A -7F9D -7F9E -7F9F -7FA1 -7FA4 -7FA7 -7FAF -7FB0 -7FB2 -7FB8 -7FB9 -7FBC -7FBD -7FBF -7FC1 -7FC5 -7FCA -7FCC -7FCE -7FD4 -7FD5 -7FD8 -7FDF -7FE0 -7FE1 -7FE5 -7FE6 -7FE9 -7FEE -7FF0 -7FF1 -7FF3 -7FFB -7FFC -8000 -8001 -8003 -8004 -8005 -8006 -800B -800C -800D -8010 -8012 -8014 -8015 -8016 -8017 -8018 -8019 -801C -8020 -8022 -8025 -8026 -8027 -8028 -8029 -802A -8031 -8033 -8035 -8036 -8037 -8038 -803B -803D -803F -8042 -8043 -8046 -804A -804B -804C -804D -8052 -8054 -8058 -805A -8069 -806A -8071 -807F -8080 -8083 -8084 -8086 -8087 -8089 -808B -808C -8093 -8096 -8098 -809A -809B -809C -809D -809F -80A0 -80A1 -80A2 -80A4 -80A5 -80A9 -80AA -80AB -80AD -80AE -80AF -80B1 -80B2 -80B4 -80B7 -80BA -80BC -80BD -80BE -80BF -80C0 -80C1 -80C2 -80C3 -80C4 -80C6 -80CC -80CD -80CE -80D6 -80D7 -80D9 -80DA -80DB -80DC -80DD -80DE -80E1 -80E4 -80E5 -80E7 -80E8 -80E9 -80EA -80EB -80EC -80ED -80EF -80F0 -80F1 -80F2 -80F3 -80F4 -80F6 -80F8 -80FA -80FC -80FD -8102 -8106 -8109 -810A -810D -810E -810F -8110 -8111 -8112 -8113 -8114 -8116 -8118 -811A -811E -812C -812F -8131 -8132 -8136 -8138 -813E -8146 -8148 -814A -814B -814C -8150 -8151 -8153 -8154 -8155 -8159 -815A -8160 -8165 -8167 -8169 -816D -816E -8170 -8171 -8174 -8179 -817A -817B -817C -817D -817E -817F -8180 -8182 -8188 -818A -818F -8191 -8198 -819B -819C -819D -81A3 -81A6 -81A8 -81AA -81B3 -81BA -81BB -81C0 -81C1 -81C2 -81C3 -81C6 -81CA -81CC -81E3 -81E7 -81EA -81EC -81ED -81F3 -81F4 -81FB -81FC -81FE -8200 -8201 -8202 -8204 -8205 -8206 -820C -820D -8210 -8212 -8214 -821B -821C -821E -821F -8221 -8222 -8223 -8228 -822A -822B -822C -822D -822F -8230 -8231 -8233 -8234 -8235 -8236 -8237 -8238 -8239 -823B -823E -8244 -8247 -8249 -824B -824F -8258 -825A -825F -8268 -826E -826F -8270 -8272 -8273 -8274 -8279 -827A -827D -827E -827F -8282 -8284 -8288 -828A -828B -828D -828E -828F -8291 -8292 -8297 -8298 -8299 -829C -829D -829F -82A1 -82A4 -82A5 -82A6 -82A8 -82A9 -82AA -82AB -82AC -82AD -82AE -82AF -82B0 -82B1 -82B3 -82B4 -82B7 -82B8 -82B9 -82BD -82BE -82C1 -82C4 -82C7 -82C8 -82CA -82CB -82CC -82CD -82CE -82CF -82D1 -82D2 -82D3 -82D4 -82D5 -82D7 -82D8 -82DB -82DC -82DE -82DF -82E0 -82E1 -82E3 -82E4 -82E5 -82E6 -82EB -82EF -82F1 -82F4 -82F7 -82F9 -82FB -8301 -8302 -8303 -8304 -8305 -8306 -8307 -8308 -8309 -830C -830E -830F -8311 -8314 -8315 -8317 -831A -831B -831C -8327 -8328 -832B -832C -832D -832F -8331 -8333 -8334 -8335 -8336 -8338 -8339 -833A -833C -8340 -8343 -8346 -8347 -8349 -834F -8350 -8351 -8352 -8354 -835A -835B -835C -835E -835F -8360 -8361 -8363 -8364 -8365 -8366 -8367 -8368 -8369 -836A -836B -836C -836D -836E -836F -8377 -8378 -837B -837C -837D -8385 -8386 -8389 -838E -8392 -8393 -8398 -839B -839C -839E -83A0 -83A8 -83A9 -83AA -83AB -83B0 -83B1 -83B2 -83B3 -83B4 -83B6 -83B7 -83B8 -83B9 -83BA -83BC -83BD -83C0 -83C1 -83C5 -83C7 -83CA -83CC -83CF -83D4 -83D6 -83D8 -83DC -83DD -83DF -83E0 -83E1 -83E5 -83E9 -83EA -83F0 -83F1 -83F2 -83F8 -83F9 -83FD -8401 -8403 -8404 -8406 -840B -840C -840D -840E -840F -8411 -8418 -841C -841D -8424 -8425 -8426 -8427 -8428 -8431 -8438 -843C -843D -8446 -8451 -8457 -8459 -845A -845B -845C -8461 -8463 -8469 -846B -846C -846D -8471 -8473 -8475 -8476 -8478 -847A -8482 -8487 -8488 -8489 -848B -848C -848E -8497 -8499 -849C -84A1 -84AF -84B2 -84B4 -84B8 -84B9 -84BA -84BD -84BF -84C1 -84C4 -84C9 -84CA -84CD -84D0 -84D1 -84D3 -84D6 -84DD -84DF -84E0 -84E3 -84E5 -84E6 -84EC -84F0 -84FC -84FF -850C -8511 -8513 -8517 -851A -851F -8521 -852B -852C -8537 -8538 -8539 -853A -853B -853C -853D -8543 -8548 -8549 -854A -8556 -8559 -855E -8564 -8568 -8572 -8574 -8579 -857A -857B -857E -8584 -8585 -8587 -858F -859B -859C -85A4 -85A8 -85AA -85AE -85AF -85B0 -85B7 -85B9 -85C1 -85C9 -85CF -85D0 -85D3 -85D5 -85DC -85E4 -85E9 -85FB -85FF -8605 -8611 -8616 -8627 -8629 -8638 -863C -864D -864E -864F -8650 -8651 -8654 -865A -865E -8662 -866B -866C -866E -8671 -8679 -867A -867B -867C -867D -867E -867F -8680 -8681 -8682 -868A -868B -868C -868D -8693 -8695 -869C -869D -86A3 -86A4 -86A7 -86A8 -86A9 -86AA -86AC -86AF -86B0 -86B1 -86B4 -86B5 -86B6 -86BA -86C0 -86C4 -86C6 -86C7 -86C9 -86CA -86CB -86CE -86CF -86D0 -86D1 -86D4 -86D8 -86D9 -86DB -86DE -86DF -86E4 -86E9 -86ED -86EE -86F0 -86F1 -86F2 -86F3 -86F4 -86F8 -86F9 -86FE -8700 -8702 -8703 -8707 -8708 -8709 -870A -870D -8712 -8713 -8715 -8717 -8718 -871A -871C -871E -8721 -8722 -8723 -8725 -8729 -872E -8731 -8734 -8737 -873B -873E -873F -8747 -8748 -8749 -874C -874E -8753 -8757 -8759 -8760 -8763 -8764 -8765 -876E -8770 -8774 -8776 -877B -877C -877D -877E -8782 -8783 -8785 -8788 -878B -878D -8793 -8797 -879F -87A8 -87AB -87AC -87AD -87AF -87B3 -87B5 -87BA -87BD -87C0 -87C6 -87CA -87CB -87D1 -87D2 -87D3 -87DB -87E0 -87E5 -87EA -87EE -87F9 -87FE -8803 -880A -8813 -8815 -8816 -881B -8821 -8822 -8832 -8839 -883C -8840 -8844 -8845 -884C -884D -8854 -8857 -8859 -8861 -8862 -8863 -8864 -8865 -8868 -8869 -886B -886C -886E -8870 -8872 -8877 -887D -887E -887F -8881 -8882 -8884 -8885 -8888 -888B -888D -8892 -8896 -889C -88A2 -88A4 -88AB -88AD -88B1 -88B7 -88BC -88C1 -88C2 -88C5 -88C6 -88C9 -88CE -88D2 -88D4 -88D5 -88D8 -88D9 -88DF -88E2 -88E3 -88E4 -88E5 -88E8 -88F0 -88F1 -88F3 -88F4 -88F8 -88F9 -88FC -88FE -8902 -890A -8910 -8912 -8913 -8919 -891A -891B -8921 -8925 -892A -892B -8930 -8934 -8936 -8941 -8944 -895E -895F -8966 -897B -897F -8981 -8983 -8986 -89C1 -89C2 -89C4 -89C5 -89C6 -89C7 -89C8 -89C9 -89CA -89CB -89CC -89CE -89CF -89D0 -89D1 -89D2 -89D6 -89DA -89DC -89DE -89E3 -89E5 -89E6 -89EB -89EF -89F3 -8A00 -8A07 -8A3E -8A48 -8A79 -8A89 -8A8A -8A93 -8B07 -8B26 -8B66 -8B6C -8BA0 -8BA1 -8BA2 -8BA3 -8BA4 -8BA5 -8BA6 -8BA7 -8BA8 -8BA9 -8BAA -8BAB -8BAD -8BAE -8BAF -8BB0 -8BB2 -8BB3 -8BB4 -8BB5 -8BB6 -8BB7 -8BB8 -8BB9 -8BBA -8BBC -8BBD -8BBE -8BBF -8BC0 -8BC1 -8BC2 -8BC3 -8BC4 -8BC5 -8BC6 -8BC8 -8BC9 -8BCA -8BCB -8BCC -8BCD -8BCE -8BCF -8BD1 -8BD2 -8BD3 -8BD4 -8BD5 -8BD6 -8BD7 -8BD8 -8BD9 -8BDA -8BDB -8BDC -8BDD -8BDE -8BDF -8BE0 -8BE1 -8BE2 -8BE3 -8BE4 -8BE5 -8BE6 -8BE7 -8BE8 -8BE9 -8BEB -8BEC -8BED -8BEE -8BEF -8BF0 -8BF1 -8BF2 -8BF3 -8BF4 -8BF5 -8BF6 -8BF7 -8BF8 -8BF9 -8BFA -8BFB -8BFC -8BFD -8BFE -8BFF -8C00 -8C01 -8C02 -8C03 -8C04 -8C05 -8C06 -8C07 -8C08 -8C0A -8C0B -8C0C -8C0D -8C0E -8C0F -8C10 -8C11 -8C12 -8C13 -8C14 -8C15 -8C16 -8C17 -8C18 -8C19 -8C1A -8C1B -8C1C -8C1D -8C1F -8C20 -8C21 -8C22 -8C23 -8C24 -8C25 -8C26 -8C27 -8C28 -8C29 -8C2A -8C2B -8C2C -8C2D -8C2E -8C2F -8C30 -8C31 -8C32 -8C33 -8C34 -8C35 -8C36 -8C37 -8C41 -8C46 -8C47 -8C49 -8C4C -8C55 -8C5A -8C61 -8C62 -8C6A -8C6B -8C73 -8C78 -8C79 -8C7A -8C82 -8C85 -8C89 -8C8A -8C8C -8C94 -8C98 -8D1D -8D1E -8D1F -8D21 -8D22 -8D23 -8D24 -8D25 -8D26 -8D27 -8D28 -8D29 -8D2A -8D2B -8D2C -8D2D -8D2E -8D2F -8D30 -8D31 -8D32 -8D33 -8D34 -8D35 -8D36 -8D37 -8D38 -8D39 -8D3A -8D3B -8D3C -8D3D -8D3E -8D3F -8D40 -8D41 -8D42 -8D43 -8D44 -8D45 -8D46 -8D47 -8D48 -8D49 -8D4A -8D4B -8D4C -8D4D -8D4E -8D4F -8D50 -8D53 -8D54 -8D55 -8D56 -8D58 -8D59 -8D5A -8D5B -8D5C -8D5D -8D5E -8D60 -8D61 -8D62 -8D63 -8D64 -8D66 -8D67 -8D6B -8D6D -8D70 -8D73 -8D74 -8D75 -8D76 -8D77 -8D81 -8D84 -8D85 -8D8A -8D8B -8D91 -8D94 -8D9F -8DA3 -8DB1 -8DB3 -8DB4 -8DB5 -8DB8 -8DBA -8DBC -8DBE -8DBF -8DC3 -8DC4 -8DC6 -8DCB -8DCC -8DCE -8DCF -8DD1 -8DD6 -8DD7 -8DDA -8DDB -8DDD -8DDE -8DDF -8DE3 -8DE4 -8DE8 -8DEA -8DEB -8DEC -8DEF -8DF3 -8DF5 -8DF7 -8DF8 -8DF9 -8DFA -8DFB -8DFD -8E05 -8E09 -8E0A -8E0C -8E0F -8E14 -8E1D -8E1E -8E1F -8E22 -8E23 -8E29 -8E2A -8E2C -8E2E -8E2F -8E31 -8E35 -8E39 -8E3A -8E3D -8E40 -8E41 -8E42 -8E44 -8E47 -8E48 -8E49 -8E4A -8E4B -8E51 -8E52 -8E59 -8E66 -8E69 -8E6C -8E6D -8E6F -8E70 -8E72 -8E74 -8E76 -8E7C -8E7F -8E81 -8E85 -8E87 -8E8F -8E90 -8E94 -8E9C -8E9E -8EAB -8EAC -8EAF -8EB2 -8EBA -8ECE -8F66 -8F67 -8F68 -8F69 -8F6B -8F6C -8F6D -8F6E -8F6F -8F70 -8F71 -8F72 -8F73 -8F74 -8F75 -8F76 -8F77 -8F78 -8F79 -8F7A -8F7B -8F7C -8F7D -8F7E -8F7F -8F81 -8F82 -8F83 -8F84 -8F85 -8F86 -8F87 -8F88 -8F89 -8F8A -8F8B -8F8D -8F8E -8F8F -8F90 -8F91 -8F93 -8F94 -8F95 -8F96 -8F97 -8F98 -8F99 -8F9A -8F9B -8F9C -8F9E -8F9F -8FA3 -8FA8 -8FA9 -8FAB -8FB0 -8FB1 -8FB6 -8FB9 -8FBD -8FBE -8FC1 -8FC2 -8FC4 -8FC5 -8FC7 -8FC8 -8FCE -8FD0 -8FD1 -8FD3 -8FD4 -8FD5 -8FD8 -8FD9 -8FDB -8FDC -8FDD -8FDE -8FDF -8FE2 -8FE4 -8FE5 -8FE6 -8FE8 -8FE9 -8FEA -8FEB -8FED -8FEE -8FF0 -8FF3 -8FF7 -8FF8 -8FF9 -8FFD -9000 -9001 -9002 -9003 -9004 -9005 -9006 -9009 -900A -900B -900D -900F -9010 -9011 -9012 -9014 -9016 -9017 -901A -901B -901D -901E -901F -9020 -9021 -9022 -9026 -902D -902E -902F -9035 -9036 -9038 -903B -903C -903E -9041 -9042 -9044 -9047 -904D -904F -9050 -9051 -9052 -9053 -9057 -9058 -905B -9062 -9063 -9065 -9068 -906D -906E -9074 -9075 -907D -907F -9080 -9082 -9083 -9088 -908B -9091 -9093 -9095 -9097 -9099 -909B -909D -90A1 -90A2 -90A3 -90A6 -90AA -90AC -90AE -90AF -90B0 -90B1 -90B3 -90B4 -90B5 -90B6 -90B8 -90B9 -90BA -90BB -90BE -90C1 -90C4 -90C5 -90C7 -90CA -90CE -90CF -90D0 -90D1 -90D3 -90D7 -90DB -90DC -90DD -90E1 -90E2 -90E6 -90E7 -90E8 -90EB -90ED -90EF -90F4 -90F8 -90FD -90FE -9102 -9104 -9119 -911E -9122 -9123 -912F -9131 -9139 -9143 -9146 -9149 -914A -914B -914C -914D -914E -914F -9150 -9152 -9157 -915A -915D -915E -9161 -9162 -9163 -9164 -9165 -9169 -916A -916C -916E -916F -9170 -9171 -9172 -9174 -9175 -9176 -9177 -9178 -9179 -917D -917E -917F -9185 -9187 -9189 -918B -918C -918D -9190 -9191 -9192 -919A -919B -91A2 -91A3 -91AA -91AD -91AE -91AF -91B4 -91B5 -91BA -91C7 -91C9 -91CA -91CC -91CD -91CE -91CF -91D1 -91DC -9274 -928E -92AE -92C8 -933E -936A -938F -93CA -93D6 -943E -946B -9485 -9486 -9487 -9488 -9489 -948A -948B -948C -948D -948E -948F -9490 -9492 -9493 -9494 -9495 -9497 -9499 -949A -949B -949C -949D -949E -949F -94A0 -94A1 -94A2 -94A3 -94A4 -94A5 -94A6 -94A7 -94A8 -94A9 -94AA -94AB -94AC -94AD -94AE -94AF -94B0 -94B1 -94B2 -94B3 -94B4 -94B5 -94B6 -94B7 -94B8 -94B9 -94BA -94BB -94BC -94BD -94BE -94BF -94C0 -94C1 -94C2 -94C3 -94C4 -94C5 -94C6 -94C8 -94C9 -94CA -94CB -94CC -94CD -94CE -94D0 -94D1 -94D2 -94D5 -94D6 -94D7 -94D8 -94D9 -94DB -94DC -94DD -94DE -94DF -94E0 -94E1 -94E2 -94E3 -94E4 -94E5 -94E7 -94E8 -94E9 -94EA -94EB -94EC -94ED -94EE -94EF -94F0 -94F1 -94F2 -94F3 -94F4 -94F5 -94F6 -94F7 -94F8 -94F9 -94FA -94FC -94FD -94FE -94FF -9500 -9501 -9502 -9503 -9504 -9505 -9506 -9507 -9508 -9509 -950A -950B -950C -950D -950E -950F -9510 -9511 -9512 -9513 -9514 -9515 -9516 -9517 -9518 -9519 -951A -951B -951D -951E -951F -9521 -9522 -9523 -9524 -9525 -9526 -9528 -9529 -952A -952B -952C -952D -952E -952F -9530 -9531 -9532 -9534 -9535 -9536 -9537 -9538 -9539 -953A -953B -953C -953E -953F -9540 -9541 -9542 -9544 -9545 -9546 -9547 -9549 -954A -954C -954D -954E -954F -9550 -9551 -9552 -9553 -9554 -9556 -9557 -9558 -9559 -955B -955C -955D -955E -955F -9561 -9562 -9563 -9564 -9565 -9566 -9567 -9568 -9569 -956A -956B -956C -956D -956F -9570 -9571 -9572 -9573 -9576 -957F -95E8 -95E9 -95EA -95EB -95ED -95EE -95EF -95F0 -95F1 -95F2 -95F3 -95F4 -95F5 -95F6 -95F7 -95F8 -95F9 -95FA -95FB -95FC -95FD -95FE -9600 -9601 -9602 -9603 -9604 -9605 -9606 -9608 -9609 -960A -960B -960C -960D -960E -960F -9610 -9611 -9612 -9614 -9615 -9616 -9617 -9619 -961A -961C -961D -961F -9621 -9622 -962A -962E -9631 -9632 -9633 -9634 -9635 -9636 -963B -963C -963D -963F -9640 -9642 -9644 -9645 -9646 -9647 -9648 -9649 -964B -964C -964D -9650 -9654 -9655 -965B -965F -9661 -9662 -9664 -9667 -9668 -9669 -966A -966C -9672 -9674 -9675 -9676 -9677 -9685 -9686 -9688 -968B -968D -968F -9690 -9694 -9697 -9698 -9699 -969C -96A7 -96B0 -96B3 -96B6 -96B9 -96BC -96BD -96BE -96C0 -96C1 -96C4 -96C5 -96C6 -96C7 -96C9 -96CC -96CD -96CE -96CF -96D2 -96D5 -96E0 -96E8 -96E9 -96EA -96EF -96F3 -96F6 -96F7 -96F9 -96FE -9700 -9701 -9704 -9706 -9707 -9708 -9709 -970D -970E -970F -9713 -9716 -971C -971E -972A -972D -9730 -9732 -9738 -9739 -973E -9752 -9753 -9756 -9759 -975B -975E -9760 -9761 -9762 -9765 -9769 -9773 -9774 -9776 -977C -9785 -978B -978D -9791 -9792 -9794 -9798 -97A0 -97A3 -97AB -97AD -97AF -97B2 -97B4 -97E6 -97E7 -97E9 -97EA -97EB -97EC -97ED -97F3 -97F5 -97F6 -9875 -9876 -9877 -9878 -9879 -987A -987B -987C -987D -987E -987F -9880 -9881 -9882 -9883 -9884 -9885 -9886 -9887 -9888 -9889 -988A -988C -988D -988F -9890 -9891 -9893 -9894 -9896 -9897 -9898 -989A -989B -989C -989D -989E -989F -98A0 -98A1 -98A2 -98A4 -98A5 -98A6 -98A7 -98CE -98D1 -98D2 -98D3 -98D5 -98D8 -98D9 -98DA -98DE -98DF -98E7 -98E8 -990D -9910 -992E -9954 -9955 -9963 -9965 -9967 -9968 -9969 -996A -996B -996C -996D -996E -996F -9970 -9971 -9972 -9974 -9975 -9976 -9977 -997A -997C -997D -997F -9980 -9981 -9984 -9985 -9986 -9987 -9988 -998A -998B -998D -998F -9990 -9991 -9992 -9993 -9994 -9995 -9996 -9997 -9998 -9999 -99A5 -99A8 -9A6C -9A6D -9A6E -9A6F -9A70 -9A71 -9A73 -9A74 -9A75 -9A76 -9A77 -9A78 -9A79 -9A7A -9A7B -9A7C -9A7D -9A7E -9A7F -9A80 -9A81 -9A82 -9A84 -9A85 -9A86 -9A87 -9A88 -9A8A -9A8B -9A8C -9A8F -9A90 -9A91 -9A92 -9A93 -9A96 -9A97 -9A98 -9A9A -9A9B -9A9C -9A9D -9A9E -9A9F -9AA0 -9AA1 -9AA2 -9AA3 -9AA4 -9AA5 -9AA7 -9AA8 -9AB0 -9AB1 -9AB6 -9AB7 -9AB8 -9ABA -9ABC -9AC0 -9AC1 -9AC2 -9AC5 -9ACB -9ACC -9AD1 -9AD3 -9AD8 -9ADF -9AE1 -9AE6 -9AEB -9AED -9AEF -9AF9 -9AFB -9B03 -9B08 -9B0F -9B13 -9B1F -9B23 -9B2F -9B32 -9B3B -9B3C -9B41 -9B42 -9B43 -9B44 -9B45 -9B47 -9B48 -9B49 -9B4D -9B4F -9B51 -9B54 -9C7C -9C7F -9C81 -9C82 -9C85 -9C86 -9C87 -9C88 -9C8B -9C8D -9C8E -9C90 -9C91 -9C92 -9C94 -9C95 -9C9A -9C9B -9C9C -9C9E -9C9F -9CA0 -9CA1 -9CA2 -9CA3 -9CA4 -9CA5 -9CA6 -9CA7 -9CA8 -9CA9 -9CAB -9CAD -9CAE -9CB0 -9CB1 -9CB2 -9CB3 -9CB4 -9CB5 -9CB6 -9CB7 -9CB8 -9CBA -9CBB -9CBC -9CBD -9CC3 -9CC4 -9CC5 -9CC6 -9CC7 -9CCA -9CCB -9CCC -9CCD -9CCE -9CCF -9CD0 -9CD3 -9CD4 -9CD5 -9CD6 -9CD7 -9CD8 -9CD9 -9CDC -9CDD -9CDE -9CDF -9CE2 -9E1F -9E20 -9E21 -9E22 -9E23 -9E25 -9E26 -9E28 -9E29 -9E2A -9E2B -9E2C -9E2D -9E2F -9E31 -9E32 -9E33 -9E35 -9E36 -9E37 -9E38 -9E39 -9E3A -9E3D -9E3E -9E3F -9E41 -9E42 -9E43 -9E44 -9E45 -9E46 -9E47 -9E48 -9E49 -9E4A -9E4B -9E4C -9E4E -9E4F -9E51 -9E55 -9E57 -9E58 -9E5A -9E5B -9E5C -9E5E -9E63 -9E64 -9E66 -9E67 -9E68 -9E69 -9E6A -9E6B -9E6C -9E6D -9E70 -9E71 -9E73 -9E7E -9E7F -9E82 -9E87 -9E88 -9E8B -9E92 -9E93 -9E9D -9E9F -9EA6 -9EB4 -9EB8 -9EBB -9EBD -9EBE -9EC4 -9EC9 -9ECD -9ECE -9ECF -9ED1 -9ED4 -9ED8 -9EDB -9EDC -9EDD -9EDF -9EE0 -9EE2 -9EE5 -9EE7 -9EE9 -9EEA -9EEF -9EF9 -9EFB -9EFC -9EFE -9F0B -9F0D -9F0E -9F10 -9F13 -9F17 -9F19 -9F20 -9F22 -9F2C -9F2F -9F37 -9F39 -9F3B -9F3D -9F3E -9F44 -9F50 -9F51 -9F7F -9F80 -9F83 -9F84 -9F85 -9F86 -9F87 -9F88 -9F89 -9F8A -9F8B -9F8C -9F99 -9F9A -9F9B -9F9F -9FA0 \ No newline at end of file diff --git a/source/font/iconfont.woff2 b/source/font/iconfont.woff2 new file mode 100644 index 0000000..794bc31 Binary files /dev/null and b/source/font/iconfont.woff2 differ diff --git a/source/js/a.js b/source/js/a.js deleted file mode 100644 index bfb525d..0000000 --- a/source/js/a.js +++ /dev/null @@ -1,323 +0,0 @@ -var RENDERER = { - POINT_INTERVAL: 5, - FISH_COUNT: 9, - MAX_INTERVAL_COUNT: 50, - INIT_HEIGHT_RATE: 0.5, - THRESHOLD: 50, - init: function() { - this.setParameters(); - this.reconstructMethods(); - this.setup(); - this.bindEvent(); - this.render() - }, - setParameters: function() { - this.$window = $(window); - this.$container = $("#jsi-flying-fish-container"); - this.$canvas = $(""); - this.context = this.$canvas.appendTo(this.$container).get(0).getContext("2d"); - this.points = []; - this.fishes = []; - this.watchIds = [] - }, - createSurfacePoints: function() { - var a = Math.round(this.width / this.POINT_INTERVAL); - this.pointInterval = this.width / (a - 1); - this.points.push(new SURFACE_POINT(this,0)); - for (var b = 1; b < a; b++) { - var c = new SURFACE_POINT(this,b * this.pointInterval) - , d = this.points[b - 1]; - c.setPreviousPoint(d); - d.setNextPoint(c); - this.points.push(c) - } - }, - reconstructMethods: function() { - this.watchWindowSize = this.watchWindowSize.bind(this); - this.jdugeToStopResize = this.jdugeToStopResize.bind(this); - this.startEpicenter = this.startEpicenter.bind(this); - this.moveEpicenter = this.moveEpicenter.bind(this); - this.reverseVertical = this.reverseVertical.bind(this); - this.render = this.render.bind(this) - }, - setup: function() { - this.points.length = 0; - this.fishes.length = 0; - this.watchIds.length = 0; - this.intervalCount = this.MAX_INTERVAL_COUNT; - this.width = this.$container.width(); - this.height = this.$container.height(); - this.fishCount = this.FISH_COUNT * this.width / 500 * this.height / 500; - this.$canvas.attr({ - width: this.width, - height: this.height - }); - this.reverse = false; - this.fishes.push(new FISH(this)); - this.createSurfacePoints() - }, - watchWindowSize: function() { - this.clearTimer(); - this.tmpWidth = this.$window.width(); - this.tmpHeight = this.$window.height(); - this.watchIds.push(setTimeout(this.jdugeToStopResize, this.WATCH_INTERVAL)) - }, - clearTimer: function() { - while (this.watchIds.length > 0) { - clearTimeout(this.watchIds.pop()) - } - }, - jdugeToStopResize: function() { - var c = this.$window.width() - , a = this.$window.height() - , b = (c == this.tmpWidth && a == this.tmpHeight); - this.tmpWidth = c; - this.tmpHeight = a; - if (b) { - this.setup() - } - }, - bindEvent: function() { - this.$window.on("resize", this.watchWindowSize); - this.$container.on("mouseenter", this.startEpicenter); - this.$container.on("mousemove", this.moveEpicenter) - }, - getAxis: function(a) { - var b = this.$container.offset(); - return { - x: a.clientX - b.left + this.$window.scrollLeft(), - y: a.clientY - b.top + this.$window.scrollTop() - } - }, - startEpicenter: function(a) { - this.axis = this.getAxis(a) - }, - moveEpicenter: function(b) { - var a = this.getAxis(b); - if (!this.axis) { - this.axis = a - } - this.generateEpicenter(a.x, a.y, a.y - this.axis.y); - this.axis = a - }, - generateEpicenter: function(c, d, b) { - if (d < this.height / 2 - this.THRESHOLD || d > this.height / 2 + this.THRESHOLD) { - return - } - var a = Math.round(c / this.pointInterval); - if (a < 0 || a >= this.points.length) { - return - } - this.points[a].interfere(d, b) - }, - reverseVertical: function() { - this.reverse = !this.reverse; - for (var b = 0, a = this.fishes.length; b < a; b++) { - this.fishes[b].reverseVertical() - } - }, - controlStatus: function() { - for (var b = 0, a = this.points.length; b < a; b++) { - this.points[b].updateSelf() - } - for (var b = 0, a = this.points.length; b < a; b++) { - this.points[b].updateNeighbors() - } - if (this.fishes.length < this.fishCount) { - if (--this.intervalCount == 0) { - this.intervalCount = this.MAX_INTERVAL_COUNT; - this.fishes.push(new FISH(this)) - } - } - }, - render: function() { - requestAnimationFrame(this.render); - this.controlStatus(); - this.context.clearRect(0, 0, this.width, this.height); - var datatheme = document.documentElement.getAttribute("data-theme"); - if (datatheme === 'light') { - this.context.fillStyle = '#F7F9FE'; - } else { - this.context.fillStyle = '#181C27'; - } - for (var b = 0, a = this.fishes.length; b < a; b++) { - this.fishes[b].render(this.context) - } - this.context.save(); - this.context.globalCompositeOperation = "xor"; - this.context.beginPath(); - this.context.moveTo(0, this.reverse ? 0 : this.height); - for (var b = 0, a = this.points.length; b < a; b++) { - this.points[b].render(this.context) - } - this.context.lineTo(this.width, this.reverse ? 0 : this.height); - this.context.closePath(); - this.context.fill(); - this.context.restore() - } -}; -var SURFACE_POINT = function(a, b) { - this.renderer = a; - this.x = b; - this.init() -}; -SURFACE_POINT.prototype = { - SPRING_CONSTANT: 0.03, - SPRING_FRICTION: 0.9, - WAVE_SPREAD: 0.3, - ACCELARATION_RATE: 0.01, - init: function() { - this.initHeight = this.renderer.height * this.renderer.INIT_HEIGHT_RATE; - this.height = this.initHeight; - this.fy = 0; - this.force = { - previous: 0, - next: 0 - } - }, - setPreviousPoint: function(a) { - this.previous = a - }, - setNextPoint: function(a) { - this.next = a - }, - interfere: function(b, a) { - this.fy = this.renderer.height * this.ACCELARATION_RATE * ((this.renderer.height - this.height - b) >= 0 ? -1 : 1) * Math.abs(a) - }, - updateSelf: function() { - this.fy += this.SPRING_CONSTANT * (this.initHeight - this.height); - this.fy *= this.SPRING_FRICTION; - this.height += this.fy - }, - updateNeighbors: function() { - if (this.previous) { - this.force.previous = this.WAVE_SPREAD * (this.height - this.previous.height) - } - if (this.next) { - this.force.next = this.WAVE_SPREAD * (this.height - this.next.height) - } - }, - render: function(a) { - if (this.previous) { - this.previous.height += this.force.previous; - this.previous.fy += this.force.previous - } - if (this.next) { - this.next.height += this.force.next; - this.next.fy += this.force.next - } - a.lineTo(this.x, this.renderer.height - this.height) - } -}; -var FISH = function(a) { - this.renderer = a; - this.init() -}; -FISH.prototype = { - GRAVITY: 0.4, - init: function() { - this.direction = Math.random() < 0.5; - this.x = this.direction ? (this.renderer.width + this.renderer.THRESHOLD) : -this.renderer.THRESHOLD; - this.previousY = this.y; - this.vx = this.getRandomValue(4, 10) * (this.direction ? -1 : 1); - if (this.renderer.reverse) { - this.y = this.getRandomValue(this.renderer.height * 1 / 10, this.renderer.height * 4 / 10); - this.vy = this.getRandomValue(2, 5); - this.ay = this.getRandomValue(0.05, 0.2) - } else { - this.y = this.getRandomValue(this.renderer.height * 6 / 10, this.renderer.height * 9 / 10); - this.vy = this.getRandomValue(-5, -2); - this.ay = this.getRandomValue(-0.2, -0.05) - } - this.isOut = false; - this.theta = 0; - this.phi = 0 - }, - getRandomValue: function(b, a) { - return b + (a - b) * Math.random() - }, - reverseVertical: function() { - this.isOut = !this.isOut; - this.ay *= -1 - }, - controlStatus: function(a) { - this.previousY = this.y; - this.x += this.vx; - this.y += this.vy; - this.vy += this.ay; - if (this.renderer.reverse) { - if (this.y > this.renderer.height * this.renderer.INIT_HEIGHT_RATE) { - this.vy -= this.GRAVITY; - this.isOut = true - } else { - if (this.isOut) { - this.ay = this.getRandomValue(0.05, 0.2) - } - this.isOut = false - } - } else { - if (this.y < this.renderer.height * this.renderer.INIT_HEIGHT_RATE) { - this.vy += this.GRAVITY; - this.isOut = true - } else { - if (this.isOut) { - this.ay = this.getRandomValue(-0.2, -0.05) - } - this.isOut = false - } - } - if (!this.isOut) { - this.theta += Math.PI / 20; - this.theta %= Math.PI * 2; - this.phi += Math.PI / 30; - this.phi %= Math.PI * 2 - } - this.renderer.generateEpicenter(this.x + (this.direction ? -1 : 1) * this.renderer.THRESHOLD, this.y, this.y - this.previousY); - if (this.vx > 0 && this.x > this.renderer.width + this.renderer.THRESHOLD || this.vx < 0 && this.x < -this.renderer.THRESHOLD) { - this.init() - } - }, - render: function(a) { - a.save(); - a.translate(this.x, this.y); - a.rotate(Math.PI + Math.atan2(this.vy, this.vx)); - a.scale(1, this.direction ? 1 : -1); - a.beginPath(); - a.moveTo(-30, 0); - a.bezierCurveTo(-20, 15, 15, 10, 40, 0); - a.bezierCurveTo(15, -10, -20, -15, -30, 0); - a.fill(); - a.save(); - a.translate(40, 0); - a.scale(0.9 + 0.2 * Math.sin(this.theta), 1); - a.beginPath(); - a.moveTo(0, 0); - a.quadraticCurveTo(5, 10, 20, 8); - a.quadraticCurveTo(12, 5, 10, 0); - a.quadraticCurveTo(12, -5, 20, -8); - a.quadraticCurveTo(5, -10, 0, 0); - a.fill(); - a.restore(); - a.save(); - a.translate(-3, 0); - a.rotate((Math.PI / 3 + Math.PI / 10 * Math.sin(this.phi)) * (this.renderer.reverse ? -1 : 1)); - a.beginPath(); - if (this.renderer.reverse) { - a.moveTo(5, 0); - a.bezierCurveTo(10, 10, 10, 30, 0, 40); - a.bezierCurveTo(-12, 25, -8, 10, 0, 0) - } else { - a.moveTo(-5, 0); - a.bezierCurveTo(-10, -10, -10, -30, 0, -40); - a.bezierCurveTo(12, -25, 8, -10, 0, 0) - } - a.closePath(); - a.fill(); - a.restore(); - a.restore(); - this.controlStatus(a) - } -}; -$(function() { - RENDERER.init() -}); \ No newline at end of file diff --git a/source/js/custom.js b/source/js/custom.js index 419c33a..e8301bb 100644 --- a/source/js/custom.js +++ b/source/js/custom.js @@ -28,16 +28,111 @@ function percent() { ) - document.documentElement.clientHeight, // 整个网页高度 减去 可视高度 result = Math.round((a / b) * 100), // 计算百分比 btn = document.querySelector("#percent"); // 获取图标 - (btn.innerHTML = result); + conbtn = document.querySelector('#buttons.conbtn') + if (result > 10) { + conbtn.style.left = 'calc(100% + 7px)' + } else { + conbtn.style.left = 'calc(100% - 40px)' + } + if (result > 0, result != 100) { + btn.innerHTML = result; + } else if (result != 100) { + btn.innerHTML = result; + } else if (result = 100) { + btn.innerHTML = ''; + btn.style.fontFamily = 'dys' + btn.style.fontSize = '26px' + } } +percent(); + +const nav = { +copytext: function copytext() { + var navbar = document.getElementById('navbar') + var navmenus = document.getElementById('nav-menus') + var text = document.getElementById('notebar') + var percent = document.getElementById('buttons') + percent.style.scale = '0' + setTimeout("document.getElementById('buttons').style.scale = '1'", 2000) + text.innerHTML = '复制成功' + navbar.style.width = '330px' + setTimeout("document.getElementById('navbar').style.width = 'fit-content'", 2000) + navmenus.style.display = 'none' + setTimeout("document.getElementById('nav-menus').style.display = 'block'", 2000) + text.style.display = 'block' + setTimeout("document.getElementById('notebar').style.display = 'none'", 2000) +}, + +darkmode: function darkmode() { + var navbar = document.getElementById('navbar') + var navmenus = document.getElementById('nav-menus') + var text = document.getElementById('notebar') + var percent = document.getElementById('buttons') + percent.style.scale = '0' + setTimeout("document.getElementById('buttons').style.scale = '1'", 2000) + text.innerHTML = '切换成功' + navbar.style.width = '330px' + setTimeout("document.getElementById('navbar').style.width = 'fit-content'", 2000) + navmenus.style.display = 'none' + setTimeout("document.getElementById('nav-menus').style.display = 'block'", 2000) + text.style.display = 'block' + setTimeout("document.getElementById('notebar').style.display = 'none'", 2000) +}, -document.getElementById("page-name").innerText = document.title.split(" | blog")[0]; +asidehidetxt: function asidehidetxt() { + var navbar = document.getElementById('navbar') + var navmenus = document.getElementById('nav-menus') + var text = document.getElementById('notebar') + var percent = document.getElementById('buttons') + percent.style.scale = '0' + setTimeout("document.getElementById('buttons').style.scale = '1'", 2000) + text.innerHTML = '设置成功' + navbar.style.width = '330px' + setTimeout("document.getElementById('navbar').style.width = 'fit-content'", 2000) + navmenus.style.display = 'none' + setTimeout("document.getElementById('nav-menus').style.display = 'block'", 2000) + text.style.display = 'block' + setTimeout("document.getElementById('notebar').style.display = 'none'", 2000) +}, + +hometophide: function hometophide() { + var navbar = document.getElementById('navbar') + var navmenus = document.getElementById('nav-menus') + var text = document.getElementById('notebar') + var percent = document.getElementById('buttons') + percent.style.scale = '0' + setTimeout("document.getElementById('buttons').style.scale = '1'", 2000) + text.innerHTML = '设置成功' + navbar.style.width = '330px' + setTimeout("document.getElementById('navbar').style.width = 'fit-content'", 2000) + navmenus.style.display = 'none' + setTimeout("document.getElementById('nav-menus').style.display = 'block'", 2000) + text.style.display = 'block' + setTimeout("document.getElementById('notebar').style.display = 'none'", 2000) +}, + +randompost: function randompost() { + var navbar = document.getElementById('navbar') + var navmenus = document.getElementById('nav-menus') + var text = document.getElementById('notebar') + var percent = document.getElementById('buttons') + percent.style.scale = '0' + setTimeout("document.getElementById('buttons').style.scale = '1'", 2000) + text.innerHTML = '正在跳转' + navbar.style.width = '330px' + setTimeout("document.getElementById('navbar').style.width = 'fit-content'", 2000) + navmenus.style.display = 'none' + setTimeout("document.getElementById('nav-menus').style.display = 'block'", 2000) + text.style.display = 'block' + setTimeout("document.getElementById('notebar').style.display = 'none'", 2000) +} +} function toggleTheme() { var currentTheme = document.documentElement.getAttribute("data-theme"); var targetTheme = currentTheme === "dark" ? "light" : "dark"; document.documentElement.setAttribute("data-theme", targetTheme); - new Vue({ + /* new Vue({ data: function () { this.$notify({ title: "切换成功", @@ -49,25 +144,27 @@ function toggleTheme() { duration: 4000 }); } - }) + }) */ + nav.darkmode() } function showconsolebtn() { var consolebtn = document.getElementById('console-pannel'); - if (consolebtn.style.top === '50px') { - consolebtn.style.top = '-110px'; + if (consolebtn.style.scale === '1') { + consolebtn.style.scale = '0'; } else { - consolebtn.style.top = '50px' + consolebtn.style.scale = '1' } } function hideaside() { var aside = document.getElementById('aside-content'); var postmodule = document.getElementsByClassName('maininner')[0]; + nav.asidehidetxt() if (aside.style.display === 'none') { aside.style.display = 'block'; postmodule.style.width = '74%'; - new Vue({ + /* new Vue({ data: function () { this.$notify({ title: "设置成功", @@ -79,24 +176,12 @@ function hideaside() { duration: 4000 }); } - }) + }) */ } else { aside.style.display = 'none'; postmodule.style.width = '100%'; - new Vue({ - data: function () { - this.$notify({ - title: "设置成功", - message: "已隐藏侧边栏", - position: 'top-left', - offset: 50, - showClose: true, - type: "success", - duration: 4000 - }); - } - }) + } } @@ -106,36 +191,120 @@ function hidehometop() { if (hometop.style.display === 'none') { hometop.style.display = 'block'; main.style.top = '-40px' - new Vue({ - data: function () { - this.$notify({ - title: "设置成功", - message: "已显示顶部", - position: 'top-left', - offset: 50, - showClose: true, - type: "success", - duration: 4000 - }); - } - }) } else { hometop.style.display = 'none'; main.style.top = 'unset' - new Vue({ - data: function () { - this.$notify({ - title: "设置成功", - message: "已隐藏顶部", - position: 'top-left', - offset: 50, - showClose: true, - type: "success", - duration: 4000 - }); - } - }) } + nav.hometophide() } + +//首页顶部推荐文章轮播图 +var ark_swiper = new Swiper("#ark-swiper-container", { + direction: "horizontal", //横向切换 + loop: true, + grabCursor : true,//鼠标悬停时显示抓手 + updateOnWindowResize: true, + slidesPerView: 1, + effect: "cube", + spaceBetween: 30, + mousewheel: true, + scrollbar: { + el: '.swiper-scrollbar', + }, + navigation: { + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev', + }, + autoplay: true, + delay: 2000 +}); + +const box = document.querySelector('#totopbtn') + const mousedown = (event) => { + //开关打开 + isDown = true; + let innerX = event.clientX - box.offsetLeft + let innerY = event.clientY - box.offsetTop + box.style.borderWidth = "1px"; + box.style.borderStyle = "solid"; + box.style.borderColor = "black"; + // 移动时 + document.onmousemove = function (event) { + box.style.left = event.clientX - innerX + "px" + box.style.top = event.clientY - innerY + "px" + } + + // 抬起时 + document.onmouseup = function () { + document.onmousemove = null + document.mousedown = null + control() + box.style.borderWidth = ""; + box.style.borderStyle = ""; + box.style.borderColor = ""; + //开关关闭 + clickFlag = endTime - startTime < 200; + isDown = false; + } + } + // 按下时 + box.addEventListener('mousedown', mousedown, false) + + + var ele = document.querySelector('#totopbtn'); + // 记录的是元素当前位置 + var currentPosition = { x: 0, y: 0 }; + // 手指偏移位置，是touchmove中的坐标减去刚触摸时候的坐标得到并更新 + var offset = {}; + // 手指刚触摸时候的坐标 + var touchStartPositon = {}; + // 移动标志，主要用来解决touchend中currentPosition无意义累加的问题，下方会说明什么是无意义累加 + var moveFlag = false; + // 监听，冒泡 + ele.addEventListener('touchstart', touchStart, false) + ele.addEventListener('touchmove', touchMove, false) + ele.addEventListener('touchend', touchEnd, false) + function touchStart(e) { + var touch = e.targetTouches[0]; + // 触摸时候记录手指初始位置 + touchStartPositon.x = touch.pageX; + touchStartPositon.y = touch.pageY; + } + function touchMove(e) { + moveFlag = true; + + // 屏蔽默认函数，当有上下滚动条时候，touchMove默认的是滚动屏幕 + e.preventDefault(); + var touch = e.changedTouches[0]; + + // 得到用户拖动的相对x y距离，记录在offset中 + offset.x = touch.pageX - touchStartPositon.x; + offset.y = touch.pageY - touchStartPositon.y; + + // offset + currentPostion就是css要移动的距离 + move({ x: currentPosition.x + offset.x, y: currentPosition.y + offset.y }); + + } + function touchEnd(e) { + + if (!moveFlag) return; + + // 无意义累加就在这里： + // 用户第一次操作：完成一次拖动，此时offset中x y是有值的 + // 用户第二次操作：点击元素但是没有拖动，currentPostion就会加上offset中的值 + // 用户第三次操作：再次拖动，currentPositon中的值就不准了，因为多加了一次offset + // 所以判断如果是moveFlag = false时候就直接退出 + currentPosition.x += offset.x + currentPosition.y += offset.y + // 对于无意义累加问题，当然也可以通过把offset置位o来解决 + // offset = { x: 0, y: 0 }; + moveFlag = false; + + } + + function move(param) { + // 利用transform属性做到移动 + ele.style.transform = "translate3d(" + param.x + "px, " + param.y + "px, 0)" + } diff --git a/source/js/main.js b/source/js/main.js index 8661777..60f909f 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -83,30 +83,18 @@ document.addEventListener('DOMContentLoaded', function () { const highlightShrinkClass = isHighlightShrink === true ? 'closed' : '' if (isHighlightShrink !== undefined) { - highlightShrinkEle = `` + highlightShrinkEle = `` } if (isHighlightCopy) { - highlightCopyEle = '
' + highlightCopyEle = '
' } const copy = (text, ctx) => { if (document.queryCommandSupported && document.queryCommandSupported('copy')) { document.execCommand('copy') if (GLOBAL_CONFIG.Snackbar !== undefined) { - new Vue({ - data: function () { - this.$notify({ - title: "复制成功", - message: "转载请遵守cc协议", - position: 'top-left', - offset: 50, - showClose: true, - type: "success", - duration: 4000 - }); - } - }) + copytext() } else { const prevEle = ctx.previousElementSibling prevEle.innerText = GLOBAL_CONFIG.copy.success diff --git a/source/js/swiper.js b/source/js/swiper.js new file mode 100644 index 0000000..f0637bd --- /dev/null +++ b/source/js/swiper.js @@ -0,0 +1,16 @@ +var mySwiper = new Swiper ('.hometop-swiper', { + direction: 'vertical', // 垂直切换选项 + loop: true, // 循环模式选项 + effect: 'creative', + mousewheel: true, + autoplay:true, + // 如果需要分页器 + pagination: { + el: '.swiper-pagination', + }, + // 如果需要前进后退按钮 + navigation: { + nextEl: '.hometop-swiper-button-next', + prevEl: '.hometop-swiper-button-prev', + }, +}) \ No newline at end of file diff --git a/source/js/typed.js b/source/js/typed.js new file mode 100644 index 0000000..1421c70 --- /dev/null +++ b/source/js/typed.js @@ -0,0 +1,11 @@ +/*! + * + * typed.js - A JavaScript Typing Animation Library + * Author: Matt Boldt + * Version: v2.0.11 + * Url: https://github.com/mattboldt/typed.js + * License(s): MIT + * + */ +(function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Typed=e():t.Typed=e()})(this,function(){return function(t){function e(n){if(s[n])return s[n].exports;var i=s[n]={exports:{},id:n,loaded:!1};return t[n].call(i.exports,i,i.exports,e),i.loaded=!0,i.exports}var s={};return e.m=t,e.c=s,e.p="",e(0)}([function(t,e,s){"use strict";function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var i=function(){function t(t,e){for(var s=0;st.length)););var u=t.substring(0,e),l=t.substring(u.length+1,e+i),c=t.substring(e+i+1);t=u+l+c,i--}s.timeout=setTimeout(function(){s.toggleBlinking(!1),e>=t.length?s.doneTyping(t,e):s.keepTyping(t,e,i),s.temporaryPause&&(s.temporaryPause=!1,s.options.onTypingResumed(s.arrayPos,s))},n)},n))}},{key:"keepTyping",value:function(t,e,s){0===e&&(this.toggleBlinking(!1),this.options.preStringTyped(this.arrayPos,this)),e+=s;var n=t.substr(0,e);this.replaceText(n),this.typewrite(t,e)}},{key:"doneTyping",value:function(t,e){var s=this;this.options.onStringTyped(this.arrayPos,this),this.toggleBlinking(!0),this.arrayPos===this.strings.length-1&&(this.complete(),this.loop===!1||this.curLoop===this.loopCount)||(this.timeout=setTimeout(function(){s.backspace(t,e)},this.backDelay))}},{key:"backspace",value:function(t,e){var s=this;if(this.pause.status===!0)return void this.setPauseStatus(t,e,!0);if(this.fadeOut)return this.initFadeOut();this.toggleBlinking(!1);var n=this.humanizer(this.backSpeed);this.timeout=setTimeout(function(){e=o.htmlParser.backSpaceHtmlChars(t,e,s);var n=t.substr(0,e);if(s.replaceText(n),s.smartBackspace){var i=s.strings[s.arrayPos+1];i&&n===i.substr(0,e)?s.stopNum=e:s.stopNum=0}e>s.stopNum?(e--,s.backspace(t,e)):e<=s.stopNum&&(s.arrayPos++,s.arrayPos===s.strings.length?(s.arrayPos=0,s.options.onLastStringBackspaced(),s.shuffleStringsIfNeeded(),s.begin()):s.typewrite(s.strings[s.sequence[s.arrayPos]],e))},n)}},{key:"complete",value:function(){this.options.onComplete(this),this.loop?this.curLoop++:this.typingComplete=!0}},{key:"setPauseStatus",value:function(t,e,s){this.pause.typewrite=s,this.pause.curString=t,this.pause.curStrPos=e}},{key:"toggleBlinking",value:function(t){this.cursor&&(this.pause.status||this.cursorBlinking!==t&&(this.cursorBlinking=t,t?this.cursor.classList.add("typed-cursor--blink"):this.cursor.classList.remove("typed-cursor--blink")))}},{key:"humanizer",value:function(t){return Math.round(Math.random()*t/2)+t}},{key:"shuffleStringsIfNeeded",value:function(){this.shuffle&&(this.sequence=this.sequence.sort(function(){return Math.random()-.5}))}},{key:"initFadeOut",value:function(){var t=this;return this.el.className+=" "+this.fadeOutClass,this.cursor&&(this.cursor.className+=" "+this.fadeOutClass),setTimeout(function(){t.arrayPos++,t.replaceText(""),t.strings.length>t.arrayPos?t.typewrite(t.strings[t.sequence[t.arrayPos]],0):(t.typewrite(t.strings[0],0),t.arrayPos=0)},this.fadeOutDelay)}},{key:"replaceText",value:function(t){this.attr?this.el.setAttribute(this.attr,t):this.isInput?this.el.value=t:"html"===this.contentType?this.el.innerHTML=t:this.el.textContent=t}},{key:"bindFocusEvents",value:function(){var t=this;this.isInput&&(this.el.addEventListener("focus",function(e){t.stop()}),this.el.addEventListener("blur",function(e){t.el.value&&0!==t.el.value.length||t.start()}))}},{key:"insertCursor",value:function(){this.showCursor&&(this.cursor||(this.cursor=document.createElement("span"),this.cursor.className="typed-cursor",this.cursor.innerHTML=this.cursorChar,this.el.parentNode&&this.el.parentNode.insertBefore(this.cursor,this.el.nextSibling)))}}]),t}();e["default"]=a,t.exports=e["default"]},function(t,e,s){"use strict";function n(t){return t&&t.__esModule?t:{"default":t}}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var r=Object.assign||function(t){for(var e=1;e":";";t.substr(e+1).charAt(0)!==i&&(e++,!(e+1>t.length)););e++}return e}},{key:"backSpaceHtmlChars",value:function(t,e,s){if("html"!==s.contentType)return e;var n=t.substr(e).charAt(0);if(">"===n||";"===n){var i="";for(i=">"===n?"<":"&";t.substr(e-1).charAt(0)!==i&&(e--,!(e<0)););e--}return e}}]),t}();e["default"]=i;var r=new i;e.htmlParser=r}])}); +//# sourceMappingURL=typed.min.js.map \ No newline at end of file