Merge branch '5.2'

diff --cc wcfsetup/install/files/acp/style/layout.scss
index 69b4b4a1d7d66ceef11262b100677726280e9045,904dfdaa258c1bfb1d1e0b3a5bff9c0bb6999d95..dc9ba81143a8995ebe27c3ae28b62c046452d602
--- 1/wcfsetup/install/files/acp/style/layout.scss
--- 2/wcfsetup/install/files/acp/style/layout.scss
+++ b/wcfsetup/install/files/acp/style/layout.scss
@@@ -563,8 -524,8 +563,14 @@@ $wcfAcpSubMenuWidth: 300px
        @include wcfFontHeadline;
  }
  
 +.exceptionContainer {
 +      &.collapsed .exceptionDetails {
 +              display: none;
 +      }
 +}
++
+ /* Fullscreen template comparison */
+ #fullscreenContainer {
+       background-color: #fafafa;
+       padding: 0 20px;
+ }

diff --cc wcfsetup/install/files/style/ui/trophy.scss
Simple merge