From: joshuaruesweg <ruesweg@woltlab.com>
Date: Sat, 22 Aug 2020 14:31:49 +0000 (+0200)
Subject: Merge branch '5.2'
X-Git-Tag: 5.3.0_Alpha_1~30
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c54120adb6dac82aba42f32a2d302c6ec122ef81;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.2'
---

c54120adb6dac82aba42f32a2d302c6ec122ef81
diff --cc wcfsetup/install/files/acp/style/layout.scss
index dc9ba81143,b0ced58e06..69b4b4a1d7
--- a/wcfsetup/install/files/acp/style/layout.scss
+++ b/wcfsetup/install/files/acp/style/layout.scss
@@@ -562,15 -523,3 +562,9 @@@ $wcfAcpSubMenuWidth: 300px
  	
  	@include wcfFontHeadline;
  }
 +
 +.exceptionContainer {
 +	&.collapsed .exceptionDetails {
 +		display: none;
 +	}
 +}
- 
- /* Fullscreen template comparison */
- #fullscreenContainer {
- 	background-color: #fafafa;
- 	padding: 0 20px;
- }