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 
Conflicts:
	_config.yml
This commit is contained in:
Brandon Mathis 2011-12-19 10:39:51 -06:00
commit 479d36332c
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.themes/classic/sass/base/_theme.scss
View File

@ -1,4 +1,4 @@
$noise-bg: image-url('noise.png') top left;
$noise-bg: image-url('noise.png') top left !default;
$img-border: inline-image('dotted-border.png');
// Main Link Colors
@ -41,7 +41,7 @@ $sidebar-link-color-hover: $link-color-hover !default;
$sidebar-link-color-active: $link-color-active !default;
$sidebar-color: change-color(mix($text-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default;
$sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default;
$sidebar-border: 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-hover: $sidebar-link-color-hover !default;
$twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default;

2
.themes/classic/source/_includes/navigation.html
View File

@ -4,10 +4,12 @@
<li><a href="{{ site.subscribe_email }}" rel="subscribe-email" title="subscribe via email">Email</a></li>
{% endif %}
</ul>
{% if site.simple_search %}
<form action="{{ site.simple_search }}" method="get">
<fieldset role="search">
<input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}" />
<input class="search" type="text" name="q" results="0" placeholder="Search"/>
</fieldset>
</form>
{% endif %}
{% include custom/navigation.html %}

8
Rakefile
View File

@ -295,8 +295,12 @@ task :set_root_dir, :dir do |t, args|
end
desc "Set up _deploy folder and deploy branch for Github Pages deployment"
task :setup_github_pages do
repo_url = get_stdin("Enter the read/write url for your repository: ")
task :setup_github_pages, :repo do |t, args|
if args.repo
repo_url = args.repo
else
repo_url = get_stdin("Enter the read/write url for your repository: ")
end
user = repo_url.match(/:([^\/]+)/)[1]
branch = (repo_url.match(/\/[\w-]+.github.com/).nil?) ? 'gh-pages' : 'master'
project = (branch == 'gh-pages') ? repo_url.match(/\/([^\.]+)/)[1] : ''

1
_config.yml
View File

@ -7,7 +7,6 @@ title: Octopress
subtitle: A blogging framework for hackers.
author: Brandon Mathis
simple_search: http://google.com/search
# Add a default site-wide description
description:
# Default date format is "ordinal" (resulting in "July 22nd 2007")