Browse Source

Removed Twitter and Ender.js. Added jQuery and updated Modernizr

unreleased_contents
Brandon Mathis 12 years ago
parent
commit
98013543d9
  1. 1
      .themes/classic/sass/base/_theme.scss
  2. 5
      .themes/classic/sass/base/_typography.scss
  3. 1
      .themes/classic/sass/partials/_sidebar.scss
  4. 34
      .themes/classic/sass/partials/sidebar/_twitter.scss
  5. 2
      .themes/classic/source/_includes/asides/github.html
  6. 19
      .themes/classic/source/_includes/asides/twitter.html
  7. 7
      .themes/classic/source/_includes/head.html
  8. 45
      .themes/classic/source/javascripts/ender.js
  9. 3256
      .themes/classic/source/javascripts/libs/ender.js
  10. 5
      .themes/classic/source/javascripts/libs/jquery.min.js
  11. 8
      .themes/classic/source/javascripts/modernizr-2.0.js
  12. 7
      .themes/classic/source/javascripts/octopress.js
  13. 2
      README.markdown

1
.themes/classic/sass/base/_theme.scss

@ -44,7 +44,6 @@ $sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default;
$sidebar-border-hover: darken($sidebar-bg, 7) !default; $sidebar-border-hover: darken($sidebar-bg, 7) !default;
$sidebar-link-color-subdued: lighten($sidebar-color, 20) !default; $sidebar-link-color-subdued: lighten($sidebar-color, 20) !default;
$sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default; $sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default;
$twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default;
$footer-color: #888 !default; $footer-color: #888 !default;
$footer-bg: #ccc !default; $footer-bg: #ccc !default;

5
.themes/classic/sass/base/_typography.scss

