aboutsummaryrefslogtreecommitdiff
path: root/.themes
diff options
context:
space:
mode:
Diffstat (limited to '.themes')
-rw-r--r--.themes/classic/sass/base/_layout.scss11
-rw-r--r--.themes/classic/sass/base/_utilities.scss7
-rw-r--r--.themes/classic/sass/partials/_blog.scss16
-rw-r--r--.themes/classic/sass/partials/_syntax.scss2
-rw-r--r--.themes/classic/sass/partials/sidebar/_base.scss5
-rw-r--r--.themes/classic/source/_includes/archive_post.html2
-rw-r--r--.themes/classic/source/_includes/article.html2
-rw-r--r--.themes/classic/source/_includes/asides/github.html30
-rw-r--r--.themes/classic/source/_includes/head.html5
-rw-r--r--.themes/classic/source/_includes/post/date.html8
-rw-r--r--.themes/classic/source/_includes/post/sharing.html2
-rw-r--r--.themes/classic/source/_layouts/default.html5
-rw-r--r--.themes/classic/source/_layouts/page.html4
-rw-r--r--.themes/classic/source/_layouts/post.html2
-rw-r--r--.themes/classic/source/javascripts/github.js43
-rw-r--r--.themes/classic/source/javascripts/twitter.js4
16 files changed, 117 insertions, 31 deletions
diff --git a/.themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss
index ef47279a..4a3c780f 100644
--- a/.themes/classic/sass/base/_layout.scss
+++ b/.themes/classic/sass/base/_layout.scss
@@ -75,6 +75,15 @@ aside[role=sidebar] {
@extend .group;
}
+.flex-content { max-width: 100%; height: auto; }
+
+.basic-alignment {
+ &.left { float: left; margin-right: 1.5em; }
+ &.right { float: right; margin-left: 1.5em; }
+ &.center { display:block; margin: 0 auto 1.5em; }
+ &.left, &.right { margin-bottom: .8em; }
+}
+
.toggle-sidebar { &, .no-sidebar & { display: none; }}
body.sidebar-footer {
@@ -103,7 +112,7 @@ body.sidebar-footer {
@extend .group;
margin-right: $sidebar-width-medium;
position: relative;
- .no-sidebar & { margin-right: 0; }
+ .no-sidebar & { margin-right: 0; border-right: 0; }
.collapse-sidebar & { margin-right: 20px; }
> div, > article {
padding-top: $pad-medium/2;
diff --git a/.themes/classic/sass/base/_utilities.scss b/.themes/classic/sass/base/_utilities.scss
index 8b718cdc..2d49e659 100644
--- a/.themes/classic/sass/base/_utilities.scss
+++ b/.themes/classic/sass/base/_utilities.scss
@@ -5,6 +5,13 @@
height: image-height($img);
}
+@mixin shadow-box($border: #fff .5em solid, $shadow: rgba(#000, .15) 0 1px 4px, $border-radius: .3em) {
+ @include border-radius($border-radius);
+ @include box-shadow($shadow);
+ @include box-sizing(border-box);
+ border: $border;
+}
+
@mixin selection($bg, $color: inherit, $text-shadow: none){
* {
&::-moz-selection { background: $bg; color: $color; text-shadow: $text-shadow; }
diff --git a/.themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss
index 3416347b..558f0a22 100644
--- a/.themes/classic/sass/partials/_blog.scss
+++ b/.themes/classic/sass/partials/_blog.scss
@@ -44,19 +44,9 @@ article {
line-height: 1.3em;
}
img, video, .flash-video {
- max-width: 100%;
- height: auto;
- border: .5em solid #fff;
- @include border-radius(.3em);
- @include box-shadow(rgba(#000, .15) 0 1px 4px);
- @include box-sizing(border-box);
- display: block;
- }
- img {
- &.left { float: left; margin-right: 1.5em; }
- &.right { float: right; margin-left: 1.5em; }
- &.center { margin: 0 auto 1.5em; }
- &.left, &.right { margin-bottom: .8em; }
+ @extend .flex-content;
+ @extend .basic-alignment;
+ @include shadow-box;
}
video, .flash-video { margin: 0 auto 1.5em; }
video { display: block; width: 100%; }
diff --git a/.themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss
index 7e8ed8d5..25e8d329 100644
--- a/.themes/classic/sass/partials/_syntax.scss
+++ b/.themes/classic/sass/partials/_syntax.scss
@@ -177,7 +177,7 @@ li code {
.s1 { color: $solar-cyan !important; } /* Literal.String.Single */
//.ss { color: #990073 } /* Literal.String.Symbol */
//.il { color: #009999 } /* Literal.Number.Integer.Long */
- div { .gd, .gd .x, .gi, .gi .x { display: block; }}
+ div { .gd, .gd .x, .gi, .gi .x { display: inline-block; width: 100%; }}
}
.highlight, .gist-highlight {
diff --git a/.themes/classic/sass/partials/sidebar/_base.scss b/.themes/classic/sass/partials/sidebar/_base.scss
index 08f04d23..a0d1c09e 100644
--- a/.themes/classic/sass/partials/sidebar/_base.scss
+++ b/.themes/classic/sass/partials/sidebar/_base.scss
@@ -20,6 +20,11 @@ aside[role=sidebar] {
}
}
}
+ img {
+ @extend .flex-content;
+ @extend .basic-alignment;
+ @include shadow-box($border: #fff .3em solid);
+ }
ul {
margin-bottom: 0.5em;
margin-left: 0;
diff --git a/.themes/classic/source/_includes/archive_post.html b/.themes/classic/source/_includes/archive_post.html
index b667b88b..fef3328e 100644
--- a/.themes/classic/source/_includes/archive_post.html
+++ b/.themes/classic/source/_includes/archive_post.html
@@ -1,6 +1,6 @@
{% capture category %}{{ post.categories | size }}{% endcapture %}
<h1><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1>
-<time datetime="{{ post.date | datetime }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time>
+<time datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time>
{% if category != '0' %}
<footer>
<span class="categories">posted in {{ post.categories | category_links }}</span>
diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index b561fbc7..5cd6fda1 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -6,7 +6,7 @@
<h1 class="entry-title">{{ page.title | titlecase }}</h1>
{% endif %}
{% unless page.meta == false %}
- <p class="meta">{% include post/date.html %}</p>
+ <p class="meta">{% include post/date.html %}{{ time }}</p>
{% endunless %}
</header>
{% endunless %}
diff --git a/.themes/classic/source/_includes/asides/github.html b/.themes/classic/source/_includes/asides/github.html
new file mode 100644
index 00000000..935ccff0
--- /dev/null
+++ b/.themes/classic/source/_includes/asides/github.html
@@ -0,0 +1,30 @@
+{% if site.github_user %}
+<section>
+ <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
+ {% endif %}
+ <script type="text/javascript">
+ $.domReady(function(){
+ if (!window.jXHR){
+ var jxhr = document.createElement('script');
+ jxhr.type = 'text/javascript';
+ jxhr.src = '{{ root_url}}/javascripts/libs/jXHR.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(jxhr, s);
+ }
+
+ github.showRepos({
+ user: '{{site.github_user}}',
+ count: {{site.github_repo_count}},
+ skip_forks: {{site.github_skip_forks}},
+ target: '#gh_repos'
+ });
+ });
+ </script>
+ <script src="{{ root_url }}/javascripts/github.js" type="text/javascript"> </script>
+</section>
+{% endif %}
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index d6a6735b..d1741120 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -4,7 +4,7 @@
<!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
<head>
<meta charset="utf-8">
- <title>{{site.title}}{% if page.title %}: {{page.title}}{% endif %}</title>
+ <title>{% if page.title %}{{page.title}} - {% endif %}{{site.title}}</title>
<meta name="author" content="{{site.author}}">
{% if page.description %}
<meta name="description" content="{{page.description}}"/>
@@ -26,8 +26,5 @@
<script src="http://s3.amazonaws.com/ender-js/jeesh.min.js"></script>
<script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
<link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
- {% include google_analytics.html %}
- {% include google_plus_one.html %}
- {% include twitter_sharing.html %}
{% include custom/head.html %}
</head>
diff --git a/.themes/classic/source/_includes/post/date.html b/.themes/classic/source/_includes/post/date.html
index f1ed4815..dbfa67ae 100644
--- a/.themes/classic/source/_includes/post/date.html
+++ b/.themes/classic/source/_includes/post/date.html
@@ -2,9 +2,11 @@
{% capture has_date %}{{ date | size }}{% endcapture %}
{% capture updated %}{{ page.updated }}{{ post.updated }}{% endcapture %}
{% capture was_updated %}{{ updated | size }}{% endcapture %}
+
{% if has_date != '0' %}
-<time datetime="{{ date | datetime }}" pubdate {% if updated %} updated {% endif %}>{{ date | ordinalize }}</time>
+ {% capture time %}<time datetime="{{ date | datetime | date_to_xmlschema }}" pubdate {% if updated %} data-updated="true" {% endif %}>{{ date | ordinalize }}</time>{% endcapture %}
{% endif %}
+
{% if was_updated != '0' %}
-<time class="updated" datetime="{{ updated | datetime }}"></time>
-{% endif %}
+ {% capture updated %}<time class="updated" datetime="{{ updated | datetime | date_to_xmlschema }}">Updated {{ updated | ordinalize }}</time>{% endcapture %}
+{% else %}{% assign updated = false %}{% endif %}
diff --git a/.themes/classic/source/_includes/post/sharing.html b/.themes/classic/source/_includes/post/sharing.html
index 7b074af5..f0f9b9db 100644
--- a/.themes/classic/source/_includes/post/sharing.html
+++ b/.themes/classic/source/_includes/post/sharing.html
@@ -3,6 +3,6 @@
<a href="http://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-via="{{ site.twitter_user }}" data-counturl="{{ site.url }}{{ page.url }}" >Tweet</a>
{% endif %}
{% if site.google_plus_one %}
- <g:plusone size="{{ site.google_plus_one_size }}"></g:plusone>
+ <div class="g-plusone" data-size="{{ site.google_plus_one_size }}"></div>
{% endif %}
</div>
diff --git a/.themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html
index 57147575..629468d3 100644
--- a/.themes/classic/source/_layouts/default.html
+++ b/.themes/classic/source/_layouts/default.html
@@ -5,9 +5,12 @@
<nav role=navigation>{% include navigation.html %}</nav>
<div id="main">
<div id="content">
- {{ content | expand_urls: root_url | backtick_codeblock | smart_quotes }}
+ {{ content | expand_urls: root_url }}
</div>
</div>
<footer>{% include footer.html %}</footer>
+ {% include google_analytics.html %}
+ {% include google_plus_one.html %}
+ {% include twitter_sharing.html %}
</body>
</html>
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index 08e056ec..dbf209c4 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -7,7 +7,7 @@ layout: default
{% if page.title %}
<header>
<h1 class="entry-title">{{ page.title | titlecase }}</h1>
- {% if page.date %}<p class="meta">{% include post/date.html %}</p>{% endif %}
+ {% if page.date %}<p class="meta">{% include post/date.html %}{{ time }}</p>{% endif %}
</header>
{% endif %}
{{ content }}
@@ -15,7 +15,7 @@ layout: default
<footer>
{% if page.date or page.author %}<p class="meta">
{% if page.author %}{% include post/author.html %}{% endif %}
- {% include post/date.html %}
+ {% include post/date.html %}{% if updated %}{{ updated }}{% else %}{{ time }}{% endif %}
{% if page.categories %}{% include post/categories.html %}{% endif %}
</p>{% endif %}
{% unless page.sharing == false %}
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html
index 78557c04..ce8a5dea 100644
--- a/.themes/classic/source/_layouts/post.html
+++ b/.themes/classic/source/_layouts/post.html
@@ -9,7 +9,7 @@ single: true
<footer>
<p class="meta">
{% include post/author.html %}
- {% include post/date.html %}
+ {% include post/date.html %}{% if updated %}{{ updated }}{% else %}{{ time }}{% endif %}
{% include post/categories.html %}
</p>
{% unless page.sharing == false %}
diff --git a/.themes/classic/source/javascripts/github.js b/.themes/classic/source/javascripts/github.js
new file mode 100644
index 00000000..623d493f
--- /dev/null
+++ b/.themes/classic/source/javascripts/github.js
@@ -0,0 +1,43 @@
+github = (function(){
+ function render(target, repos){
+ 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>';
+
+ t.innerHTML = fragment;
+ }
+ return {
+ showRepos: function(options){
+ var feed = new jXHR();
+ feed.onerror = function (msg,url) {
+ $(options.target + ' li.loading').addClass('error').text("Error loading feed");
+ }
+ feed.onreadystatechange = function(data){
+ if (feed.readyState === 4) {
+ var repos = [];
+ var i;
+ for (i = 0; i < data.repositories.length; i++){
+ if (options.skip_forks && data.repositories[i].fork)
+ continue;
+ repos.push(data.repositories[i]);
+ }
+ repos.sort(function(a, b){
+ var a = new Date(a.pushed_at),
+ b = new Date(b.pushed_at);
+
+ if (a.valueOf() == b.valueOf()) return 0;
+ return a.valueOf() > b.valueOf() ? -1 : 1;
+ });
+
+ if (options.count)
+ repos.splice(options.count);
+
+ render(options.target, repos)
+ }
+ };
+ feed.open("GET","http://github.com/api/v2/json/repos/show/"+options.user+"?callback=?");
+ feed.send();
+ }
+ };
+})(); \ No newline at end of file
diff --git a/.themes/classic/source/javascripts/twitter.js b/.themes/classic/source/javascripts/twitter.js
index 1f1b2f91..a4e85557 100644
--- a/.themes/classic/source/javascripts/twitter.js
+++ b/.themes/classic/source/javascripts/twitter.js
@@ -68,7 +68,7 @@ function prettyDate(time) {
var diff = ((current_date_full - date.getTime()) / 1000);
var day_diff = Math.floor(diff / 86400);
- if (isNaN(day_diff) || day_diff < 0 || day_diff >= 31) return;
+ if (isNaN(day_diff) || day_diff < 0) return "<span>&infin;</span>";
return day_diff == 0 && (
diff < 60 && say.just_now ||
@@ -78,5 +78,5 @@ function prettyDate(time) {
diff < 86400 && Math.floor(diff / 3600) + say.hours_ago) ||
day_diff == 1 && say.yesterday ||
day_diff < 7 && day_diff + say.days_ago ||
- day_diff < 31 && Math.ceil(day_diff / 7) + say.weeks_ago;
+ day_diff > 7 && Math.ceil(day_diff / 7) + say.weeks_ago;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 20:43:25 +0000