Merge branch 'master' of github.com:ryanb/railscasts-scripts

applescripts/Merge Movies.app/Contents/Info.plist

@@ -53,7 +53,7 @@
 		<key>savedFrame</key>
 		<string>153 235 718 643 0 0 1440 878 </string>
 		<key>selectedTabView</key>
-		<string>result</string>
+		<string>event log</string>
 	</dict>
 </dict>
 </plist>

bin/rcwindow

@@ -0,0 +1,18 @@
+#!/usr/bin/env osascript
+#
+# This will resize the front window of the given applications
+# to a size that fits in my screencast recording area (960x600).
+#
+# Usage:
+# $ rcwindow Safari Terminal
+#
+on run argv
+  if argv is equal to {} then
+    set argv to {"Safari", "Terminal", "TextMate"}
+  end if
+  repeat with appName in argv
+    tell application appName
+      set bounds of window 1 to {0, 0, 961, 600}
+    end tell
+  end repeat
+end run

templates/layout.css.scss

@@ -24,19 +24,12 @@ a {
   margin-top: 20px;
 }
 
-#flash_notice, #flash_alert {
-  padding: 5px 8px;
-  margin: 10px 0;
-}
-
 #flash_notice {
-  background-color: #CFC;
-  border: solid 1px #6C6;
+  color: #00B205;
 }
 
 #flash_alert {
-  background-color: #FCC;
-  border: solid 1px #C66;
+  color: #D00;
 }
 
 .error_messages, #error_explanation {