diff options
author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-07-03 21:20:09 +0200 |
---|---|---|
committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-07-03 21:20:09 +0200 |
commit | 1344821daf935c348eaa46c27e17fc3186c59b19 (patch) | |
tree | d48d6c15eeef40139b0c8312360f77ef8c5038b7 | |
parent | 0b69a78f73aced3a0c2a010dec75ac372a613c85 (diff) | |
download | mediagoblin-1344821daf935c348eaa46c27e17fc3186c59b19.tar.lz mediagoblin-1344821daf935c348eaa46c27e17fc3186c59b19.tar.xz mediagoblin-1344821daf935c348eaa46c27e17fc3186c59b19.zip |
Added reset.css and text.css from 960.gs. This might shake up a few styles!
-rw-r--r-- | mediagoblin/contrib/reset.css | 202 | ||||
-rw-r--r-- | mediagoblin/contrib/text.css | 86 | ||||
l--------- | mediagoblin/static/css/contrib/reset.css | 1 | ||||
l--------- | mediagoblin/static/css/contrib/text.css | 1 | ||||
-rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 4 |
5 files changed, 294 insertions, 0 deletions
diff --git a/mediagoblin/contrib/reset.css b/mediagoblin/contrib/reset.css new file mode 100644 index 00000000..87b7f368 --- /dev/null +++ b/mediagoblin/contrib/reset.css @@ -0,0 +1,202 @@ +/* `XHTML, HTML4, HTML5 Reset +----------------------------------------------------------------------------------------------------*/ + +a, +abbr, +acronym, +address, +applet, +article, +aside, +audio, +b, +big, +blockquote, +body, +canvas, +caption, +center, +cite, +code, +dd, +del, +details, +dfn, +dialog, +div, +dl, +dt, +em, +embed, +fieldset, +figcaption, +figure, +font, +footer, +form, +h1, +h2, +h3, +h4, +h5, +h6, +header, +hgroup, +hr, +html, +i, +iframe, +img, +ins, +kbd, +label, +legend, +li, +mark, +menu, +meter, +nav, +object, +ol, +output, +p, +pre, +progress, +q, +rp, +rt, +ruby, +s, +samp, +section, +small, +span, +strike, +strong, +sub, +summary, +sup, +table, +tbody, +td, +tfoot, +th, +thead, +time, +tr, +tt, +u, +ul, +var, +video, +xmp { + border: 0; + margin: 0; + padding: 0; + font-size: 100%; +} + +html, +body { + height: 100%; +} + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { +/* + Override the default (display: inline) for + browsers that do not recognize HTML5 tags. + + IE8 (and lower) requires a shiv: + http://ejohn.org/blog/html5-shiv +*/ + display: block; +} + +b, +strong { +/* + Makes browsers agree. + IE + Opera = font-weight: bold. + Gecko + WebKit = font-weight: bolder. +*/ + font-weight: bold; +} + +img { + color: transparent; + font-size: 0; + vertical-align: middle; +/* + For IE. + http://css-tricks.com/ie-fix-bicubic-scaling-for-images +*/ + -ms-interpolation-mode: bicubic; +} + +li { +/* + For IE6 + IE7. +*/ + display: list-item; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +th, +td, +caption { + font-weight: normal; + vertical-align: top; + text-align: left; +} + +q { + quotes: none; +} + +q:before, +q:after { + content: ''; + content: none; +} + +sub, +sup, +small { + font-size: 75%; +} + +sub, +sup { + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +svg { +/* + For IE9. +*/ + overflow: hidden; +}
\ No newline at end of file diff --git a/mediagoblin/contrib/text.css b/mediagoblin/contrib/text.css new file mode 100644 index 00000000..1a6b302f --- /dev/null +++ b/mediagoblin/contrib/text.css @@ -0,0 +1,86 @@ +/* + 960 Grid System ~ Text CSS. + Learn more ~ http://960.gs/ + + Licensed under GPL and MIT. +*/ + +/* `Basic HTML +----------------------------------------------------------------------------------------------------*/ + +body { + font: 13px/1.5 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif; +} + +pre, +code { + font-family: 'DejaVu Sans Mono', Monaco, Consolas, monospace; +} + +hr { + border: 0 #ccc solid; + border-top-width: 1px; + clear: both; + height: 0; +} + +/* `Headings +----------------------------------------------------------------------------------------------------*/ + +h1 { + font-size: 25px; +} + +h2 { + font-size: 23px; +} + +h3 { + font-size: 21px; +} + +h4 { + font-size: 19px; +} + +h5 { + font-size: 17px; +} + +h6 { + font-size: 15px; +} + +/* `Spacing +----------------------------------------------------------------------------------------------------*/ + +ol { + list-style: decimal; +} + +ul { + list-style: disc; +} + +li { + margin-left: 30px; +} + +p, +dl, +hr, +h1, +h2, +h3, +h4, +h5, +h6, +ol, +ul, +pre, +table, +address, +fieldset, +figure { + margin-bottom: 20px; +}
\ No newline at end of file diff --git a/mediagoblin/static/css/contrib/reset.css b/mediagoblin/static/css/contrib/reset.css new file mode 120000 index 00000000..e6796fdc --- /dev/null +++ b/mediagoblin/static/css/contrib/reset.css @@ -0,0 +1 @@ +/home/jef/env/mediagoblin/src/schendjes-mediagoblin/mediagoblin/contrib/reset.css
\ No newline at end of file diff --git a/mediagoblin/static/css/contrib/text.css b/mediagoblin/static/css/contrib/text.css new file mode 120000 index 00000000..f54ea50c --- /dev/null +++ b/mediagoblin/static/css/contrib/text.css @@ -0,0 +1 @@ +/home/jef/env/mediagoblin/src/schendjes-mediagoblin/mediagoblin/contrib/text.css
\ No newline at end of file diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index fbb52803..87adfabb 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -19,6 +19,10 @@ <head> <title>{% block title %}GNU MediaGoblin{% endblock title %}</title> <link rel="stylesheet" type="text/css" + href="{{ request.staticdirect('/css/contrib/reset.css') }}"/> + <link rel="stylesheet" type="text/css" + href="{{ request.staticdirect('/css/contrib/text.css') }}"/> + <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/contrib/960_12_col.css') }}"/> <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/base.css') }}"/> |