diff --git a/Gemfile b/Gemfile index 9fa05ea9..66b923c5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,12 @@ source 'http://rubygems.org' gem "jekyll" -gem "wdm", "~> 0.1.0" if Gem.win_platform? +gem 'wdm', '>= 0.1.0' if Gem.win_platform? group :jekyll_plugins do gem 'jekyll-mentions' gem 'jekyll-feed' gem 'jekyll-sitemap' gem 'jekyll-redirect-from' - gem 'hawkins' + gem 'hawkins' # jekyll liveserve end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index a96ebc54..5a20736b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,74 +1,83 @@ GEM remote: http://rubygems.org/ specs: - activesupport (4.2.8) - i18n (~> 0.7) + activesupport (5.2.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) + concurrent-ruby (1.0.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.3-x64-mingw32) - ffi (1.9.17-x64-mingw32) + eventmachine (1.2.7-x64-mingw32) + ffi (1.9.25-x64-mingw32) forwardable-extended (2.6.0) hawkins (2.0.5) em-websocket (~> 0.5) jekyll (~> 3.1) - html-pipeline (2.5.0) + html-pipeline (2.8.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (0.8.1) - jekyll (3.4.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.3) addressable (~> 2.4) colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) + liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.9.1) + jekyll-feed (0.10.0) jekyll (~> 3.3) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) + jekyll-mentions (1.4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) - jekyll-redirect-from (0.12.1) + jekyll-redirect-from (0.14.0) jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-sitemap (1.0.0) + jekyll-sitemap (1.2.0) jekyll (~> 3.3) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.13.2) - liquid (3.0.6) - listen (3.0.8) + jekyll-watch (2.0.0) + listen (~> 3.0) + kramdown (1.17.0) + liquid (4.0.0) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) - mini_portile2 (2.1.0) - minitest (5.10.1) - nokogiri (1.7.0.1-x64-mingw32) - mini_portile2 (~> 2.1.0) - pathutil (0.14.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + nokogiri (1.8.4-x64-mingw32) + mini_portile2 (~> 2.3.0) + pathutil (0.16.1) forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) - rouge (1.11.1) + public_suffix (3.0.2) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rouge (3.1.1) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.4.23) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) thread_safe (0.3.6) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) wdm (0.1.1) @@ -82,7 +91,7 @@ DEPENDENCIES jekyll-mentions jekyll-redirect-from jekyll-sitemap - wdm (~> 0.1.0) + wdm (>= 0.1.0) BUNDLED WITH - 1.14.6 + 1.16.2 diff --git a/_config.yml b/_config.yml index 1e3fa433..3856cddb 100644 --- a/_config.yml +++ b/_config.yml @@ -27,7 +27,7 @@ kramdown: disable: true include: ['_pages'] exclude: [vendor, "developer-tools"] -gems: +plugins: - jekyll-mentions - jekyll-feed - jekyll-sitemap diff --git a/_layouts/about.html b/_layouts/about.html index 8fea0103..f39ff37a 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -2,7 +2,7 @@ layout: headless --- {% if site.data.authors and site.data.authors[page.author] %} -{% assign author = site.data.authors.[page.author] %} +{% assign author = site.data.authors[page.author] %} {% elsif site.data.authors %} {% assign author = site.data.authors[0] %} {% endif %} diff --git a/_pages/cv.html b/_pages/cv.html index 27e32976..eb0ed7e7 100644 --- a/_pages/cv.html +++ b/_pages/cv.html @@ -8,7 +8,7 @@ weight: 70 excerpt: This page contains the curriculum vitae (CV) of the author. --- -{% assign cv = site.data.cv.[page.author] %} +{% assign cv = site.data.cv[page.author] %}
{{cv.profile}}
diff --git a/_sass/override.scss b/_sass/override.scss index 83783dc7..8c7722dd 100644 --- a/_sass/override.scss +++ b/_sass/override.scss @@ -3,6 +3,7 @@ pre, pre[class*="language-"] { margin-bottom: 1.8em !important; } +pre code { display:block; width:90%; max-width:650px; margin:auto; } /* Custom CSS for GitHub link in about page */ .github-button-container { diff --git a/_sass/prism.scss b/_sass/prism.scss index 262c20b7..c5d1d92b 100644 --- a/_sass/prism.scss +++ b/_sass/prism.scss @@ -1,86 +1,85 @@ -/* Code blocks */ -code, -pre { - color: black; - background: none; - text-shadow: 0 1px white; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - text-align: left; - white-space: pre-wrap; - word-spacing: normal; - word-break: normal; - word-wrap: break-word; - line-height: 1.5; - - -moz-tab-size: 4; - -o-tab-size: 4; - tab-size: 4; - - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; -} - -pre::-moz-selection, pre ::-moz-selection, -code::-moz-selection, code ::-moz-selection { - text-shadow: none; - background: #b3d4fc; -} - -pre::selection, pre ::selection, -code::selection, code ::selection { - text-shadow: none; - background: #b3d4fc; +/* PrismJS 1.15.0 +https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */ +/** + * prism.js default theme for JavaScript, CSS and HTML + * Based on dabblet (http://dabblet.com) + * @author Lea Verou + */ + +code[class*="language-"], +pre[class*="language-"] { + color: black; + background: none; + text-shadow: 0 1px white; + font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; + line-height: 1.5; + + -moz-tab-size: 4; + -o-tab-size: 4; + tab-size: 4; + + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; +} + +pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection, +code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection { + text-shadow: none; + background: #b3d4fc; +} + +pre[class*="language-"]::selection, pre[class*="language-"] ::selection, +code[class*="language-"]::selection, code[class*="language-"] ::selection { + text-shadow: none; + background: #b3d4fc; } @media print { - code, - pre { - text-shadow: none; - } -} - -pre { - padding: 1em; - margin: 1em 0; + code[class*="language-"], + pre[class*="language-"] { + text-shadow: none; + } } -pre code { - display: block; - width: 90%; - max-width: 650px; - margin: auto; +/* Code blocks */ +pre[class*="language-"] { + padding: 1em; + margin: .5em 0; + overflow: auto; } -:not(pre) > code, -pre { - background: rgba(250,250,250,0.8); - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #eeeeee; +:not(pre) > code[class*="language-"], +pre[class*="language-"] { + background: #f5f2f0; } /* Inline code */ -:not(pre) > code { - padding: .1em .2em; - border-radius: .3em; - white-space: normal; - border: 1px solid #eeeeee; +:not(pre) > code[class*="language-"] { + padding: .1em; + border-radius: .3em; + white-space: normal; } .token.comment, .token.prolog, .token.doctype, .token.cdata { - color: slategray; + color: slategray; } .token.punctuation { - color: #999; + color: #999; } .namespace { - opacity: .7; + opacity: .7; } .token.property, @@ -90,7 +89,7 @@ pre { .token.constant, .token.symbol, .token.deleted { - color: #905; + color: #905; } .token.selector, @@ -99,7 +98,7 @@ pre { .token.char, .token.builtin, .token.inserted { - color: #690; + color: #690; } .token.operator, @@ -107,34 +106,36 @@ pre { .token.url, .language-css .token.string, .style .token.string { - color: #a67f59; - background: hsla(0, 0%, 100%, .5); + color: #9a6e3a; + background: hsla(0, 0%, 100%, .5); } .token.atrule, .token.attr-value, .token.keyword { - color: #07a; + color: #07a; } -.token.function { - color: #DD4A68; +.token.function, +.token.class-name { + color: #DD4A68; } .token.regex, .token.important, .token.variable { - color: #e90; + color: #e90; } .token.important, .token.bold { - font-weight: bold; + font-weight: bold; } .token.italic { - font-style: italic; + font-style: italic; } .token.entity { - cursor: help; + cursor: help; } + diff --git a/css/prism.scss b/css/prism.scss deleted file mode 100644 index b4219913..00000000 --- a/css/prism.scss +++ /dev/null @@ -1,227 +0,0 @@ -/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript+aspnet+bash+batch+c+csharp+cpp+coffeescript+ruby+git+java+json+less+objectivec+php+powershell+python+scss&plugins=line-highlight+line-numbers */ -/** - * prism.js default theme for JavaScript, CSS and HTML - * Based on dabblet (http://dabblet.com) - * @author Lea Verou - */ - -code[class*="language-"], -pre[class*="language-"] { - color: black; - background: none; - text-shadow: 0 1px white; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - word-wrap: normal; - line-height: 1.5; - - -moz-tab-size: 4; - -o-tab-size: 4; - tab-size: 4; - - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; -} - -pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection, -code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection { - text-shadow: none; - background: #b3d4fc; -} - -pre[class*="language-"]::selection, pre[class*="language-"] ::selection, -code[class*="language-"]::selection, code[class*="language-"] ::selection { - text-shadow: none; - background: #b3d4fc; -} - -@media print { - code[class*="language-"], - pre[class*="language-"] { - text-shadow: none; - } -} - -/* Code blocks */ -pre[class*="language-"] { - padding: 1em; - margin: .5em 0; - overflow: auto; -} - -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background: #f5f2f0; -} - -/* Inline code */ -:not(pre) > code[class*="language-"] { - padding: .1em; - border-radius: .3em; - white-space: normal; -} - -.token.comment, -.token.prolog, -.token.doctype, -.token.cdata { - color: slategray; -} - -.token.punctuation { - color: #999; -} - -.namespace { - opacity: .7; -} - -.token.property, -.token.tag, -.token.boolean, -.token.number, -.token.constant, -.token.symbol, -.token.deleted { - color: #905; -} - -.token.selector, -.token.attr-name, -.token.string, -.token.char, -.token.builtin, -.token.inserted { - color: #690; -} - -.token.operator, -.token.entity, -.token.url, -.language-css .token.string, -.style .token.string { - color: #a67f59; - background: hsla(0, 0%, 100%, .5); -} - -.token.atrule, -.token.attr-value, -.token.keyword { - color: #07a; -} - -.token.function { - color: #DD4A68; -} - -.token.regex, -.token.important, -.token.variable { - color: #e90; -} - -.token.important, -.token.bold { - font-weight: bold; -} -.token.italic { - font-style: italic; -} - -.token.entity { - cursor: help; -} - -pre[data-line] { - position: relative; - padding: 1em 0 1em 3em; -} - -.line-highlight { - position: absolute; - left: 0; - right: 0; - padding: inherit 0; - margin-top: 1em; /* Same as .prism’s padding-top */ - - background: hsla(24, 20%, 50%,.08); - background: -moz-linear-gradient(to right, hsla(24, 20%, 50%,.1) 70%, hsla(24, 20%, 50%,0)); - background: -webkit-linear-gradient(to right, hsla(24, 20%, 50%,.1) 70%, hsla(24, 20%, 50%,0)); - background: -o-linear-gradient(to right, hsla(24, 20%, 50%,.1) 70%, hsla(24, 20%, 50%,0)); - background: linear-gradient(to right, hsla(24, 20%, 50%,.1) 70%, hsla(24, 20%, 50%,0)); - - pointer-events: none; - - line-height: inherit; - white-space: pre; -} - - .line-highlight:before, - .line-highlight[data-end]:after { - content: attr(data-start); - position: absolute; - top: .4em; - left: .6em; - min-width: 1em; - padding: 0 .5em; - background-color: hsla(24, 20%, 50%,.4); - color: hsl(24, 20%, 95%); - font: bold 65%/1.5 sans-serif; - text-align: center; - vertical-align: .3em; - border-radius: 999px; - text-shadow: none; - box-shadow: 0 1px white; - } - - .line-highlight[data-end]:after { - content: attr(data-end); - top: auto; - bottom: .4em; - } - -pre.line-numbers { - position: relative; - padding-left: 3.8em; - counter-reset: linenumber; -} - -pre.line-numbers > code { - position: relative; -} - -.line-numbers .line-numbers-rows { - position: absolute; - pointer-events: none; - top: 0; - font-size: 100%; - left: -3.8em; - width: 3em; /* works for line-numbers below 1000 lines */ - letter-spacing: -1px; - border-right: 1px solid #999; - - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - -} - - .line-numbers-rows > span { - pointer-events: none; - display: block; - counter-increment: linenumber; - } - - .line-numbers-rows > span:before { - content: counter(linenumber); - color: #999; - display: block; - padding-right: 0.8em; - text-align: right; - } diff --git a/js/prism.js b/js/prism.js index 5e387dc0..4ca3fbfe 100644 --- a/js/prism.js +++ b/js/prism.js @@ -1,25 +1,7 @@ -/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript+aspnet+bash+batch+c+csharp+cpp+coffeescript+ruby+git+java+json+less+objectivec+php+powershell+python+scss&plugins=line-highlight+line-numbers */ -var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(\w+)\b/i,t=0,n=_self.Prism={util:{encode:function(e){return e instanceof a?new a(e.type,n.util.encode(e.content),e.alias):"Array"===n.util.type(e)?e.map(n.util.encode):e.replace(/&/g,"&").replace(/e.length)break e;if(!(m instanceof a)){u.lastIndex=0;var y=u.exec(m),v=1;if(!y&&h&&p!=r.length-1){var b=r[p+1].matchedStr||r[p+1],k=m+b;if(p