diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-11-30 21:21:39 +0100 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-31 10:32:52 -0600 |
| commit | a246ccca69e863904718537f45a17d226b33a123 (patch) | |
| tree | 599aad1e47d56bf064430f10cdb378c59e2437ce /mediagoblin/static | |
| parent | 992e4f80324e5e2d0079fd70cce9d4ad962f7047 (diff) | |
| download | mediagoblin-a246ccca69e863904718537f45a17d226b33a123.tar.lz mediagoblin-a246ccca69e863904718537f45a17d226b33a123.tar.xz mediagoblin-a246ccca69e863904718537f45a17d226b33a123.zip | |
ASCII media type support & fix a bug in file submission error handling
* Added ASCII media processing
* Added ASCII media display
* Added ASCII media type
Rebased from Joar Wandborg's ascii art branch (squashed to remove the
commits borrowing code of dubious license)
Fixed a bug in file submission error handling:
- Moved file-extension condition out of loop (what did it do there?)
- Updated file submission tests
- Changed error handling in file submission, should now report more
than absolutely necessary.
Diffstat (limited to 'mediagoblin/static')
| -rw-r--r-- | mediagoblin/static/css/base.css | 12 | ||||
| l--------- | mediagoblin/static/fonts/Inconsolata.otf | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index ecdd0474..382ba88a 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -402,3 +402,15 @@ table.media_panel th { margin-top: 10px; margin-left: 10px; } + +/* ASCII art */ + +@font-face { + font-family: Inconsolata; + src: local('Inconsolata'), url('../fonts/Inconsolata.otf') format('opentype') +} + +.ascii-wrapper pre { + font-family: Inconsolata, monospace; + line-height: 1em; +}
\ No newline at end of file diff --git a/mediagoblin/static/fonts/Inconsolata.otf b/mediagoblin/static/fonts/Inconsolata.otf new file mode 120000 index 00000000..777be657 --- /dev/null +++ b/mediagoblin/static/fonts/Inconsolata.otf @@ -0,0 +1 @@ +../../../extlib/inconsolata/Inconsolata.otf
\ No newline at end of file |