diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-17 09:39:16 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-17 09:39:16 +0200 |
| commit | dce1c5d4c923f852a1eae8cb14c307b0d452549d (patch) | |
| tree | a87324d1cdd21f35d68c4467497fcf211dfaecae | |
| parent | a2e19e4ea8dafc9dd70eaa09a48501047981d6d0 (diff) | |
| parent | dcf12cad26f0368785017914ccc4af6e29a04d77 (diff) | |
| download | forums-dce1c5d4c923f852a1eae8cb14c307b0d452549d.tar forums-dce1c5d4c923f852a1eae8cb14c307b0d452549d.tar.gz forums-dce1c5d4c923f852a1eae8cb14c307b0d452549d.tar.bz2 forums-dce1c5d4c923f852a1eae8cb14c307b0d452549d.tar.xz forums-dce1c5d4c923f852a1eae8cb14c307b0d452549d.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/theme/stylesheet.css
| -rw-r--r-- | phpBB/adm/style/admin.css | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 992af0997f..23bd563ba0 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -17,6 +17,10 @@ font-size: 100%; } +abbr { + text-decoration: none; +} + body, div, p, th, td, li, dd { font-size: x-small; voice-family: "\"}\""; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 702960f47c..19b0f65a2d 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -43,6 +43,9 @@ table { border-collapse: collapse; border-spacing: 0; } +abbr { + text-decoration: none; +} /* General Markup Styles ---------------------------------------- */ |