moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2024-12-24 08:28:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into site

Browse Source
This commit is contained in:
Brandon Mathis 2011-07-29 09:12:02 -04:00
commit 400c8d2700
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.themes/classic/source/_includes/head.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<!--[if IEMobile 7 ]><html class="no-js iem7" manifest="default.appcache?v=1"><![endif]-->
<!--[if IEMobile 7 ]><html class="no-js iem7"><![endif]-->
<!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]-->
<!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
<head>
@ -19,6 +19,7 @@
<meta name="keywords" content="{{page.keywords}}"/>
{% endif %}
<link rel="canonical" href="{{ site.url }}{{ page.url }}"/>
<link href="{{ root_url }}/favicon.png" rel="shortcut icon" />
<link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
@ -26,7 +27,8 @@
<script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
<link href='http://fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
<link href="{{ root_url }}/atom.xml" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
{% capture rss_url %}{% if site.subscribe_rss contains ':' %}{{ site.subscribe_rss }}{% else %}{{ root_url }}{{ site.subscribe_rss }}{% endif %}{% endcapture %}
<link href="{{ rss_url }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
{% include google_analytics.html %}
{% include google_plus_one.html %}
{% include twitter_sharing.html %}

1
Rakefile
View File

@ -151,6 +151,7 @@ task :update_source, :theme do |t, args|
system "mkdir -p #{source_dir}; cp -R #{themes_dir}/"+theme+"/source/. #{source_dir}"
system "cp -Rn #{source_dir}.old/. #{source_dir}"
system "cp -f #{source_dir}.old/_includes/navigation.html #{source_dir}/_includes/navigation.html"
system "cp -f #{source_dir}.old/_includes/footer.html #{source_dir}/_includes/footer.html"
puts "## Updated #{source_dir} ##"
end

2
_config.yml
View File

@ -21,7 +21,7 @@ email: brandon@imathis.com
# If publishing to a subdirectory as in http://site.com/project set 'root: /project'
root: /
port: 4000
permalink: /blog/:year/:month/:day/:title
permalink: /blog/:year/:month/:day/:title/
source: source
destination: public
plugins: plugins