From 718d827d55c0e8fcafbd5f9262b49a5222f7c605 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 28 Mar 2012 21:03:27 +0200
Subject: [PATCH] More template fixes

---
 com.woltlab.wcf/template/footerMenu.tpl       | 12 ++--
 com.woltlab.wcf/template/permissionDenied.tpl |  2 +-
 com.woltlab.wcf/template/redirect.tpl         |  8 +--
 com.woltlab.wcf/template/userException.tpl    | 20 +++----
 wcfsetup/install/files/style/bootstrap.less   |  2 +-
 wcfsetup/install/files/style/codebox.less     |  4 +-
 wcfsetup/install/files/style/forms.less       |  6 +-
 wcfsetup/install/files/style/layout.less      |  2 -
 wcfsetup/install/files/style/message.less     |  7 +--
 wcfsetup/install/files/style/navigation.less  |  8 ++-
 wcfsetup/install/files/style/user.less        | 55 +++++++++++++++++++
 wcfsetup/install/files/style/variables.less   | 24 ++++----
 12 files changed, 105 insertions(+), 45 deletions(-)

diff --git a/com.woltlab.wcf/template/footerMenu.tpl b/com.woltlab.wcf/template/footerMenu.tpl
index a6fc493f34..f98ff4236a 100644
--- a/com.woltlab.wcf/template/footerMenu.tpl
+++ b/com.woltlab.wcf/template/footerMenu.tpl
@@ -1,9 +1,7 @@
 {if $__wcf->getPageMenu()->getMenuItems('footer')|count > 0}
-	<div class="wcf-menu">
-		<ul>
-			{foreach from=$__wcf->getPageMenu()->getMenuItems('footer') item=menuItem}
-				<li><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="wcf-badge">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a></li>
-			{/foreach}
-		</ul>
-	</div>
+	<ul>
+		{foreach from=$__wcf->getPageMenu()->getMenuItems('footer') item=menuItem}
+			<li><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge badgeUpdate">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a></li>
+		{/foreach}
+	</ul>
 {/if}
diff --git a/com.woltlab.wcf/template/permissionDenied.tpl b/com.woltlab.wcf/template/permissionDenied.tpl
index 9ca3e87379..10d7088864 100644
--- a/com.woltlab.wcf/template/permissionDenied.tpl
+++ b/com.woltlab.wcf/template/permissionDenied.tpl
@@ -8,7 +8,7 @@
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 {include file='header' sandbox=false}
 	
-	<p class="wcf-error">{lang}wcf.global.error.permissionDenied{/lang}</p>
+<p class="error">{lang}wcf.global.error.permissionDenied{/lang}</p>
 	
 {if ENABLE_DEBUG_MODE}
 	<!-- 
diff --git a/com.woltlab.wcf/template/redirect.tpl b/com.woltlab.wcf/template/redirect.tpl
index 76cddd562d..4c047aebaa 100644
--- a/com.woltlab.wcf/template/redirect.tpl
+++ b/com.woltlab.wcf/template/redirect.tpl
@@ -9,10 +9,10 @@
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 {include file='header' sandbox=false}
 	
-	<div class="wcf-success">
-		<p>{@$message}</p>
-		<p><a href="{$url}">{lang}wcf.global.redirect.url{/lang}</a></p>
-	</div>
+<div class="success">
+	<p>{@$message}</p>
+	<p><a href="{$url}">{lang}wcf.global.redirect.url{/lang}</a></p>
+</div>
 	
 {include file='footer' sandbox=false}
 </body>
diff --git a/com.woltlab.wcf/template/userException.tpl b/com.woltlab.wcf/template/userException.tpl
index 8985770253..1d5785ece3 100644
--- a/com.woltlab.wcf/template/userException.tpl
+++ b/com.woltlab.wcf/template/userException.tpl
@@ -7,16 +7,16 @@
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 {include file='header' sandbox=false}
 	
