diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-24 15:45:54 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-24 15:45:54 +0100 |
| commit | ef85ef8ed6b92e9641a65b2d9a1b09062cdb7176 (patch) | |
| tree | dfc62219a28e6fe327bd4c8c6df756ef87c69e72 /phpBB | |
| parent | 400277c03624788e6a31f9aa4a15b883478f58cc (diff) | |
| parent | 0ce899cb8730008b470ef37eac3dcd2965fd2314 (diff) | |
| download | forums-ef85ef8ed6b92e9641a65b2d9a1b09062cdb7176.tar forums-ef85ef8ed6b92e9641a65b2d9a1b09062cdb7176.tar.gz forums-ef85ef8ed6b92e9641a65b2d9a1b09062cdb7176.tar.bz2 forums-ef85ef8ed6b92e9641a65b2d9a1b09062cdb7176.tar.xz forums-ef85ef8ed6b92e9641a65b2d9a1b09062cdb7176.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher
* upstream/develop:
[ticket/10723] Stop Travis running all tests on sqlite
[feature/prosilver-cleanup/css-reset-v2] CSS reset
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 81 |
1 files changed, 77 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 7eb00bd808..574e9ceb3a 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1,12 +1,51 @@ -/* General Markup Styles +/* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 ---------------------------------------- */ - -* { - /* Reset browsers default margin, padding and font sizes */ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { margin: 0; padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; } +/* General Markup Styles +---------------------------------------- */ html { font-size: 100%; /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */ @@ -20,6 +59,7 @@ body { background-color: #FFFFFF; /*font-size: 62.5%; This sets the default font size to be equivalent to 10px */ font-size: 10px; + line-height: normal; margin: 0; padding: 12px 0; } @@ -99,6 +139,39 @@ p.right { text-align: right; } +b, strong { + font-weight: bold; +} + +i, em { + font-style: italic; +} + +u { + text-decoration: underline; +} + +ul { + list-style-type: disc; +} + +ol { + list-style-type: decimal; +} + +li { + display: list-item; +} + +ul ul, ol ul { + list-style-type: circle; +} + +ol ol ul, ol ul ul, ul ol ul, ul ul ul { + list-style-type: square; +} + + /* Main blocks ---------------------------------------- */ #wrap { |