Browse code

1. Added html5 video with flash fallback. 2. Added Rack support 3. Disqus support 4. Improved Readme 5. Improved Syntax flexibility and styling 6. Improved blockquote styling

Brandon Mathis authored on 24/06/2011 at 21:17:35
Showing 56 changed files
... ...
@@ -3,7 +3,6 @@
3 3
 .sass-cache
4 4
 _gist_cache
5 5
 _code_cache
6
-_assets
7 6
 _deploy
8 7
 public
9 8
 source/_stash
... ...
@@ -1,6 +1,7 @@
1 1
 source "http://rubygems.org"
2 2
 
3 3
 gem 'rake'
4
+gem 'rack'
4 5
 gem 'jekyll'
5 6
 gem 'rdiscount'
6 7
 gem 'RedCloth'
... ...
@@ -21,6 +21,7 @@ GEM
21 21
     liquid (2.2.2)
22 22
     maruku (0.6.0)
23 23
       syntax (>= 1.0.0)
24
+    rack (1.3.0)
24 25
     rake (0.9.0)
25 26
     rb-fsevent (0.4.0)
26 27
     rdiscount (1.6.8)
... ...
@@ -36,6 +37,7 @@ DEPENDENCIES
36 36
   compass (>= 0.11)
37 37
   haml (>= 3.1)
38 38
   jekyll
39
+  rack
39 40
   rake
40 41
   rb-fsevent
41 42
   rdiscount
