Yu Inao / 稲尾遊 japboy

HOWTO: Using FileMerge (opendiff) with Git on OSX

FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.

The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.

OOCSS vs OOSass

note that this requires Sass 3.2 alpha or higher

OOCSS is awesome because it helps us organize our style sheets in clean and simple ways but it can be far too rigid for the new responsive web. How can we use preprocessors to preserve both flexibility and cleanliness of code? Can these objects be abstracted to our preprocessors?

Lets first take a look at three column widths in OOCSS to see how they compare.

CSS

This re-styles your sublime text 2 sidebar to be darker, so it doesn't blind you when using a dark theme.

Save the Default.sublime-theme file into packages/Theme - Default, make a backup of your original if you want to be able to go back easily.

Deploy your site with git

This gist assumes:

you have a local git repo
with an online remote repository (github / bitbucket etc)
and a cloud server (Rackspace cloud / Amazon EC2 etc)
- your (PHP) scripts are served from /var/www/html/
- your webpages are executed by apache
apache's home directory is /var/www/

Google Speech To Text API

Base URL: https://www.google.com/speech-api/v1/recognize
It accepts POST requests with voice file encoded in FLAC format, and query parameters for control.

Query Parameters

client
The client's name you're connecting from. For spoofing purposes, let's use chromium

lang
Speech language, for example, ar-QA for Qatari Arabic, or en-US for U.S. English

	#!/bin/bash

	# Unload the keyboard so I can use my external keyboard
	# and not worry about accidentally pressing buttons on
	# the built-in. This may not be a problem for you but, you
	# should see my desk sometimes (Oh no!!) ;-)

	sudo kextunload /System/Library/Extensions/AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyboard.kext/

	<!-- Add the following lines to theme's html code right before </head> -->
	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
	<script type="text/javascript" src="http://static.tumblr.com/hkw90bf/Goylylph8/writecapture.js"></script>
	<script type="text/javascript" src="http://static.tumblr.com/hkw90bf/4j0lylphn/jquery.writecapture.js"></script>
	<script type="text/javascript" src="http://static.tumblr.com/hkw90bf/Csalymbyn/gitsembedwritecapture.js"></script>


	<!--
	Usage:
	just add <div class="gists">[gist js URL]</div>

	// http://paulirish.com/2011/requestanimationframe-for-smart-animating/
	// http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating

	// requestAnimationFrame polyfill by Erik Möller. fixes from Paul Irish and Tino Zijdel

	// MIT license

	(function() {
	var lastTime = 0;
	var vendors = ['ms', 'moz', 'webkit', 'o'];

	gem 'capistrano', '~> 2.11.2'
	gem 'capistrano-ext', '~> 1.2.1'
	gem 'capistrano_colors', '~> 0.5.5'