From cb58634cfb25f16833c5bd20ed792ab7863fa1fb Mon Sep 17 00:00:00 2001
From: Luzifr <szekely@woltlab.com>
Date: Thu, 9 Feb 2012 18:48:55 +0100
Subject: [PATCH] More style-prefixes & bug-fixes

---
 com.woltlab.wcf/template/mainMenu.tpl         |  4 +--
 com.woltlab.wcf/template/mainMenuSubMenu.tpl  |  4 +--
 com.woltlab.wcf/template/permissionDenied.tpl |  5 ++--
 com.woltlab.wcf/template/redirect.tpl         |  5 ++--
 com.woltlab.wcf/template/userException.tpl    |  5 ++--
 wcfsetup/install/files/acp/style/wcf.css      | 30 ++++++++++---------
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/com.woltlab.wcf/template/mainMenu.tpl b/com.woltlab.wcf/template/mainMenu.tpl
index 921803ea80..db48b45c88 100644
--- a/com.woltlab.wcf/template/mainMenu.tpl
+++ b/com.woltlab.wcf/template/mainMenu.tpl
@@ -1,8 +1,8 @@
 {if $__wcf->getPageMenu()->getMenuItems('header')|count > 0}
-	<nav id="mainMenu" class="mainMenu">
+	<nav id="mainMenu" class="wcf-mainMenu">
 		<ul>
 			{foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
-				<li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a></li>
+				<li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><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>
 	</nav>
diff --git a/com.woltlab.wcf/template/mainMenuSubMenu.tpl b/com.woltlab.wcf/template/mainMenuSubMenu.tpl
index b581ac2e64..c7d7ee5b7e 100644
--- a/com.woltlab.wcf/template/mainMenuSubMenu.tpl
+++ b/com.woltlab.wcf/template/mainMenuSubMenu.tpl
@@ -1,8 +1,8 @@
 {foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
 	{if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
-		<ul class="subMenu">
+		<ul class="wcf-subMenu">
 			{foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
-				<li><a href="{$subMenuItem->getProcessor()->getLink()}" title="{lang}{$subMenuItem->menuItem}{/lang}">{lang}{$subMenuItem->menuItem}{/lang}</a>{if $subMenuItem->getProcessor()->getNotifications()} <span class="badge">{#$subMenuItem->getProcessor()->getNotifications()}</span>{/if}</li>
+				<li><a href="{$subMenuItem->getProcessor()->getLink()}" title="{lang}{$subMenuItem->menuItem}{/lang}">{lang}{$subMenuItem->menuItem}{/lang}</a>{if $subMenuItem->getProcessor()->getNotifications()} <span class="wcf-badge">{#$subMenuItem->getProcessor()->getNotifications()}</span>{/if}</li>
 			{/foreach}
 		</ul>
 	{/if}
diff --git a/com.woltlab.wcf/template/permissionDenied.tpl b/com.woltlab.wcf/template/permissionDenied.tpl
index 298fe316b7..711d8c2110 100644
--- a/com.woltlab.wcf/template/permissionDenied.tpl
+++ b/com.woltlab.wcf/template/permissionDenied.tpl
@@ -3,12 +3,13 @@
 	<title>{lang}wcf.global.error.permissionDenied.title{/lang} - {lang}{PAGE_TITLE}{/lang}</title>
 	{include file='headInclude' sandbox=false}
 </head>
+
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 {include file='header' sandbox=false}
 
-<div id="main">
+<div id="main" class="wcf-main">
 	
-	<p class="error">{lang}wcf.global.error.permissionDenied{/lang}</p>
+	<p class="wcf-error">{lang}wcf.global.error.permissionDenied{/lang}</p>
 
 </div>
 
diff --git a/com.woltlab.wcf/template/redirect.tpl b/com.woltlab.wcf/template/redirect.tpl
index 9f7cf9fc34..18840b671d 100644
--- a/com.woltlab.wcf/template/redirect.tpl
+++ b/com.woltlab.wcf/template/redirect.tpl
@@ -4,12 +4,13 @@
 	{include file='headInclude' sandbox=false}
 	<meta http-equiv="refresh" content="{if $wait|isset}{@$wait}{else}10{/if};URL={$url}" />
 </head>
+
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 {include file='header' sandbox=false}
 
-<div id="main">
+<div id="main" class="wcf-main">
 	
-	<div class="success">
+	<div class="wcf-success">
 		<p>{@$message}</p>
 		<p><a href="{$url}">{lang}wcf.global.redirect.url{/lang}</a></p>
 	</div>
diff --git a/com.woltlab.wcf/template/userException.tpl b/com.woltlab.wcf/template/userException.tpl
index 253a566994..7b15dd15c7 100644
--- a/com.woltlab.wcf/template/userException.tpl
+++ b/com.woltlab.wcf/template/userException.tpl
@@ -3,11 +3,12 @@
 	<title>{lang}wcf.global.error.title{/lang} - {lang}{PAGE_TITLE}{/lang}</title>
 	{include file='headInclude' sandbox=false}
 </head>
+
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 {include file='header' sandbox=false}
 
-<div id="main">
-	<p class="error" id="errorMessage">
+<div id="main" class="wcf-main">
+	<p id="errorMessage" class="wcf-error">
 		{@$message}
 	</p>
 </div>
diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index e5c11ec606..89edfc3f22 100644
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -567,6 +567,8 @@ nav.wcf-topMenu {
 	float: left;
 }
 
+
+
 /* -- -- -- Main Menu -- -- -- */
 
 .wcf-mainMenu {
@@ -588,6 +590,7 @@ nav.wcf-topMenu {
 	border-top-right-radius: 5px;
 	background-color: rgba(0, 0, 0, .4);
 	display: inline-block;
+	position: relative;
 }
 
 .wcf-mainMenu > ul > li {
@@ -632,7 +635,6 @@ nav.wcf-topMenu {
 	cursor: pointer;
 	display: inline-block;
 	position: relative;
-	z-index: 1;
 	
 	-webkit-transition-property: border, background-color, background-image, color;
 	-webkit-transition-duration: .3s;
@@ -699,29 +701,29 @@ nav.wcf-topMenu {
 	z-index: 10;
 }
 
-/* Rounded Bottom Corners */
+/* Rounded Bottom Corners: Active Tab */
 
 .wcf-mainMenu > ul > li.activeMenuItem > a:before {
-	position: absolute;
+	border-bottom-right-radius: 6px;
+    border-width: 0 1px 1px 0;
+    position: absolute;
     bottom: 0;
+    left: -7px;
     width: 7px;
     height: 7px;
-    content: " ";
-    left: -7px;
-    border-bottom-right-radius: 6px;
-    border-width: 0 1px 1px 0;
+    content: "";
     box-shadow: 2px 2px 0 #e7f2fd;
 }
 
 .wcf-mainMenu > ul > li.activeMenuItem > a:after {
-	position: absolute;
+	border-bottom-left-radius: 6px;
+    border-width: 0 0 1px 1px;
+    position: absolute;
+    right: -7px;
     bottom: 0;
     width: 7px;
     height: 7px;
-    content: " ";
-    right: -7px;
-    border-bottom-left-radius: 6px;
-    border-width: 0 0 1px 1px;
+    content: "";
     box-shadow: -2px 2px 0 #e7f2fd;
 }
 
@@ -3762,7 +3764,7 @@ tr .columnIcon img {
 
 /* Globals */
 
-.wcf-clipboardEditor li {
+.wcf-clipboardEditor > ul > li {
 	font-size: .85em;
 	border-radius: 30px;
 	margin-top: 7px;
@@ -3772,7 +3774,7 @@ tr .columnIcon img {
 	float: left;
 }
 
-.wcf-clipboardEditor li span {
+.wcf-clipboardEditor > ul > li span {
 	text-decoration: none !important;
 	cursor: pointer;
 	background-image: url('../../icon/dropdown1.svg');
-- 
2.20.1