aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-22 12:19:09 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-22 12:19:09 +0100
commit8ce736ad8a328c25dddf514221e6106c9c902e27 (patch)
tree7ad433dcf04f2fcf4eb8df817fea53bfc27f956b /phpBB
parentd6c85757d724264bed9e0992261daa124c1eb4f6 (diff)
parentea101f793285e048c140a7904bbc04a1011cb83d (diff)
downloadforums-8ce736ad8a328c25dddf514221e6106c9c902e27.tar
forums-8ce736ad8a328c25dddf514221e6106c9c902e27.tar.gz
forums-8ce736ad8a328c25dddf514221e6106c9c902e27.tar.bz2
forums-8ce736ad8a328c25dddf514221e6106c9c902e27.tar.xz
forums-8ce736ad8a328c25dddf514221e6106c9c902e27.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/theme/content.css2
-rw-r--r--phpBB/styles/prosilver/theme/cp.css8
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 9388496c53..4768309c29 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -497,7 +497,7 @@ blockquote.uncited {
text-transform: uppercase;
border-bottom: 1px solid transparent;
margin-bottom: 3px;
- font-size: 0.8em;
+ font-size: 0.8em !important;
font-weight: bold;
display: block;
}
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index 014bb91e7a..81b6d9bf64 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -59,10 +59,6 @@ ul.cplist {
border-bottom: none;
}
-#cp-main .postbody p {
- font-size: 1.1em;
-}
-
#cp-main .pm-message {
border: 1px solid transparent;
margin: 10px 0;
@@ -78,6 +74,10 @@ ul.cplist {
margin-top: 0;
}
+.panel-container .postbody p.author {
+ font-size: 1.1em;
+}
+
#cp-main .buttons {
margin-left: 0;
}