... ...
@@ -2,7 +2,7 @@
2 2
 2. **Code blogging is easy and beautiful.** Embed code (with [Solarized](http://ethanschoonover.com/solarized) styling) in your posts from gists or from your filesystem.
3 3
 3. **Third party integration is simple** with built-in support for Twitter, Pinboard, Delicious, Disqus Comments, and Google Analytics.
4 4
 4. **It's easy to use.** A collection of rake tasks simplifies development and makes deploying a cinch.
5
-5. **Get curated plugins.** Plugins are hand selected from the Jekyll community then tested and improved.
5
+5. **Ships with great plugins** some original and others from the Jekyll community — tested and improved.
6 6
 
7 7
 ## Getting Started
8 8
 
... ...
@@ -10,8 +10,6 @@
10 10
 open up a terminal and follow along. If you plan to host your site on [Github Pages](http://pages.github.com) for a user or organization, make sure the
11 11
 repository is named `your_username.github.com` or `your_organization.github.com`.
12 12
 
13
-### Setting up Git
14
-
15 13
     mkdir my_octopress_site
16 14
     cd my_octopress_site
17 15
     git init
... ...
@@ -26,8 +24,7 @@ repository is named `your_username.github.com` or `your_organization.github.com`
26 26
     git push origin source
27 27
 
28 28
 
29
-### Setting up Octopress
30
-<span>Next</span>, setup an [RVM](http://beginrescueend.com/) and install dependencies.
29
+Next, setup an [RVM](http://beginrescueend.com/) and install dependencies.
31 30
 
32 31
     rvm rvmrc trust
33 32
     bundle install
... ...
@@ -4,8 +4,9 @@ destination: public
4 4
 code_dir: downloads/code
5 5
 port: 4000
6 6
 
7
-url: http://dev.octopress.org
8
-title: Octopress
7
+url: http://yoursite.com
8
+title: My Octopress Blog
9
+permalink: /blog/:year/:month/:day/:title
9 10
 subtitle: A blogging framework for hackers.
10 11
 author: Your Name
11 12
 subscribe_rss: /atom.xml
... ...
@@ -13,7 +14,8 @@ subscribe_email:
13 13
 
14 14
 markdown: rdiscount
15 15
 pygments: true
16
-posts_per_page: 10
16
+#posts_per_page: 10
17
+paginate: 5
17 18
 recent_posts: 5
18 19
 simple_search: http://google.com/search
19 20
 
... ...
@@ -23,7 +25,7 @@ simple_search: http://google.com/search
23 23
 email:
24 24
 
25 25
 # Twitter
26
-twitter_user: imathis
26
+twitter_user:
27 27
 twitter_tweet_count: 4
28 28
 twitter_show_replies: false
29 29
 twitter_follow_button: true
... ...
@@ -31,7 +33,7 @@ twitter_show_follower_count: false
31 31
 twitter_tweet_button: true
32 32
 
33 33
 # Pinboard
34
-#pinboard_user: imathis
34
+pinboard_user:
35 35
 pinboard_count: 3
36 36
 
37 37
 # Delicious
38 38
new file mode 100644
... ...
@@ -0,0 +1,35 @@
0
+require 'rubygems'
1
+require 'bundler/setup'
2
+require 'rack'
3
+
4
+# The project root directory
5
+$root = ::File.dirname(__FILE__)
6
+
7
+# Common Rack Middleware
8
+use Rack::ShowStatus      # Nice looking 404s and other messages
9
+use Rack::ShowExceptions  # Nice looking errors
10
+
11
+#
12
+# From Rack::DirectoryIndex:
13
+# https://github.com/craigmarksmith/rack-directory-index/
14
+#
15
+module Rack
16
+  class DirectoryIndex
17
+    def initialize(app)
18
+      @app = app
19
+    end
20
+    def call(env)
21
+      index_path = ::File.join($root, 'public', Rack::Request.new(env).path.split('/'), 'index.html')
22
+      if ::File.exists?(index_path)
23
+        return [200, {"Content-Type" => "text/html"}, [::File.read(index_path)]]
24
+      else
25
+        @app.call(env)
26
+      end
27
+    end
28
+  end
29
+end
30
+
31
+use Rack::DirectoryIndex
32
+
33
+run Rack::Directory.new($root + '/public')
34
+
... ...
@@ -48,7 +48,7 @@ module OctopressFilters
48 48
     else
49 49
       case number.to_i % 10
50 50
       when 1; "#{number}<span>st</span>"
51
-      when 2; "#{number}<span>nd<span>"
51
+      when 2; "#{number}<span>nd</span>"
52 52
       when 3; "#{number}<span>rd</span>"
53 53
       else    "#{number}<span>th</span>"
54 54
       end
... ...
@@ -1,8 +1,12 @@
1 1
 $max-width: 1200px !default;
2
+
3
+// Padding used for layout margins
2 4
 $pad-min: 18px !default;
3 5
 $pad-narrow: 25px !default;
4 6
 $pad-medium: 35px !default;
5 7
 $pad-wide: 55px !default;
8
+
9
+// Sidebar widths used in media queries
6 10
 $sidebar-width-medium: 240px !default;
7 11
 $sidebar-pad-medium: 15px !default;
8 12
 $sidebar-pad-wide: 20px !default;
... ...
@@ -15,7 +19,7 @@ body {
15 15
   max-width: $max-width;
16 16
   position: relative;
17 17
   margin: 0 auto;
18
-  > header, > nav, > footer, #articles > article {
18
+  > header, > nav, > footer, #articles > article, #articles > nav {
19 19
     @extend .group;
20 20
     padding-left: $pad-min;
21 21
     padding-right: $pad-min;
... ...
@@ -53,7 +53,7 @@ h6, section h5, section section h4, section section section h3 {
53 53
 }
54 54
 p, blockquote, ul, ol { margin-bottom: 1.5em; }
55 55
 
56
-ul{ list-style-type: disc; }
56
+ul{ list-style-type: circle; }
57 57
 
58 58
 ol{ list-style-type: decimal; ol { list-style-type: lower-alpha; } }
59 59
 ul ul, ol ol { margin-left: 1.75em; }
... ...
@@ -46,7 +46,6 @@ $border: inline-image('dotted-border.png');
46 46
         background: $border bottom left repeat-x;
47 47
         p.meta { position: static; }
48 48
       }
49
-
50 49
     }
51 50
     h1.feature {
52 51
       padding-top: .5em;
... ...
@@ -58,12 +57,15 @@ $border: inline-image('dotted-border.png');
58 58
     }
59 59
     .entry-content {
60 60
       img, video { max-width: 100%; height: auto; }
61
-      video { display: block; margin-bottom: 1.5em;
61
+      video {
62
+        width: 100%; display: block; margin-bottom: 1.5em;
62 63
         padding: .8em; background: #fff; border: 1px solid #eee;
63 64
         @include box-sizing(border-box);
64 65
       }
65 66
       .flash-video {
66 67
         max-width: 100%;
68
+        margin-bottom: 1.5em;
69
+        @include box-sizing(border-box);
67 70
         padding: .8em; background: #fff; border: 1px solid #eee;
68 71
         > div {
69 72
           position: relative;
... ...
@@ -82,12 +84,7 @@ $border: inline-image('dotted-border.png');
82 82
         }
83 83
       }
84 84
     }
85
-    #disqus_thread { }
86
-
87 85
     iframe.twitter-share-button {
88
-      //display: block;
89
-      //margin-top: .5em;
90
-      //padding: .2em 0;
91 86
       position: relative;
92 87
       top: .3em;
93 88
       padding-left: .5em;
... ...
@@ -2,7 +2,6 @@ html {
2 2
   background: $page-bg inline-image('line-tile.png') top left;
3 3
 }
4 4
 body {
5
-  border: 0 0 1px 0 solid darken($page-bg, 5);
6 5
   > div {
7 6
     background-color: $sidebar-bg;
8 7
     border-bottom: 1px solid $page-border-bottom;
... ...
@@ -12,7 +11,3 @@ body {
12 12
     }
13 13
   }
14 14
 }
15
-
16
-@media only screen and (min-width: 1400px) {
17
-  body { border: 0 1px 0 solid darken($page-bg, 5); }
18
-}
... ...
@@ -51,17 +51,20 @@ html .gist .gist-file {
51 51
   }
52 52
 }
53 53
 pre {
54
-  background: #fff;
55
-  border: 1px solid #ddd;
54
+  background: #333;
56 55
   @include border-radius(.4em);
57 56
   @extend .mono;
58 57
   line-height: 1.45em;
59 58
   font-size: .8em;
60 59
   margin-bottom: 1.5em;
61 60
   padding: .8em 1em;
62
-  color: #555;
61
+  color: #ccc;
63 62
   overflow: auto;
64 63
 }
64
+h3.filename {
65
+  @extend .code-title;
66
+  + pre { @include border-top-radius(0px); }
67
+}
65 68
 
66 69
 p code {
67 70
   @extend .mono;
... ...
@@ -172,16 +175,14 @@ figure {
172 172
   }
173 173
   .highlight { margin-bottom: 0; border-bottom: 1px solid darken($base03, 2) !important; }
174 174
 }
175
-h3.filename { @extend .code-title; }
176 175
 .code-title {
177 176
   text-align: center;
178 177
   font-size: 13px;
179 178
   line-height: 2em;
180 179
   text-shadow: #cbcccc 0 1px 0;
181 180
   color: #474747;
182
-  font-style: normal;
181
+  font-weight: normal;
183 182
   margin-bottom: 0;
184
-
185 183
   @include border-top-radius(5px);
186 184
   font-family: "Helvetica Neue", Arial, "Lucida Grande", "Lucida Sans Unicode", Lucida, sans-serif;
187 185
   background: #aaaaaa image-url("code_bg.png") top repeat-x;
... ...
@@ -3,7 +3,7 @@
3 3
   var disqus_shortname = '{{ site.disqus_short_name }}';
4 4
   var disqus_identifier = '{{ site.url }}{{ page.url }}';
5 5
   var disqus_url = '{{ site.url }}{{ page.url }}';
6
-  var disqus_developer = 1;
6
+  //var disqus_developer = 1;
7 7
   (function() {
8 8
     var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
9 9
     dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
... ...
@@ -26,7 +26,7 @@
26 26
   <link href="/images/favicon.png" rel="shortcut icon" />
27 27
   <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
28 28
   <script src="/javascripts/modernizr-2.0.js"></script>
29
-  <script src="/javascripts/ender.js"></script>
29
+  <script src="http://s3.amazonaws.com/ender-js/jeesh.min.js"></script>
30 30
   <script src="/javascripts/octopress.js" type="text/javascript"></script>
31 31
   <link href='http://fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
32 32
   <link href='http://fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
33 33
new file mode 100644
... ...
@@ -0,0 +1,6 @@
0
+{% if page.author %}
1
+  {% assign author = page.author %}
2
+{% else %}
3
+  {% assign author = site.author %}
4
+{% endif %}
5
+{% if author %}<span class="byline author vcard">Posted by <span class="fn">{{ author }}</span></span>{% endif %}
0 6
new file mode 100644
... ...
@@ -0,0 +1,6 @@
0
+{% if page.date %}
1
+<time datetime="{{ page.date | datetime }}" pubdate {% if page.updated %} updated {% endif %}>{{ page.date | ordinalize }}</time>
2
+{% endif %}
3
+{% if page.updated %}
4
+<time class="updated" datetime="{{ page.updated | datetime }}"></time>
5
+{% endif %}
0 6
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+<a href="http://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-via="{{ site.twitter_user }}" data-counturl="{{ site.url }}{{ page.url }}" >Tweet</a>
0 1
new file mode 100644
1 2
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/background.png differ
2 3
new file mode 100644
3 4
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png differ
4 5
new file mode 100644
5 6
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/divider.png differ
6 7
new file mode 100644
7 8
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png differ
8 9
new file mode 100644
9 10
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png differ
10 11
new file mode 100644
11 12
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png differ
12 13
new file mode 100644
13 14
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png differ
14 15
new file mode 100644
15 16
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png differ
16 17
new file mode 100644
17 18
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png differ
18 19
new file mode 100644
19 20
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png differ
20 21
new file mode 100644
21 22
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png differ
22 23
new file mode 100644
23 24
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png differ
24 25
new file mode 100644
25 26
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png differ
26 27
new file mode 100644
27 28
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png differ
28 29
new file mode 100644
29 30
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png differ
30 31
new file mode 100644
31 32
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png differ
32 33
new file mode 100644
33 34
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png differ
34 35
new file mode 100644
35 36
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png differ
36 37
new file mode 100644
37 38
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png differ
38 39
new file mode 100644
39 40
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png differ
40 41
new file mode 100644
41 42
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/display/background.png differ
42 43
new file mode 100644
43 44
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png differ
44 45
new file mode 100644
45 46
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/display/muteIcon.png differ
46 47
new file mode 100644
47 48
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/display/playIcon.png differ
48 49
new file mode 100644
49 50
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/dock/button.png differ
50 51
new file mode 100644
... ...
@@ -0,0 +1,115 @@
0
+<?xml version="1.0"?>
1
+<skin version="1.1" name="Glow" author="LongTail Video">
2
+
3
+	<settings>
4
+		<setting name="backcolor" value="0x000000" />
5
+		<setting name="frontcolor" value="0xeeeeee" />
6
+		<setting name="lightcolor" value="0xeeeeee" />
7
+		<setting name="screencolor" value="0x000000" />
8
+	</settings>
9
+
10
+	<components>
11
+		<component name="controlbar">
12
+			<settings>
13
+				<setting name="margin" value="0" />
14
+				<setting name="fontsize" value="11" />
15
+				<setting name="fontcolor" value="0xEEEEEE" />
16
+				<setting name="buttoncolor" value="0xEEEEEE" />
17
+			</settings>
18
+
19
+			<layout>
20
+				<group position="left">
21
+					<button name="play" />
22
+					<text name="elapsed" />
23
+				</group>
24
+				<group position="center">
25
+					<slider name="time" />
26
+				</group>
27
+				<group position="right">
28
+					<text name="duration" />
29
+					<button name="blank" />
30
+					<button name="mute" />
31
+					<button name="fullscreen" />
32
+				</group>
33
+			</layout>
34
+
35
+			<elements>
36
+				<element name="background" src="background.png" />
37
+				<element name="capLeft" src="divider.png" />
38
+				<element name="capRight" src="divider.png" />
39
+				<element name="divider" src="divider.png" />
40
+				<element name="blankButton" src="blankButton.png" />
41
+				<element name="fullscreenButton" src="fullscreenButton.png" />
42
+				<element name="fullscreenButtonOver" src="fullscreenButtonOver.png" />
43
+				<element name="muteButton" src="muteButton.png" />
44
+				<element name="muteButtonOver" src="muteButtonOver.png" />
45
+				<element name="pauseButton" src="pauseButton.png" />
46
+				<element name="pauseButtonOver" src="pauseButtonOver.png" />
47
+				<element name="playButton" src="playButton.png" />
48
+				<element name="playButtonOver" src="playButtonOver.png" />
49
+				<element name="timeSliderBuffer" src="timeSliderBuffer.png" />
50
+				<element name="timeSliderCapLeft" src="timeSliderCapLeft.png" />
51
+				<element name="timeSliderCapRight" src="timeSliderCapRight.png" />
52
+				<element name="timeSliderProgress" src="timeSliderProgress.png" />
53
+				<element name="timeSliderRail" src="timeSliderRail.png" />
54
+				<element name="normalscreenButton" src="normalscreenButton.png" />
55
+				<element name="normalscreenButtonOver" src="normalscreenButtonOver.png" />
56
+				<element name="unmuteButton" src="unmuteButton.png" />
57
+				<element name="unmuteButtonOver" src="unmuteButtonOver.png" />
58
+				<element name="volumeSliderRail" src="divider.png" />
59
+				<element name="volumeSliderProgress" src="divider.png" />
60
+			</elements>
61
+		</component>
62
+		
63
+		<component name="display">
64
+			<settings>
65
+				<setting name="bufferinterval" value="250" />
66
+				<setting name="bufferrotation" value="90" />
67
+			</settings>
68
+			<elements>
69
+				<element name="background" src="background.png" />
70
+				<element name="playIcon" src="playIcon.png" />
71
+				<element name="muteIcon" src="muteIcon.png" />
72
+				<element name="errorIcon" src="bufferIcon.png" />
73
+				<element name="bufferIcon" src="bufferIcon.png" />
74
+			</elements>
75
+		</component>
76
+		
77
+		<component name="dock">
78
+			<settings>
79
+				<setting name="fontcolor" value="0xFFFFFF" />
80
+			</settings>
81
+			<elements>
82
+				<element name="button" src="button.png" />
83
+			</elements>
84
+		</component>
85
+
86
+		<component name="playlist">
87
+			<settings>
88
+				<setting name="fontcolor" value="0xEEEEEE" />
89
+				<setting name="overcolor" value="0xFFFFFF" />
90
+				<setting name="activecolor" value="0xFFFFFF" />
91
+				<setting name="backgroundcolor" value="0x333333" />
92
+			</settings>
93
+			<elements>
94
+				<element name="item" src="item.png" />
95
+				<element name="itemOver" src="itemOver.png" />
96
+				<element name="sliderCapBottom" src="sliderCapBottom.png" />
97
+				<element name="sliderCapTop" src="sliderCapTop.png" />
98
+				<element name="sliderRail" src="sliderRail.png" />
99
+				<element name="sliderThumb" src="sliderThumb.png" />
100
+			</elements>
101
+		</component>
102
+
103
+		<component name="sharing">
104
+			<elements>
105
+				<element name="embedIcon" src="embedIcon.png" />
106
+				<element name="embedScreen" src="embedScreen.png" />
107
+				<element name="shareIcon" src="shareIcon.png" />
108
+				<element name="shareScreen" src="shareScreen.png" />
109
+			</elements>
110
+		</component>
111
+
112
+	</components>
113
+
114
+</skin>
0 115
\ No newline at end of file
1 116
new file mode 100644
2 117
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/playlist/item.png differ
3 118
new file mode 100644
4 119
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png differ
5 120
new file mode 100644
6 121
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png differ
7 122
new file mode 100644
8 123
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png differ
9 124
new file mode 100644
10 125
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png differ
11 126
new file mode 100644
12 127
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png differ
13 128
new file mode 100644
14 129
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png differ
15 130
new file mode 100644
16 131
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png differ
17 132
new file mode 100644
18 133
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png differ
19 134
new file mode 100644
20 135
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png differ
21 136
new file mode 100644
22 137
Binary files /dev/null and b/themes/classic/source/assets/jwplayer/player.swf differ
... ...
@@ -3,12 +3,21 @@ layout: default
3 3
 blog_index: true
4 4
 ---
5 5
 {% assign index = true %}
6
-{% for page in site.posts limit:site.posts_per_page %}
6
+{% for page in paginator.posts %}
7 7
 {% assign content = page.content %}
8 8
   <article>
9 9
     {% include article.html %}
10 10
   </article>
11 11
 {% endfor %}
12
+<nav role="pagination">
13
+  {% if paginator.next_page %}
14
+    <a href="/page{{paginator.next_page}}/">&larr; Older</a>
15
+  {% endif %}
16
+  <a href="/archive.html">Blog Archive</a>
17
+  {% if paginator.previous_page %}
18
+    <a href="/page{{paginator.previous_page}}/">Newer &rarr;</a>
19
+  {% endif %}
20
+</nav>
12 21
 {% if site.disqus_short_name %}
13 22
 <script type="text/javascript">
14 23
     var disqus_shortname = '{{ site.disqus_short_name }}';
... ...
@@ -74,7 +74,7 @@ function flashVideoFallback(){
74 74
         id = 'video_'+Math.round(1 + Math.random()*(100000)),
75 75
         width = video.attr('width'),
76 76
         height = parseInt(video.attr('height')) + 30;
77
-        video.after('<div class="flash-video" style="width: '+width+'px; height: '+height+'px;"><div><div id='+id+'>');
77
+        video.after('<div class="flash-video"><div><div id='+id+'>');
78 78
         swfobject.embedSWF(flashplayerlocation, id, width, height + 30, "9.0.0",
79 79
           { file : src, image : video.attr('poster'), skin : flashplayerskin } ,
80 80
           { movie : src, wmode : "opaque", allowfullscreen : "true" });
... ...
@@ -101,8 +101,8 @@ function wrapFlashVideos(){
101 101
 
102 102
 $.domReady(function(){
103 103
   testFeatures();
104
-  flashVideoFallback();
105 104
   wrapFlashVideos();
105
+  flashVideoFallback();
106 106
   addCodeLineNumbers();
107 107
   getNav();
108 108
   addSidebarToggler();
... ...
@@ -141,5 +141,3 @@ b=j.userAgent.toLowerCase(),d=j.platform.toLowerCase(),g=d?/win/.test(d):/win/.t
141 141
 10),e[1]=parseInt(c.replace(/^.*\.(.*)\s.*$/,"$1"),10),e[2]=/[a-zA-Z]/.test(c)?parseInt(c.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}else if(typeof v.ActiveXObject!=l)try{var f=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");if(f&&(c=f.GetVariable("$version")))k=!0,c=c.split(" ")[1].split(","),e=[parseInt(c[0],10),parseInt(c[1],10),parseInt(c[2],10)]}catch(h){}return{w3:a,pv:e,wk:b,ie:k,win:g,mac:d}}();return{embedSWF:function(a,b,d,i,k,e,c,f,h){var j={success:!1,id:b};if(g.w3&&!(g.wk&&g.wk<312)&&
142 142
 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=
143 143
 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""}}}();
144
-
145
-