diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2012-12-25 19:18:23 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2012-12-25 19:18:23 +0100 |
| commit | 89672855f199b2bc08126e09b4fba2579940a67e (patch) | |
| tree | c700bad69b1ba31f2ad7976b55602d972d3002e7 /mediagoblin/static | |
| parent | 0562898e116ffcc8ce6f811c7c05ff77035bfa96 (diff) | |
| parent | 565d01a09a58bb1f60b6562e949ea322f6e01cc0 (diff) | |
| download | mediagoblin-89672855f199b2bc08126e09b4fba2579940a67e.tar.lz mediagoblin-89672855f199b2bc08126e09b4fba2579940a67e.tar.xz mediagoblin-89672855f199b2bc08126e09b4fba2579940a67e.zip | |
Merge branch '512_bump_video_js'
Diffstat (limited to 'mediagoblin/static')
| -rw-r--r-- | mediagoblin/static/css/base.css | 2 | ||||
| l--------- | mediagoblin/static/extlib/video-js | 1 | ||||
| l--------- | mediagoblin/static/js/extlib/video-js | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index f06b0af7..2085cfc9 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -168,7 +168,7 @@ footer { width: 640px; margin-left: 0px; margin-right: 10px; - float: left; + float: left; } .media_sidebar { diff --git a/mediagoblin/static/extlib/video-js b/mediagoblin/static/extlib/video-js new file mode 120000 index 00000000..65652d6e --- /dev/null +++ b/mediagoblin/static/extlib/video-js @@ -0,0 +1 @@ +../../../extlib/video-js/
\ No newline at end of file diff --git a/mediagoblin/static/js/extlib/video-js b/mediagoblin/static/js/extlib/video-js deleted file mode 120000 index 35da21ca..00000000 --- a/mediagoblin/static/js/extlib/video-js +++ /dev/null @@ -1 +0,0 @@ -../../../../extlib/video-js
\ No newline at end of file |