@ -62,7 +62,8 @@ h5, section h4, section section h3 {
h6, section h5, section section h4, section section section h3 { h6, section h5, section section h4, section section section h3 {
font-size: .8em; font-size: .8em;
} }
p, blockquote, ul, ol { margin-bottom: 1.5em; }
p, article blockquote, ul, ol { margin-bottom: 1.5em; }
ul { list-style-type: disc; ul { list-style-type: disc;
ul { list-style-type: circle; margin-bottom: 0px; ul { list-style-type: circle; margin-bottom: 0px;
@ -106,7 +107,7 @@ small { font-size: .8em; }
big { font-size: 1.2em; } big { font-size: 1.2em; }
blockquote { article blockquote {
$bq-margin: 1.2em; $bq-margin: 1.2em;
font-style: italic; font-style: italic;
position: relative; position: relative;

1
.themes/classic/sass/partials/_sidebar.scss

@ -1,5 +1,4 @@
@import "sidebar/base"; @import "sidebar/base";
@import "sidebar/twitter";
@import "sidebar/googleplus"; @import "sidebar/googleplus";
@import "sidebar/pinboard"; @import "sidebar/pinboard";
@import "sidebar/delicious"; @import "sidebar/delicious";

34
.themes/classic/sass/partials/sidebar/_twitter.scss

@ -1,34 +0,0 @@
#tweets {
.loading {
background: inline-image('bird_32_gray.png') no-repeat center .5em;
color: darken($sidebar-bg, 18);
text-shadow: $main-bg 0 1px;
text-align: center;
padding: 2.5em 0 .5em;
&.error {
background: inline-image('bird_32_gray_fail.png') no-repeat center .5em;
}
}
p {
position: relative;
padding-right: 1em;
}
a[href*=status]:first-child {
color: $twitter-status-link;
float: right;
padding: 0 0 .1em 1em;
position: relative; right: -1.3em;
text-shadow: #fff 0 1px;
font-size: .7em;
span { font-size: 1.5em; }
text-decoration: none;
&:hover {
color: $sidebar-link-color-subdued-hover;
text-decoration: none;
}
}
a[href*='twitter.com/search']{
@extend .aside-alt-link;
@include hover-link;
}
}

2
.themes/classic/source/_includes/asides/github.html

@ -8,7 +8,7 @@
<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 %} {% endif %}
<script type="text/javascript"> <script type="text/javascript">
$.domReady(function(){ $(document).ready(function(){
if (!window.jXHR){ if (!window.jXHR){
var jxhr = document.createElement('script'); var jxhr = document.createElement('script');
jxhr.type = 'text/javascript'; jxhr.type = 'text/javascript';

19
.themes/classic/source/_includes/asides/twitter.html

@ -1,19 +0,0 @@
{% if site.twitter_user %}
<section>
<h1>Latest Tweets</h1>
<ul id="tweets">
<li class="loading">Status updating...</li>
</ul>
<script type="text/javascript">
$.domReady(function(){
getTwitterFeed("{{site.twitter_user}}", {{site.twitter_tweet_count}}, {{site.twitter_show_replies}});
});
</script>
<script src="{{ root_url }}/javascripts/twitter.js" type="text/javascript"> </script>
{% if site.twitter_follow_button %}
<a href="http://twitter.com/{{ site.twitter_user }}" class="twitter-follow-button" data-show-count="{{ site.twitter_show_follower_count }}">Follow @{{ site.twitter_user }}</a>
{% else %}
<p>Follow <a href="http://twitter.com/{{site.twitter_user}}">@{{ site.twitter_user }}</a></p>
{% endif %}
</section>
{% endif %}

7
.themes/classic/source/_includes/head.html

@ -16,14 +16,15 @@
<meta name="MobileOptimized" content="320"> <meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{% if page.url contains site.category_dir %}/{% endif %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %} {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
<link rel="canonical" href="{{ canonical }}"> <link rel="canonical" href="{{ canonical }}">
<link href="{{ root_url }}/favicon.png" rel="icon"> <link href="{{ root_url }}/favicon.png" rel="icon">
<link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css"> <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
<link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"> <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
{% include custom/head.html %}
<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script> <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
<script src="{{ root_url }}/javascripts/ender.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script>!window.jQuery && document.write(unescape('%3Cscript src="./javascripts/lib/jquery.min.js"%3E%3C/script%3E'))</script>
<script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script> <script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
{% include custom/head.html %}
{% include google_analytics.html %} {% include google_analytics.html %}
</head> </head>

45
.themes/classic/source/javascripts/ender.js

File diff suppressed because one or more lines are too long

3256
.themes/classic/source/javascripts/libs/ender.js

File diff suppressed because it is too large

5
.themes/classic/source/javascripts/libs/jquery.min.js

File diff suppressed because one or more lines are too long

8
.themes/classic/source/javascripts/modernizr-2.0.js

File diff suppressed because one or more lines are too long

7
.themes/classic/source/javascripts/octopress.js

@ -41,7 +41,7 @@ function addSidebarToggler() {
function testFeatures() { function testFeatures() {
var features = ['maskImage']; var features = ['maskImage'];
$(features).map(function(feature) { $(features).map(function(i, feature) {
if (Modernizr.testAllProps(feature)) { if (Modernizr.testAllProps(feature)) {
$('html').addClass(feature); $('html').addClass(feature);
} else { } else {
@ -77,7 +77,7 @@ function flashVideoFallback(){
$('video').each(function(video){ $('video').each(function(video){
video = $(video); video = $(video);
if (!Modernizr.video.h264 && swfobject.getFlashPlayerVersion() || window.location.hash.indexOf("flash-test") !== -1){ if (!Modernizr.video.h264 && swfobject.getFlashPlayerVersion() || window.location.hash.indexOf("flash-test") !== -1){
video.children('source[src$=mp4]').first().map(function(source){ video.children('source[src$=mp4]').first().map(function(i, source){
var src = $(source).attr('src'), var src = $(source).attr('src'),
id = 'video_'+Math.round(1 + Math.random()*(100000)), id = 'video_'+Math.round(1 + Math.random()*(100000)),
width = video.attr('width'), width = video.attr('width'),
@ -117,7 +117,7 @@ function renderDeliciousLinks(items) {
$('#delicious').html(output); $('#delicious').html(output);
} }
$.domReady(function() { $('document').ready(function() {
testFeatures(); testFeatures();
wrapFlashVideos(); wrapFlashVideos();
flashVideoFallback(); flashVideoFallback();
@ -160,3 +160,4 @@ b=j.userAgent.toLowerCase(),d=j.platform.toLowerCase(),g=d?/win/.test(d):/win/.t
a&&b&&d&&i&&k){d+="";i+="";var p={};if(f&&typeof f===o)for(var m in f)p[m]=f[m];p.data=a;p.width=d;p.height=i;a={};if(c&&typeof c===o)for(var n in c)a[n]=c[n];if(e&&typeof e===o)for(var r in e)typeof a.flashvars!=l?a.flashvars+="&"+r+"="+e[r]:a.flashvars=r+"="+e[r];if(t(k))b=s(p,a,b),j.success=!0,j.ref=b}h&&h(j)},ua:g,getFlashPlayerVersion:function(){return{major:g.pv[0],minor:g.pv[1],release:g.pv[2]}},hasFlashPlayerVersion:t,createSWF:function(a,b,d){if(g.w3)return s(a,b,d)},getQueryParamValue:function(a){var b= a&&b&&d&&i&&k){d+="";i+="";var p={};if(f&&typeof f===o)for(var m in f)p[m]=f[m];p.data=a;p.width=d;p.height=i;a={};if(c&&typeof c===o)for(var n in c)a[n]=c[n];if(e&&typeof e===o)for(var r in e)typeof a.flashvars!=l?a.flashvars+="&"+r+"="+e[r]:a.flashvars=r+"="+e[r];if(t(k))b=s(p,a,b),j.success=!0,j.ref=b}h&&h(j)},ua:g,getFlashPlayerVersion:function(){return{major:g.pv[0],minor:g.pv[1],release:g.pv[2]}},hasFlashPlayerVersion:t,createSWF:function(a,b,d){if(g.w3)return s(a,b,d)},getQueryParamValue:function(a){var b=
i.location.search||i.location.hash;if(b){/\?/.test(b)&&(b=b.split("?")[1]);if(a==null)return u(b);for(var b=b.split("&"),d=0;d<b.length;d++)if(b[d].substring(0,b[d].indexOf("="))==a)return u(b[d].substring(b[d].indexOf("=")+1))}return""}}}(); i.location.search||i.location.hash;if(b){/\?/.test(b)&&(b=b.split("?")[1]);if(a==null)return u(b);for(var b=b.split("&"),d=0;d<b.length;d++)if(b[d].substring(0,b[d].indexOf("="))==a)return u(b[d].substring(b[d].indexOf("=")+1))}return""}}}();

2
README.markdown

@ -4,7 +4,7 @@ Octopress is [Jekyll](https://github.com/mojombo/jekyll) blogging at its finest.
1. **Octopress sports a clean responsive theme** written in semantic HTML5, focused on readability and friendliness toward mobile devices. 1. **Octopress sports a clean responsive theme** written in semantic HTML5, focused on readability and friendliness toward mobile devices.
2. **Code blogging is easy and beautiful.** Embed code (with [Solarized](http://ethanschoonover.com/solarized) styling) in your posts from gists, jsFiddle or from your filesystem. 2. **Code blogging is easy and beautiful.** Embed code (with [Solarized](http://ethanschoonover.com/solarized) styling) in your posts from gists, jsFiddle or from your filesystem.
3. **Third party integration is simple** with built-in support for Twitter, Pinboard, Delicious, GitHub Repositories, Disqus Comments and Google Analytics. 3. **Third party integration is simple** with built-in support for Pinboard, Delicious, GitHub Repositories, Disqus Comments and Google Analytics.
4. **It's easy to use.** A collection of rake tasks simplifies development and makes deploying a cinch. 4. **It's easy to use.** A collection of rake tasks simplifies development and makes deploying a cinch.
5. **Ships with great plug-ins** some original and others from the Jekyll community &mdash; tested and improved. 5. **Ships with great plug-ins** some original and others from the Jekyll community &mdash; tested and improved.

Loading…
Cancel
Save