diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-23 19:42:58 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-23 19:42:58 +0200 |
| commit | 3a502143c7e1301b2575a1a171d6d6cdf9f5bf15 (patch) | |
| tree | 077c01802deda47eeb267e6bb26f78e17cd6c106 | |
| parent | 6be8c982960ce8200d88d241a6ecf66ea45d91a9 (diff) | |
| parent | 08f244229c8ea159d1fdae72388cfdbd78cd6db9 (diff) | |
| download | forums-3a502143c7e1301b2575a1a171d6d6cdf9f5bf15.tar forums-3a502143c7e1301b2575a1a171d6d6cdf9f5bf15.tar.gz forums-3a502143c7e1301b2575a1a171d6d6cdf9f5bf15.tar.bz2 forums-3a502143c7e1301b2575a1a171d6d6cdf9f5bf15.tar.xz forums-3a502143c7e1301b2575a1a171d6d6cdf9f5bf15.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12728] Adjust .postimage sizing to 100%
[ticket/12728] Enforce box model sizing on image attachment thumbnails
| -rw-r--r-- | phpBB/styles/prosilver/theme/content.css | 3 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/theme/stylesheet.css | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 0a0e853db2..b99312a5be 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -267,7 +267,7 @@ dd.option { } .postbody img.postimage { - max-width: 99%; + max-width: 100%; } .search .postbody { @@ -602,6 +602,7 @@ dl.file dd { dl.thumbnail img { padding: 3px; border: 1px solid transparent; + box-sizing: border-box; } dl.thumbnail dd { diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 596ebdc29f..3c7ff23db5 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -632,7 +632,7 @@ input:focus, select:focus, textarea:focus { } .postimage { - max-width: 99%; + max-width: 100%; } .syntaxbg { |