diff --git a/_config.yml b/_config.yml index dbbf675..1f53746 100644 --- a/_config.yml +++ b/_config.yml @@ -10,8 +10,6 @@ logo: /logo.png # Comment disqus: holaxapps -duoshuo: -cloudTie: # Analytics # google-analytics: diff --git a/gulpfile.js b/gulpfile.js index 2b55ab4..3959755 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,6 +10,6 @@ gulp.task('sass', function() { }); gulp.task('default', ['sass'], function() { - gulp.watch('./source/scss/_partial/*.scss', ['sass']); gulp.watch('./source/scss/*.scss', ['sass']); + gulp.watch('./source/scss/_partial/*.scss', ['sass']); }); diff --git a/layout/archive.pug b/layout/archive.pug index 5004693..a1cb6ec 100644 --- a/layout/archive.pug +++ b/layout/archive.pug @@ -1,13 +1,13 @@ extends base.pug block site_title - config.title + != config.title block description meta(name="description", content=config.description) meta(name="og:title", content=config.title) meta(name="og:description", content=desc) - meta(name="og:image", content="http://holaxprogramming.com/logo.png") + meta(name="og:image", content=config.logo) block container include mixins/post.pug diff --git a/layout/index.pug b/layout/index.pug index 022c2f8..618c69f 100644 --- a/layout/index.pug +++ b/layout/index.pug @@ -1,13 +1,13 @@ extends base.pug -block site_title - config.title +block site_title + != config.title block description meta(name="description", content=config.description) meta(name="og:title", content=config.title) meta(name="og:description", content=desc) - meta(name="og:image", content="http://holaxprogramming.com/logo.png") + meta(name="og:image", content=config.logo) block container include mixins/post.pug diff --git a/layout/mixins/post.pug b/layout/mixins/post.pug index 1204bdd..eeb31d8 100644 --- a/layout/mixins/post.pug +++ b/layout/mixins/post.pug @@ -1,7 +1,8 @@ mixin postInfo(item) .post-info != full_date(item.date, 'll') - + //- span categories + //- Index Page mixin posts ul.home.post-list diff --git a/layout/partial/comment.pug b/layout/partial/comment.pug index d5f747f..fe7acac 100644 --- a/layout/partial/comment.pug +++ b/layout/partial/comment.pug @@ -1,17 +1,3 @@ -if theme.duoshuo - .ds-thread(data-thread-key=page.path, data-title=page.title, data-url=page.permalink, data-author-key='1') - script. - var duoshuoQuery = {short_name:"#{theme.duoshuo}"}; - (function() { - var ds = document.createElement('script'); - ds.type = 'text/javascript';ds.async = true; - ds.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + '//static.duoshuo.com/embed.js'; - ds.charset = 'UTF-8'; - (document.getElementsByTagName('head')[0] - || document.getElementsByTagName('body')[0]).appendChild(ds); - })(); - - if theme.disqus #disqus_thread script. @@ -25,17 +11,3 @@ if theme.disqus (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); })(); script(id='dsq-count-scr' src='//#{theme.disqus}.disqus.com/count.js' async) - - -if theme.cloudTie - #cloud-tie-wrapper.cloud-tie-wrapper - script(src='https://img1.cache.netease.com/f2e/tie/yun/sdk/loader.js') - script. - var cloudTieConfig = { - url: document.location.href, - sourceId: "#{page.path}", - productKey: "#{theme.cloudTie}", - target: "cloud-tie-wrapper" - }; - var yunManualLoad = true; - Tie.loader("aHR0cHM6Ly9hcGkuZ2VudGllLjE2My5jb20vcGMvbGl2ZXNjcmlwdC5odG1s", true); \ No newline at end of file diff --git a/layout/post.pug b/layout/post.pug index 65b28e2..54daa5c 100644 --- a/layout/post.pug +++ b/layout/post.pug @@ -5,7 +5,7 @@ block site_title block description - var desc = page.desc || config.description; - - var image = page.image || config.url + '/logo.png'; + - var image = page.image || config.url + config.logo; meta(name="description", content=desc) meta(name="og:title", content=page.title) meta(name="og:description", content=desc) diff --git a/package.json b/package.json index cd99f97..7652a7c 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "devDependencies": { "gulp": "^3.9.1", "gulp-autoprefixer": "^3.1.1", - "gulp-sass": "^2.3.2" + "gulp-sass": "^2.3.2", + "gulp-pug": "^3.3.0" } } diff --git a/source/css/apollo.css b/source/css/apollo.css index c40d123..da38c2a 100644 --- a/source/css/apollo.css +++ b/source/css/apollo.css @@ -1 +1 @@ -/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}::-moz-selection{color:#FFFFFF;background-color:#ce1458}::selection{color:#FFFFFF;background-color:#ce1458}html,body{width:100%;height:100%}body{margin:0;color:rgba(0,0,0,0.8);font-size:16px;line-height:1.6;background-color:#fff;font-family:'Nanum Barun Gothic', 'Helvetica Neue', Arial, sans-serif}ul.nav,ul.post-list{margin:0;padding:0;list-style-type:none}ul{margin:1rem 0}a,a:active{color:rgba(0,0,0,0.8);text-decoration:none}a.nav-list-link.active,a.nav-list-link:hover{border-bottom:2px solid #ce1458;color:#ce1458}a.post-title-link:hover{border-bottom:2px solid #4f88ea}hr{border:0}code{margin:0 2px;padding:3px 5px;color:#e96900;border-radius:2px;white-space:inherit}iframe,video{max-width:100%;width:600px;height:394px;margin:1rem auto;display:block}table{width:100%;margin:1em auto}table thead{background-color:#ddd}table thead th{padding:5px;min-width:20px}table tbody tr:nth-child(2n){background-color:#eee}table tbody td{padding:5px;vertical-align:text-top}header{text-align:center}header .nav{float:none;display:block}header .logo-link img{height:130px}header .nav-list-item{display:inline-block;position:relative;padding:2px 15px}header .nav-list-item a:before{content:"#";color:#ce1458;position:absolute;left:0.1em;top:0.10em;font-size:1.1em;font-weight:bold}header .nav-list-item a{font-size:18px;line-height:1.3}.home.post-list .post-list-item{padding:0 0 2em;border-bottom:1px solid #ddd}.home.post-list .post-list-item:last-child{border-bottom:0px}.home.post-list .post-content h2:before,.home.post-list .post-content h3:before,.home.post-list .post-content h4:before,.home.post-list .post-content h5:before,.home.post-list .post-content h6:before{content:''}.home.post-list .post-content>ul{list-style:initial}.home.post-list .read-more{color:rgba(0,0,0,0.44)}.archive{max-width:500px;margin:5em auto}.archive .post-item{padding:2px 0 0 50px}.archive .post-time,.archive .post-title-link{font-size:1rem}.archive .post-title-link{display:block;margin-left:125px;color:#4f88ea;word-break:break-all}.archive .post-title-link:hover{border-bottom:0;color:#267B54}.archive .post-info{float:left;width:125px;color:#7f8c8d}.post-block .post-title{margin:0.5em 0;color:rgba(0,0,0,0.8);font-size:30px}.post-block .post-info{color:#7f8c8d;margin-bottom:2em}.post-block .post-info span{margin-left:0.5rem}.post-block .post-info a.post-from{margin-left:0.5rem;padding:3px 6px;border-radius:5px;font-size:12px;color:white;background-color:#E36B6B}.post-content h2,.post-content h3{position:relative;margin:35px 0 0 0}.post-content h2 a:before,.post-content h3 a:before{content:"#";color:#ce1458;position:absolute;left:-0.8em;top:-0.15em;font-size:1.25em;font-weight:bold}.post-content h4,.post-content h5,.post-content h6{position:relative;margin:25px 0 0 0}.post-content h2,.post-content h3{font-size:28px}.post-content h4,.post-content h5,.post-content h6{font-size:18px}.post-content a{color:#4f80e0;word-break:break-all}.post-content a:hover{color:#2d4f89}.post-content blockquote{margin:1em 0;padding-left:18px;border-left:4px solid #8e8e8d}.post-content img{display:block;max-width:100%;margin:1.5em auto}.post-content>table,.post-content>figure.highlight{box-shadow:0 1px 2px rgba(0,0,0,0.125)}.post-content .tip{position:relative;margin:2em 0;padding:12px 24px 12px 30px;border-left:4px solid #f66;border-top-right-radius:2px;border-bottom-right-radius:2px;background-color:#f8f8f8}.post-content .tip br{display:none}.post-content .tip:before{position:absolute;top:14px;left:-12px;content:"!";width:20px;height:20px;border-radius:100%;color:#fff;font-size:14px;line-height:20px;font-weight:bold;text-align:center;background-color:#f66;font-family:'Dosis', 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif}#mask{position:fixed;overflow:scroll;width:100%;height:100%;padding:1em 0;background-color:rgba(0,0,0,0.5);z-index:10}#mask #mask-image{max-width:95%}code,pre{font-size:0.8em;background-color:#f8f8f8;font-family:'Roboto Mono', Monaco, courier, monospace}.highlight{position:relative;margin:1em 0;border-radius:2px;line-height:1.1em;background-color:#f8f8f8;overflow-x:auto}.highlight table,.highlight tr,.highlight td{width:100%;border-collapse:collapse;padding:0;margin:0}.highlight .gutter{display:none}.highlight .code pre{padding:1.2em 1.4em;line-height:1.5em;margin:0}.highlight .code pre .line{width:auto;height:18px}.highlight.html .code:after,.highlight.js .code:after,.highlight.bash .code:after,.highlight.css .code:after,.highlight.scss .code:after,.highlight.diff .code:after,.highlight.java .code:after,.highlight.xml .code:after,.highlight.python .code:after,.highlight.json .code:after,.highlight.swift .code:after,.highlight.ruby .code:after,.highlight.perl .code:after,.highlight.php .code:after,.highlight.c .code:after,.highlight.cpp .code:after,.highlight.ts .code:after{position:absolute;top:0;right:0;color:#ccc;text-align:right;font-size:0.75em;padding:5px 10px 0;line-height:15px;height:15px;font-weight:600}.highlight.html .code:after{content:"HTML"}.highlight.js .code:after{content:"JS"}.highlight.bash .code:after{content:"BASH"}.highlight.css .code:after{content:"CSS"}.highlight.scss .code:after{content:"SCSS"}.highlight.diff .code:after{content:"DIFF"}.highlight.java .code:after{content:"JAVA"}.highlight.xml .code:after{content:"XML"}.highlight.python .code:after{content:"PYTHON"}.highlight.json .code:after{content:"JSON"}.highlight.swift .code:after{content:"SWIFT"}.highlight.ruby .code:after{content:"RUBY"}.highlight.perl .code:after{content:"PERL"}.highlight.php .code:after{content:"PHP"}.highlight.c .code:after{content:"C"}.highlight.java .code:after{content:"JAVA"}.highlight.cpp .code:after{content:"CPP"}.highlight.ts .code:after{content:"TS"}.highlight.cpp .code:after{content:'C++'}pre{color:#525252}pre .function .keyword,pre .constant{color:#0092db}pre .keyword,pre .attribute{color:#e96900}pre .number,pre .literal{color:#ae81ff}pre .tag,pre .tag .title,pre .change,pre .winutils,pre .flow,pre .lisp .title,pre .clojure .built_in,pre .nginx .title,pre .tex .special{color:#2973b7}pre .symbol,pre .symbol .string,pre .value,pre .regexp{color:#42b983}pre .title{color:#83B917}pre .tag .value,pre .string,pre .subst,pre .haskell .type,pre .preprocessor,pre .ruby .class .parent,pre .built_in,pre .sql .aggregate,pre .django .template_tag,pre .django .variable,pre .smalltalk .class,pre .javadoc,pre .django .filter .argument,pre .smalltalk .localvars,pre .smalltalk .array,pre .attr_selector,pre .pseudo,pre .addition,pre .stream,pre .envvar,pre .apache .tag,pre .apache .cbracket,pre .tex .command,pre .prompt{color:#4f88ea}pre .comment,pre .java .annotation,pre .python .decorator,pre .template_comment,pre .pi,pre .doctype,pre .shebang,pre .apache .sqbracket,pre .tex .formula{color:#b3b3b3}pre .deletion{color:#BA4545}pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5}.paginator{margin:4em 0;text-align:center}.paginator .prev,.paginator .next{display:inline-block;margin:0 4px;padding:4px 12px;border-radius:4px;border-bottom:4px solid #2d4f89;font-size:14px;color:#fff;background-color:#4f88ea}.paginator .prev:hover,.paginator .next:hover{background-color:#2d4f89}.ds-thread,#disqus_thread{margin-bottom:2em}main.container{margin:3em 10px}@media screen and (min-width: 700px){.wrap{width:700px;margin:0 auto}header{padding:0px 100px}}@media screen and (max-width: 700px){.wrap{width:100%}body{font-size:15px}header .logo-link img{height:100px}header .nav-list-item{padding:2px 10px}header .nav-list-item a:before{content:""}main.container,.archive{margin-top:35px}.archive .post-item{padding-left:20px}.post-block .post-title{font-size:26px}.post-content h2,.post-content h3,.post-content h4,.post-content h5,.post-content h6{max-width:700px}.post-content h2,.post-content h3{font-size:26px}.post-content h2 a:before,.post-content h3 a:before{content:""}.post-content h4,.post-content h5,.post-content h6{font-size:16px}.ds-thread,#disqus_thread{margin:2em 10px}}footer{padding-bottom:1px}footer .copyright{margin:4em 0;border-top:1px solid #ddd;text-align:center}footer .copyright p,footer .copyright a{color:#aaa;font-size:14px;font-weight:100}footer .copyright a:hover{color:#888}@font-face{font-family:'Nanum Barun Gothic';font-style:normal;font-weight:200;src:url("../font/NanumBarunGothic.woff2") format("woff2"),url("../font/NanumBarunGothic.woff") format("woff")}@font-face{font-family:'Nanum Barun Gothic';font-style:normal;font-weight:bold;src:url("../font/NanumBarunGothicBold.woff2") format("woff2"),url("../font/NanumBarunGothicBold.woff") format("woff")} +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}::-moz-selection{color:#FFFFFF;background-color:#ce1458}::selection{color:#FFFFFF;background-color:#ce1458}html,body{width:100%;height:100%}body{margin:0;color:rgba(0,0,0,0.8);font-size:16px;line-height:1.6;background-color:#fff;font-family:'Nanum Barun Gothic', 'Helvetica Neue', Arial, sans-serif}ul.nav,ul.post-list{margin:0;padding:0;list-style-type:none}ul{margin:1rem 0}a,a:active{color:rgba(0,0,0,0.8);text-decoration:none}a.nav-list-link.active,a.nav-list-link:hover{border-bottom:2px solid #ce1458;color:#ce1458}a.post-title-link:hover{border-bottom:2px solid #4f88ea}hr{border:0}code{margin:0 2px;padding:3px 5px;color:rgba(0,0,0,0.8);border-radius:2px;white-space:inherit}iframe,video{max-width:100%;width:600px;height:394px;margin:1rem auto;display:block}table{width:100%;margin:1em auto}table thead{background-color:#ddd}table thead th{padding:5px;min-width:20px}table tbody tr:nth-child(2n){background-color:#eee}table tbody td{padding:5px;vertical-align:text-top}header{text-align:center}header .nav{float:none;display:block}header .logo-link img{height:130px}header .nav-list-item{display:inline-block;position:relative;padding:2px 15px}header .nav-list-item a:before{content:"#";color:#ce1458;position:absolute;left:0.1em;top:0.10em;font-size:1.1em;font-weight:bold}header .nav-list-item a{font-size:18px;line-height:1.3}.home.post-list .post-list-item{padding:0 0 2em;border-bottom:1px solid #ddd}.home.post-list .post-list-item:last-child{border-bottom:0px}.home.post-list .post-content h2:before,.home.post-list .post-content h3:before,.home.post-list .post-content h4:before,.home.post-list .post-content h5:before,.home.post-list .post-content h6:before{content:''}.home.post-list .post-content>ul{list-style:initial}.home.post-list .read-more{color:rgba(0,0,0,0.44)}.archive{max-width:500px;margin:5em auto}.archive .post-item{padding:2px 0 0 50px}.archive .post-time,.archive .post-title-link{font-size:1rem}.archive .post-title-link{display:block;margin-left:125px;color:#4f88ea;word-break:break-all}.archive .post-title-link:hover{border-bottom:0;color:#267B54}.archive .post-info{float:left;width:125px;color:#7f8c8d}.post-block .post-title{margin:0.5em 0;color:rgba(0,0,0,0.8);font-size:30px}.post-block .post-info{color:#7f8c8d;margin-bottom:1em}.post-block .post-info span{margin-left:5px;padding:3px 5px;background-color:rgba(0,0,0,0.05);color:rgba(0,0,0,0.6);border-radius:4px;white-space:inherit}.post-content h2,.post-content h3{position:relative;margin:35px 0 0 0}.post-content h2 a:before,.post-content h3 a:before{content:"#";color:rgba(0,0,0,0.8);position:absolute;left:-0.8em;top:-0.15em;font-size:1.25em;font-weight:bold}.post-content h4,.post-content h5,.post-content h6{position:relative;margin:25px 0 0 0}.post-content h2,.post-content h3{font-size:28px}.post-content h4,.post-content h5,.post-content h6{font-size:18px}.post-content a{color:#4f80e0;word-break:break-all}.post-content a:hover{color:#2d4f89}.post-content blockquote{margin:1em 0;padding-left:18px;border-left:4px solid #8e8e8d}.post-content img{display:block;max-width:100%;margin:1.5em auto}.post-content>table,.post-content>figure.highlight{box-shadow:0 1px 2px rgba(0,0,0,0.125)}.post-content .tip{position:relative;margin:2em 0;padding:12px 24px 12px 30px;border-left:4px solid #f66;border-top-right-radius:2px;border-bottom-right-radius:2px;background-color:#f8f8f8}.post-content .tip br{display:none}.post-content .tip:before{position:absolute;top:14px;left:-12px;content:"!";width:20px;height:20px;border-radius:100%;color:#fff;font-size:14px;line-height:20px;font-weight:bold;text-align:center;background-color:#f66;font-family:'Dosis', 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif}#mask{position:fixed;overflow:scroll;width:100%;height:100%;padding:1em 0;background-color:rgba(0,0,0,0.5);z-index:10}#mask #mask-image{max-width:95%}code,pre{font-size:0.8em;background-color:#f8f8f8;font-family:'Roboto Mono', Monaco, courier, monospace}.highlight{position:relative;margin:1em 0;border-radius:2px;line-height:1.1em;background-color:#f8f8f8;overflow-x:auto}.highlight table,.highlight tr,.highlight td{width:100%;border-collapse:collapse;padding:0;margin:0}.highlight .gutter{display:none}.highlight .code pre{padding:1.2em 1.4em;line-height:1.5em;margin:0}.highlight .code pre .line{width:auto;height:18px}.highlight.html .code:after,.highlight.js .code:after,.highlight.bash .code:after,.highlight.css .code:after,.highlight.scss .code:after,.highlight.diff .code:after,.highlight.java .code:after,.highlight.xml .code:after,.highlight.python .code:after,.highlight.json .code:after,.highlight.swift .code:after,.highlight.ruby .code:after,.highlight.perl .code:after,.highlight.php .code:after,.highlight.c .code:after,.highlight.cpp .code:after,.highlight.ts .code:after{position:absolute;top:0;right:0;color:#ccc;text-align:right;font-size:0.75em;padding:5px 10px 0;line-height:15px;height:15px;font-weight:600}.highlight.html .code:after{content:"HTML"}.highlight.js .code:after{content:"JS"}.highlight.bash .code:after{content:"BASH"}.highlight.css .code:after{content:"CSS"}.highlight.scss .code:after{content:"SCSS"}.highlight.diff .code:after{content:"DIFF"}.highlight.java .code:after{content:"JAVA"}.highlight.xml .code:after{content:"XML"}.highlight.python .code:after{content:"PYTHON"}.highlight.json .code:after{content:"JSON"}.highlight.swift .code:after{content:"SWIFT"}.highlight.ruby .code:after{content:"RUBY"}.highlight.perl .code:after{content:"PERL"}.highlight.php .code:after{content:"PHP"}.highlight.c .code:after{content:"C"}.highlight.java .code:after{content:"JAVA"}.highlight.cpp .code:after{content:"CPP"}.highlight.ts .code:after{content:"TS"}.highlight.cpp .code:after{content:'C++'}pre{color:#525252}pre .function .keyword,pre .constant{color:#0092db}pre .keyword,pre .attribute{color:#e96900}pre .number,pre .literal{color:#ae81ff}pre .tag,pre .tag .title,pre .change,pre .winutils,pre .flow,pre .lisp .title,pre .clojure .built_in,pre .nginx .title,pre .tex .special{color:#2973b7}pre .symbol,pre .symbol .string,pre .value,pre .regexp{color:#42b983}pre .title{color:#83B917}pre .tag .value,pre .string,pre .subst,pre .haskell .type,pre .preprocessor,pre .ruby .class .parent,pre .built_in,pre .sql .aggregate,pre .django .template_tag,pre .django .variable,pre .smalltalk .class,pre .javadoc,pre .django .filter .argument,pre .smalltalk .localvars,pre .smalltalk .array,pre .attr_selector,pre .pseudo,pre .addition,pre .stream,pre .envvar,pre .apache .tag,pre .apache .cbracket,pre .tex .command,pre .prompt{color:#4f88ea}pre .comment,pre .java .annotation,pre .python .decorator,pre .template_comment,pre .pi,pre .doctype,pre .shebang,pre .apache .sqbracket,pre .tex .formula{color:#b3b3b3}pre .deletion{color:#BA4545}pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .javascript,pre .xml .vbscript,pre .xml .css,pre .xml .cdata{opacity:0.5}.paginator{margin:4em 0;text-align:center}.paginator .prev,.paginator .next{display:inline-block;margin:0 4px;padding:4px 12px;border-radius:4px;border-bottom:4px solid #2d4f89;font-size:14px;color:#fff;background-color:#4f88ea}.paginator .prev:hover,.paginator .next:hover{background-color:#2d4f89}.ds-thread,#disqus_thread{margin-bottom:2em}main.container{margin:3em 10px}@media screen and (min-width: 700px){.wrap{width:700px;margin:0 auto}header{padding:0px 100px}}@media screen and (max-width: 700px){.wrap{width:100%}body{font-size:15px}header .logo-link img{height:100px}header .nav-list-item{padding:2px 10px}header .nav-list-item a:before{content:""}main.container,.archive{margin-top:35px}.archive .post-item{padding-left:20px}.post-block .post-title{font-size:26px}.post-content h2,.post-content h3,.post-content h4,.post-content h5,.post-content h6{max-width:700px}.post-content h2,.post-content h3{font-size:26px}.post-content h2 a:before,.post-content h3 a:before{content:""}.post-content h4,.post-content h5,.post-content h6{font-size:16px}.ds-thread,#disqus_thread{margin:2em 10px}}footer{padding-bottom:1px}footer .copyright{margin:4em 0;border-top:1px solid #ddd;text-align:center}footer .copyright p,footer .copyright a{color:#aaa;font-size:14px;font-weight:100}footer .copyright a:hover{color:#888}@font-face{font-family:'Nanum Barun Gothic';font-style:normal;font-weight:200;src:url("../font/NanumBarunGothic.woff2") format("woff2"),url("../font/NanumBarunGothic.woff") format("woff")}@font-face{font-family:'Nanum Barun Gothic';font-style:normal;font-weight:bold;src:url("../font/NanumBarunGothicBold.woff2") format("woff2"),url("../font/NanumBarunGothicBold.woff") format("woff")} diff --git a/source/scss/_partial/base.scss b/source/scss/_partial/base.scss index efb9131..f2f2e30 100644 --- a/source/scss/_partial/base.scss +++ b/source/scss/_partial/base.scss @@ -50,7 +50,7 @@ hr { code { margin: 0 2px; padding: 3px 5px; - color: #e96900; + color: rgba(0, 0, 0, 0.8); border-radius: 2px; white-space: inherit; } diff --git a/source/scss/_partial/post.scss b/source/scss/_partial/post.scss index c7dc530..618c70e 100755 --- a/source/scss/_partial/post.scss +++ b/source/scss/_partial/post.scss @@ -7,17 +7,14 @@ .post-info { color: #7f8c8d; - margin-bottom: 2em; + margin-bottom: 1em; span { - margin-left: 0.5rem; - } - a.post-from { - margin-left: 0.5rem; - padding: 3px 6px; - border-radius: 5px; - font-size: 12px; - color: white; - background-color: #E36B6B; + margin-left: 5px; + padding: 3px 5px; + background-color: rgba(0, 0, 0, 0.05); + color: rgba(0, 0, 0, 0.6); + border-radius: 4px; + white-space: inherit; } } } @@ -28,7 +25,7 @@ margin: 35px 0 0 0; a:before { content: "#"; - color: #ce1458; + color: rgba(0, 0, 0, 0.8); position: absolute; left: -0.8em; top: -0.15em;