diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-01 16:29:22 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-01 16:29:22 -0600 |
| commit | ed6344009abb31326acabe95449aaa449f66f4b4 (patch) | |
| tree | 03d65052d550b890074dde3c18857371be974f5c /mediagoblin/static | |
| parent | 5c754fdaeeddb1bbeff165bbecb77e33b75b3c7d (diff) | |
| parent | b7a3798e1806eb52a244088fb600376ff25e0de9 (diff) | |
| download | mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.lz mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.xz mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.zip | |
Merge branch 'master' into joar-skip_transcoding
Conflicts:
mediagoblin/config_spec.ini
Diffstat (limited to 'mediagoblin/static')
| -rw-r--r-- | mediagoblin/static/css/base.css | 6 | ||||
| -rw-r--r-- | mediagoblin/static/images/icon_collect.png | bin | 588 -> 0 bytes | |||
| l--------- | mediagoblin/static/js/extlib/html5shiv.js | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 04b4ee28..8df9f2e1 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -132,9 +132,15 @@ header { } .header_dropdown li { + margin: 4px 0; list-style: none; } +.header_dropdown p { + margin-top: 12px; + margin-bottom: 10px; +} + .dropdown_title { font-size: 20px; } diff --git a/mediagoblin/static/images/icon_collect.png b/mediagoblin/static/images/icon_collect.png Binary files differdeleted file mode 100644 index 2911af24..00000000 --- a/mediagoblin/static/images/icon_collect.png +++ /dev/null diff --git a/mediagoblin/static/js/extlib/html5shiv.js b/mediagoblin/static/js/extlib/html5shiv.js deleted file mode 120000 index ca7358c7..00000000 --- a/mediagoblin/static/js/extlib/html5shiv.js +++ /dev/null @@ -1 +0,0 @@ -../../../../extlib/html5shiv/html5shiv.js
\ No newline at end of file |
