diff options
Diffstat (limited to '.themes')
-rw-r--r-- | .themes/classic/sass/base/_layout.scss | 8 | ||||
-rw-r--r-- | .themes/classic/sass/partials/_navigation.scss | 5 | ||||
-rw-r--r-- | .themes/classic/sass/partials/_syntax.scss | 64 | ||||
-rw-r--r-- | .themes/classic/source/_includes/article.html | 2 | ||||
-rw-r--r-- | .themes/classic/source/_includes/asides/github.html | 4 | ||||
-rw-r--r-- | .themes/classic/source/_includes/head.html | 2 | ||||
-rw-r--r-- | .themes/classic/source/_layouts/post.html | 2 | ||||
-rw-r--r-- | .themes/classic/source/assets/jwplayer/glow/glow.xml | 228 | ||||
-rw-r--r-- | .themes/classic/source/javascripts/github.js | 12 | ||||
-rw-r--r-- | .themes/classic/source/javascripts/pinboard.js | 4 | ||||
-rw-r--r-- | .themes/classic/source/javascripts/twitter.js | 8 |
11 files changed, 174 insertions, 165 deletions
diff --git a/.themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss index ad99c6a2..81903428 100644 --- a/.themes/classic/sass/base/_layout.scss +++ b/.themes/classic/sass/base/_layout.scss @@ -127,16 +127,17 @@ body.sidebar-footer { @media only screen and (min-width: 750px) { aside.sidebar { @include collapse-sidebar; } } +#main, #content, .sidebar { + @extend .group; +} @media only screen and (min-width: 768px) { body { -webkit-text-size-adjust: auto; } body > header { font-size: $header-font-size * 1.2; } #main { - @extend .group; padding: 0; margin: 0 auto; } #content { - @extend .group; overflow: visible; margin-right: $sidebar-width-medium; position: relative; @@ -149,7 +150,6 @@ body.sidebar-footer { } } aside.sidebar { - @extend .group; width: $sidebar-width-medium - $sidebar-pad-medium*2; padding: 0 $sidebar-pad-medium $sidebar-pad-medium; background: none; @@ -180,7 +180,6 @@ body.sidebar-footer { padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide; .collapse-sidebar & { padding: { left: $pad-wide; right: $pad-wide; } - @extend .group; } } } @@ -190,3 +189,4 @@ body.sidebar-footer { ul, ol { margin-left: 0; } } } + diff --git a/.themes/classic/sass/partials/_navigation.scss b/.themes/classic/sass/partials/_navigation.scss index 68a15ce0..30fa011d 100644 --- a/.themes/classic/sass/partials/_navigation.scss +++ b/.themes/classic/sass/partials/_navigation.scss @@ -13,7 +13,7 @@ body > nav { .search { padding: .3em .5em 0; font-size: .85em; - @extend .sans; + font-family: $sans; line-height: 1.1em; width: 95%; @include border-radius(.5em); @@ -54,7 +54,7 @@ body > nav { } a { @include link-colors($nav-color, $nav-color-hover, $visited: $nav-color); - @extend .sans; + font-family: $sans; text-shadow: lighten($nav-bg, 12) 0 1px; float: left; text-decoration: none; @@ -134,3 +134,4 @@ body > nav { a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); } a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); } } + diff --git a/.themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss index 77ac8d78..5465286f 100644 --- a/.themes/classic/sass/partials/_syntax.scss +++ b/.themes/classic/sass/partials/_syntax.scss @@ -1,44 +1,52 @@ .highlight, html .gist .gist-file .gist-syntax .gist-highlight { table td.code { width: 100%; } - .line-numbers { - text-align: right; - font-size: 13px; - line-height: 1.45em; - @if $solarized == light { - background: lighten($base03, 1) $noise-bg !important; - border-right: 1px solid darken($base02, 2) !important; - @include box-shadow(lighten($base03, 2) -1px 0 inset); - text-shadow: lighten($base02, 2) 0 -1px; - } @else { - background: $base02 $noise-bg !important; - border-right: 1px solid darken($base03, 2) !important; - @include box-shadow(lighten($base02, 2) -1px 0 inset); - text-shadow: darken($base02, 10) 0 -1px; - } - span { color: $base01 !important; } - padding: .8em !important; - @include border-radius(0); - } border: 1px solid $pre-border !important; } +.highlight .line-numbers, html .gist .gist-file .gist-syntax .highlight .line_numbers { + text-align: right; + font-size: 13px; + line-height: 1.45em; + @if $solarized == light { + background: lighten($base03, 1) $noise-bg !important; + border-right: 1px solid darken($base02, 2) !important; + @include box-shadow(lighten($base03, 2) -1px 0 inset); + text-shadow: lighten($base02, 2) 0 -1px; + } @else { + background: $base02 $noise-bg !important; + border-right: 1px solid darken($base03, 2) !important; + @include box-shadow(lighten($base02, 2) -1px 0 inset); + text-shadow: darken($base02, 10) 0 -1px; + } + span { color: $base01 !important; } + padding: .8em !important; + @include border-radius(0); +} + figure.code, .gist-file, pre { @include box-shadow(rgba(#000, .06) 0 0 10px); .highlight pre { @include box-shadow(none); } } +.gist .highlight, figure.code .highlight { + @include selection(adjust-color($base03, $lightness: 23%, $saturation: -65%), $text-shadow: $base03 0 1px); +} html .gist .gist-file { margin-bottom: 1.8em; position: relative; border: none; padding-top: image-height("code_bg.png") !important; + .highlight { + margin-bottom: 0; + } .gist-syntax { border-bottom: 0 !important; background: none !important; - .gist-highlight{ + .gist-highlight { background: $base03 !important; - pre { - @extend .pre-code; - } + } + .highlight pre { + @extend .pre-code; + padding: 0; } } .gist-meta { @@ -107,12 +115,11 @@ p, li { } .pre-code { - @include selection(adjust-color($base03, $lightness: 23%, $saturation: -65%), $text-shadow: $base03 0 1px); font-family: $mono !important; overflow: scroll; overflow-y: hidden; display: block; - padding: .8em !important; + padding: .8em; overflow-x: auto; line-height: 1.45em; background: $base03 $noise-bg !important; @@ -187,7 +194,7 @@ p, li { } .highlight, .gist-highlight { - pre { background: none; @include border-radius(none); border: none; padding: 0; margin-bottom: 0; } + pre { background: none; @include border-radius(0px); border: none; padding: 0; margin-bottom: 0; } margin-bottom: 1.8em; background: $base03; overflow-y: hidden; @@ -206,7 +213,9 @@ pre, .highlight, .gist-highlight { &::-webkit-scrollbar-thumb:horizontal { background: $solar-scroll-thumb; -webkit-border-radius: 4px; border-radius: 4px } } -.highlight code { @extend .pre-code; background: #000;} +.highlight code { + @extend .pre-code; background: #000; +} figure.code { background: none; padding: 0; @@ -250,4 +259,3 @@ figure.code { text-shadow: #cbcccc 0 1px 0; padding-left: 3em; } - diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html index 9db07455..23f48844 100644 --- a/.themes/classic/source/_includes/article.html +++ b/.themes/classic/source/_includes/article.html @@ -8,7 +8,7 @@ {% unless page.meta == false %} <p class="meta"> {% include post/date.html %}{{ time }} - {% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %} + {% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %} | <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">Comments</a> {% endif %} </p> diff --git a/.themes/classic/source/_includes/asides/github.html b/.themes/classic/source/_includes/asides/github.html index 935ccff0..cb267f09 100644 --- a/.themes/classic/source/_includes/asides/github.html +++ b/.themes/classic/source/_includes/asides/github.html @@ -1,11 +1,11 @@ {% if site.github_user %} <section> - <h1>Github Repos</h1> + <h1>GitHub Repos</h1> <ul id="gh_repos"> <li class="loading">Status updating...</li> </ul> {% if site.github_show_profile_link %} - <a href="https://github.com/{{site.github_user}}">@{{site.github_user}}</a> on Github + <a href="https://github.com/{{site.github_user}}">@{{site.github_user}}</a> on GitHub {% endif %} <script type="text/javascript"> $.domReady(function(){ diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html index 0fdc4019..d7abd6fd 100644 --- a/.themes/classic/source/_includes/head.html +++ b/.themes/classic/source/_includes/head.html @@ -16,7 +16,7 @@ <meta name="MobileOptimized" content="320"> <meta name="viewport" content="width=device-width, initial-scale=1"> - {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} + {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %} <link rel="canonical" href="{{ canonical }}"> <link href="{{ root_url }}/favicon.png" rel="icon"> <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css"> diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html index d3c42e37..40911680 100644 --- a/.themes/classic/source/_layouts/post.html +++ b/.themes/classic/source/_layouts/post.html @@ -20,7 +20,7 @@ single: true <a class="basic-alignment left" href="{{page.previous.url}}" title="Previous Post: {{page.previous.title}}">« {{page.previous.title}}</a> {% endif %} {% if page.next.url %} - <a class="basic-alignment right" href="{{page.next.url}}" title="next Post: {{page.next.title}}">{{page.next.title}} »</a> + <a class="basic-alignment right" href="{{page.next.url}}" title="Next Post: {{page.next.title}}">{{page.next.title}} »</a> {% endif %} </p> </footer> diff --git a/.themes/classic/source/assets/jwplayer/glow/glow.xml b/.themes/classic/source/assets/jwplayer/glow/glow.xml index 7d5ba038..71bdced0 100644 --- a/.themes/classic/source/assets/jwplayer/glow/glow.xml +++ b/.themes/classic/source/assets/jwplayer/glow/glow.xml @@ -1,115 +1,115 @@ -<?xml version="1.0"?>
-<skin version="1.1" name="Glow" author="LongTail Video">
-
- <settings>
- <setting name="backcolor" value="0x000000" />
- <setting name="frontcolor" value="0xeeeeee" />
- <setting name="lightcolor" value="0xeeeeee" />
- <setting name="screencolor" value="0x000000" />
- </settings>
-
- <components>
- <component name="controlbar">
- <settings>
- <setting name="margin" value="0" />
- <setting name="fontsize" value="11" />
- <setting name="fontcolor" value="0xEEEEEE" />
- <setting name="buttoncolor" value="0xEEEEEE" />
- </settings>
-
- <layout>
- <group position="left">
- <button name="play" />
- <text name="elapsed" />
- </group>
- <group position="center">
- <slider name="time" />
- </group>
- <group position="right">
- <text name="duration" />
- <button name="blank" />
- <button name="mute" />
- <button name="fullscreen" />
- </group>
- </layout>
-
- <elements>
- <element name="background" src="background.png" />
- <element name="capLeft" src="divider.png" />
- <element name="capRight" src="divider.png" />
- <element name="divider" src="divider.png" />
- <element name="blankButton" src="blankButton.png" />
- <element name="fullscreenButton" src="fullscreenButton.png" />
- <element name="fullscreenButtonOver" src="fullscreenButtonOver.png" />
- <element name="muteButton" src="muteButton.png" />
- <element name="muteButtonOver" src="muteButtonOver.png" />
- <element name="pauseButton" src="pauseButton.png" />
- <element name="pauseButtonOver" src="pauseButtonOver.png" />
- <element name="playButton" src="playButton.png" />
- <element name="playButtonOver" src="playButtonOver.png" />
- <element name="timeSliderBuffer" src="timeSliderBuffer.png" />
- <element name="timeSliderCapLeft" src="timeSliderCapLeft.png" />
- <element name="timeSliderCapRight" src="timeSliderCapRight.png" />
- <element name="timeSliderProgress" src="timeSliderProgress.png" />
- <element name="timeSliderRail" src="timeSliderRail.png" />
- <element name="normalscreenButton" src="normalscreenButton.png" />
- <element name="normalscreenButtonOver" src="normalscreenButtonOver.png" />
- <element name="unmuteButton" src="unmuteButton.png" />
- <element name="unmuteButtonOver" src="unmuteButtonOver.png" />
- <element name="volumeSliderRail" src="divider.png" />
- <element name="volumeSliderProgress" src="divider.png" />
- </elements>
- </component>
-
- <component name="display">
- <settings>
- <setting name="bufferinterval" value="250" />
- <setting name="bufferrotation" value="90" />
- </settings>
- <elements>
- <element name="background" src="background.png" />
- <element name="playIcon" src="playIcon.png" />
- <element name="muteIcon" src="muteIcon.png" />
- <element name="errorIcon" src="bufferIcon.png" />
- <element name="bufferIcon" src="bufferIcon.png" />
- </elements>
- </component>
-
- <component name="dock">
- <settings>
- <setting name="fontcolor" value="0xFFFFFF" />
- </settings>
- <elements>
- <element name="button" src="button.png" />
- </elements>
- </component>
-
- <component name="playlist">
- <settings>
- <setting name="fontcolor" value="0xEEEEEE" />
- <setting name="overcolor" value="0xFFFFFF" />
- <setting name="activecolor" value="0xFFFFFF" />
- <setting name="backgroundcolor" value="0x333333" />
- </settings>
- <elements>
- <element name="item" src="item.png" />
- <element name="itemOver" src="itemOver.png" />
- <element name="sliderCapBottom" src="sliderCapBottom.png" />
- <element name="sliderCapTop" src="sliderCapTop.png" />
- <element name="sliderRail" src="sliderRail.png" />
- <element name="sliderThumb" src="sliderThumb.png" />
- </elements>
- </component>
-
- <component name="sharing">
- <elements>
- <element name="embedIcon" src="embedIcon.png" />
- <element name="embedScreen" src="embedScreen.png" />
- <element name="shareIcon" src="shareIcon.png" />
- <element name="shareScreen" src="shareScreen.png" />
- </elements>
- </component>
-
- </components>
-
+<?xml version="1.0"?> +<skin version="1.1" name="Glow" author="LongTail Video"> + + <settings> + <setting name="backcolor" value="0x000000" /> + <setting name="frontcolor" value="0xeeeeee" /> + <setting name="lightcolor" value="0xeeeeee" /> + <setting name="screencolor" value="0x000000" /> + </settings> + + <components> + <component name="controlbar"> + <settings> + <setting name="margin" value="0" /> + <setting name="fontsize" value="11" /> + <setting name="fontcolor" value="0xEEEEEE" /> + <setting name="buttoncolor" value="0xEEEEEE" /> + </settings> + + <layout> + <group position="left"> + <button name="play" /> + <text name="elapsed" /> + </group> + <group position="center"> + <slider name="time" /> + </group> + <group position="right"> + <text name="duration" /> + <button name="blank" /> + <button name="mute" /> + <button name="fullscreen" /> + </group> + </layout> + + <elements> + <element name="background" src="background.png" /> + <element name="capLeft" src="divider.png" /> + <element name="capRight" src="divider.png" /> + <element name="divider" src="divider.png" /> + <element name="blankButton" src="blankButton.png" /> + <element name="fullscreenButton" src="fullscreenButton.png" /> + <element name="fullscreenButtonOver" src="fullscreenButtonOver.png" /> + <element name="muteButton" src="muteButton.png" /> + <element name="muteButtonOver" src="muteButtonOver.png" /> + <element name="pauseButton" src="pauseButton.png" /> + <element name="pauseButtonOver" src="pauseButtonOver.png" /> + <element name="playButton" src="playButton.png" /> + <element name="playButtonOver" src="playButtonOver.png" /> + <element name="timeSliderBuffer" src="timeSliderBuffer.png" /> + <element name="timeSliderCapLeft" src="timeSliderCapLeft.png" /> + <element name="timeSliderCapRight" src="timeSliderCapRight.png" /> + <element name="timeSliderProgress" src="timeSliderProgress.png" /> + <element name="timeSliderRail" src="timeSliderRail.png" /> + <element name="normalscreenButton" src="normalscreenButton.png" /> + <element name="normalscreenButtonOver" src="normalscreenButtonOver.png" /> + <element name="unmuteButton" src="unmuteButton.png" /> + <element name="unmuteButtonOver" src="unmuteButtonOver.png" /> + <element name="volumeSliderRail" src="divider.png" /> + <element name="volumeSliderProgress" src="divider.png" /> + </elements> + </component> + + <component name="display"> + <settings> + <setting name="bufferinterval" value="250" /> + <setting name="bufferrotation" value="90" /> + </settings> + <elements> + <element name="background" src="background.png" /> + <element name="playIcon" src="playIcon.png" /> + <element name="muteIcon" src="muteIcon.png" /> + <element name="errorIcon" src="bufferIcon.png" /> + <element name="bufferIcon" src="bufferIcon.png" /> + </elements> + </component> + + <component name="dock"> + <settings> + <setting name="fontcolor" value="0xFFFFFF" /> + </settings> + <elements> + <element name="button" src="button.png" /> + </elements> + </component> + + <component name="playlist"> + <settings> + <setting name="fontcolor" value="0xEEEEEE" /> + <setting name="overcolor" value="0xFFFFFF" /> + <setting name="activecolor" value="0xFFFFFF" /> + <setting name="backgroundcolor" value="0x333333" /> + </settings> + <elements> + <element name="item" src="item.png" /> + <element name="itemOver" src="itemOver.png" /> + <element name="sliderCapBottom" src="sliderCapBottom.png" /> + <element name="sliderCapTop" src="sliderCapTop.png" /> + <element name="sliderRail" src="sliderRail.png" /> + <element name="sliderThumb" src="sliderThumb.png" /> + </elements> + </component> + + <component name="sharing"> + <elements> + <element name="embedIcon" src="embedIcon.png" /> + <element name="embedScreen" src="embedScreen.png" /> + <element name="shareIcon" src="shareIcon.png" /> + <element name="shareScreen" src="shareScreen.png" /> + </elements> + </component> + + </components> + </skin>
\ No newline at end of file diff --git a/.themes/classic/source/javascripts/github.js b/.themes/classic/source/javascripts/github.js index 678775a9..9e98b8c2 100644 --- a/.themes/classic/source/javascripts/github.js +++ b/.themes/classic/source/javascripts/github.js @@ -3,22 +3,22 @@ var github = (function(){ var i = 0, fragment = '', t = $(target)[0]; for(i = 0; i < repos.length; i++) { - fragment += '<li><a href="'+repos[i].url+'">'+repos[i].name+'</a><p>'+repos[i].description+'</p></li>'; + fragment += '<li><a href="'+repos[i].html_url+'">'+repos[i].name+'</a><p>'+(repos[i].description||'')+'</p></li>'; } t.innerHTML = fragment; } return { showRepos: function(options){ $.ajax({ - url: "http://github.com/api/v2/json/repos/show/"+options.user+"?callback=?" + url: "https://api.github.com/users/"+options.user+"/repos?callback=?" , type: 'jsonp' , error: function (err) { $(options.target + ' li.loading').addClass('error').text("Error loading feed"); } , success: function(data) { var repos = []; - if (!data || !data.repositories) { return; } - for (var i = 0; i < data.repositories.length; i++) { - if (options.skip_forks && data.repositories[i].fork) { continue; } - repos.push(data.repositories[i]); + if (!data || !data.data) { return; } + for (var i = 0; i < data.data.length; i++) { + if (options.skip_forks && data.data[i].fork) { continue; } + repos.push(data.data[i]); } repos.sort(function(a, b) { var aDate = new Date(a.pushed_at).valueOf(), diff --git a/.themes/classic/source/javascripts/pinboard.js b/.themes/classic/source/javascripts/pinboard.js index 52577e2c..a97df03d 100644 --- a/.themes/classic/source/javascripts/pinboard.js +++ b/.themes/classic/source/javascripts/pinboard.js @@ -44,7 +44,7 @@ function Pinboard_Linkroll() { if (it.t.length > 0) { for (var i = 0; i < it.t.length; i++) { var tag = it.t[i]; - str += " <a class=\"pin-tag\" href=\"http://pinboard.in/u:"+ this.cook(it.a) + "/t:" + this.cook(tag) + "\">" + this.cook(tag).replace(/^\s+|\s+$/g, '') + "</a> "; + str += " <a class=\"pin-tag\" href=\"https://pinboard.in/u:"+ this.cook(it.a) + "/t:" + this.cook(tag) + "\">" + this.cook(tag).replace(/^\s+|\s+$/g, '') + "</a> "; } } str += "</p></li>\n"; @@ -52,5 +52,5 @@ function Pinboard_Linkroll() { } } Pinboard_Linkroll.prototype = new Pinboard_Linkroll(); -pinboardNS_fetch_script("http://feeds.pinboard.in/json/v1/u:"+pinboard_user+"/?cb=pinboardNS_show_bmarks\&count="+pinboard_count); +pinboardNS_fetch_script("https://feeds.pinboard.in/json/v1/u:"+pinboard_user+"/?cb=pinboardNS_show_bmarks\&count="+pinboard_count); diff --git a/.themes/classic/source/javascripts/twitter.js b/.themes/classic/source/javascripts/twitter.js index c9b7519d..3e2dd0d7 100644 --- a/.themes/classic/source/javascripts/twitter.js +++ b/.themes/classic/source/javascripts/twitter.js @@ -42,8 +42,8 @@ function prettyDate(time) { function linkifyTweet(text, url) { // Linkify urls, usernames, hashtags text = text.replace(/(https?:\/\/)([\w\-:;?&=+.%#\/]+)/gi, '<a href="$1$2">$2</a>') - .replace(/(^|\W)@(\w+)/g, '$1<a href="http://twitter.com/$2">@$2</a>') - .replace(/(^|\W)#(\w+)/g, '$1<a href="http://search.twitter.com/search?q=%23$2">#$2</a>'); + .replace(/(^|\W)@(\w+)/g, '$1<a href="https://twitter.com/$2">@$2</a>') + .replace(/(^|\W)#(\w+)/g, '$1<a href="https://search.twitter.com/search?q=%23$2">#$2</a>'); // Use twitter's api to replace t.co shortened urls with expanded ones. for (var u in url) { @@ -62,7 +62,7 @@ function showTwitterFeed(tweets, twitter_user) { content = ''; for (var t in tweets) { - content += '<li>'+'<p>'+'<a href="http://twitter.com/'+twitter_user+'/status/'+tweets[t].id_str+'">'+prettyDate(tweets[t].created_at)+'</a>'+linkifyTweet(tweets[t].text.replace(/\n/g, '<br>'), tweets[t].entities.urls)+'</p>'+'</li>'; + content += '<li>'+'<p>'+'<a href="https://twitter.com/'+twitter_user+'/status/'+tweets[t].id_str+'">'+prettyDate(tweets[t].created_at)+'</a>'+linkifyTweet(tweets[t].text.replace(/\n/g, '<br>'), tweets[t].entities.urls)+'</p>'+'</li>'; } timeline.innerHTML = content; } @@ -70,7 +70,7 @@ function showTwitterFeed(tweets, twitter_user) { function getTwitterFeed(user, count, replies) { count = parseInt(count, 10); $.ajax({ - url: "http://api.twitter.com/1/statuses/user_timeline/" + user + ".json?trim_user=true&count=" + (count + 20) + "&include_entities=1&exclude_replies=" + (replies ? "0" : "1") + "&callback=?" + url: "https://api.twitter.com/1/statuses/user_timeline/" + user + ".json?trim_user=true&count=" + (count + 20) + "&include_entities=1&exclude_replies=" + (replies ? "0" : "1") + "&callback=?" , type: 'jsonp' , error: function (err) { $('#tweets li.loading').addClass('error').text("Twitter's busted"); } , success: function(data) { showTwitterFeed(data.slice(0, count), user); } |