Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/theme/stylesheet.css
This commit is contained in:
Marc Alexander 2015-08-17 09:39:16 +02:00
commit dce1c5d4c9
2 changed files with 7 additions and 0 deletions

View file

@ -17,6 +17,10 @@
font-size: 100%;
}
abbr {
text-decoration: none;
}
body, div, p, th, td, li, dd {
font-size: x-small;
voice-family: "\"}\"";

View file

@ -43,6 +43,9 @@ table {
border-collapse: collapse;
border-spacing: 0;
}
abbr {
text-decoration: none;
}
/* General Markup Styles
---------------------------------------- */