-	<p id="errorMessage" class="wcf-error">
-		{@$message}
-	</p>
-	<script type="text/javascript">
-		//<![CDATA[
-		if (document.referrer) {
-			$('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
-		}
-		//]]>
-	</script>
+<p id="errorMessage" class="error">
+	{@$message}
+</p>
+<script type="text/javascript">
+	//<![CDATA[
+	if (document.referrer) {
+		$('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
+	}
+	//]]>
+</script>
 
 {if ENABLE_DEBUG_MODE}
 	<!-- 
diff --git a/wcfsetup/install/files/style/bootstrap.less b/wcfsetup/install/files/style/bootstrap.less
index 1f31b5de05..8579a2821c 100644
--- a/wcfsetup/install/files/style/bootstrap.less
+++ b/wcfsetup/install/files/style/bootstrap.less
@@ -24,11 +24,11 @@
 @import "codebox.less";
 @import "pagination.less";
 @import "comments.less";
+@import "user.less";
 
 @import "message.less";
 @import "dialog.less";
 @import "tooltip.less";
-@import "user.less";
 
 /* application */
 @import "wbb.less";
\ No newline at end of file
diff --git a/wcfsetup/install/files/style/codebox.less b/wcfsetup/install/files/style/codebox.less
index 8d9412eb3d..7b8e862807 100644
--- a/wcfsetup/install/files/style/codebox.less
+++ b/wcfsetup/install/files/style/codebox.less
@@ -166,8 +166,10 @@
 
 /* Quote Box */
 .quoteBox {
-	/*background: url("...quote.svg") 12px 12px no-repeat #fff;*/
 	background-color: @wcfContentBackgroundColor;
+	background-image: url('../images/quote.png');
+	background-position: 12px 12px;
+	background-repeat: no-repeat;
 	padding: 10px 20px 10px 58px;
 	
 	header {
diff --git a/wcfsetup/install/files/style/forms.less b/wcfsetup/install/files/style/forms.less
index cadc19643a..db7d19be87 100644
--- a/wcfsetup/install/files/style/forms.less
+++ b/wcfsetup/install/files/style/forms.less
@@ -18,13 +18,16 @@ fieldset:only-child {
 }
 
 fieldset legend {
-	color: @wcfLinkColor;
 	margin: auto -@wcfGapSmall;
 	padding: 0 @wcfGapSmall 0;
 	
 	.textShadow(@wcfContainerAccentBackgroundColor);
 }
 
+fieldset legend label {
+	color: @wcfColor;
+}
+
 fieldset legend ~ p {
 	margin-bottom: @wcfGapMedium;
 }
@@ -37,7 +40,6 @@ fieldset legend ~ p {
 }
 
 .sidebar fieldset legend {
-	color: @wcfColor;
 	padding: 0;
 	text-transform: uppercase;
 		
diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index a887cf5912..30cc3df701 100644
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -192,9 +192,7 @@ img {
 
 dl.dataList {
 	display: inline-block;
-	font-size: 90%;
 	margin: 0;
-	position: static;
 	
 	dd {
 		display: inline-block;
diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less
index b8ebe752f0..2c4b22d7ed 100644
--- a/wcfsetup/install/files/style/message.less
+++ b/wcfsetup/install/files/style/message.less
@@ -133,16 +133,15 @@
 		display: block;
 	}
 	
-	 > div {
+	> div {
 		border-top: @wcfContainerBorderWidth dotted @wcfContainerBorderColor;
 		display: block;
 		overflow: hidden;
 		padding: 10px 0;
 	}
 	
-	.signature {
-		overflow: hidden;
-		padding: 10px 0 20px;
+	> *:last-child {
+		padding-bottom: 20px;
 	}
 }
 
diff --git a/wcfsetup/install/files/style/navigation.less b/wcfsetup/install/files/style/navigation.less
index 9755b41a0e..774ddd6b4f 100644
--- a/wcfsetup/install/files/style/navigation.less
+++ b/wcfsetup/install/files/style/navigation.less
@@ -178,8 +178,14 @@
 
 .contentNavigation {
 	display: table;
-	margin-top: @wcfGapMedium;
 	width: 100%;
+	
+	> :first-child:before {
+		content: "";
+		display: block;
+		margin-top: @wcfGapMedium;
+	}
+	
 	nav ul {
 		float: left;
 		
diff --git a/wcfsetup/install/files/style/user.less b/wcfsetup/install/files/style/user.less
index e69de29bb2..9013688e76 100644
--- a/wcfsetup/install/files/style/user.less
+++ b/wcfsetup/install/files/style/user.less
@@ -0,0 +1,55 @@
+.simpleUserList {
+	h2, p, dl {
+		font-size: 85%;
+	}
+	
+	p, dl {
+		margin-bottom: 2px;
+	}
+}
+
+.userList {
+	> li {
+		padding: 0;
+		float: left;
+		width: 50%;
+		height: 90px;
+		overflow: hidden;
+		
+		&:nth-child(2n) {
+			float: right;
+			
+			&:last-child {
+				.borderRadius(0, 0, @wcfContainerBorderRadius - 1, 0);
+			}
+		}
+		
+		&:nth-child(2n+1) {
+			&:last-child {
+				.borderRadius(0, 0, 0, @wcfContainerBorderRadius - 1);
+			}
+		}
+		
+		&:nth-last-child(2) {
+			.borderRadius(0, 0, 0, @wcfContainerBorderRadius - 1);
+		}
+		
+		&:first-child {
+			.borderRadius(@wcfContainerBorderRadius - 1, 0, 0, 0);
+		}
+		
+		&:nth-child(2) {
+			.borderRadius(0, @wcfContainerBorderRadius - 1, 0, 0);
+		}
+		
+		> div {
+			padding: 14px 21px;
+		}
+	}
+	
+	&:after {
+		content: "";
+		display: table;
+		clear: both;
+	}
+}
\ No newline at end of file
diff --git a/wcfsetup/install/files/style/variables.less b/wcfsetup/install/files/style/variables.less
index 11114a2f14..e40a16c93e 100644
--- a/wcfsetup/install/files/style/variables.less
+++ b/wcfsetup/install/files/style/variables.less
@@ -63,21 +63,21 @@
 @wcfInputHoverBorderColor: darken(@wcfHoverBackgroundColor, 25%);
 
 /* form states and alerts */
-@warningColor: #c09853;
-@warningBackgroundColor: #fcf8e3;
-@warningBorderColor: darken(spin(@warningBackgroundColor, -10), 3%);
+@warningColor: #990;
+@warningBackgroundColor: #ffd;
+@warningBorderColor: #cc0;
 
-@errorColor: #b94a48;
-@errorBackgroundColor: #f2dede;
-@errorBorderColor: darken(spin(@errorBackgroundColor, -10), 3%);
+@errorColor: #c00;
+@errorBackgroundColor: #fee;
+@errorBorderColor: #f99;
 
-@successColor: #468847;
-@successBackgroundColor: #dff0d8;
-@successBorderColor: darken(spin(@successBackgroundColor, -10), 5%);
+@successColor: #090;
+@successBackgroundColor: #efe;
+@successBorderColor: #0c0;
 
-@infoColor: #3a87ad;
-@infoBackgroundColor: #d9edf7;
-@infoBorderColor: darken(spin(@infoBackgroundColor, -10), 7%);
+@infoColor: #68b;
+@infoBackgroundColor: #def;
+@infoBorderColor: #9be;
 
 /* layouts */
 @wcfLayoutFluidGap: 21px;
-- 
2.20.1