From 279267960d1aa58864ef23b2272f0818ae8175f6 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Tue, 6 Sep 2011 02:56:57 +0200 Subject: [PATCH] Again more HTML5, some templates adapted to match the rest, trying to get rid of setupHeader & -Footer, some CSS simplifying, some comments corrected. --- wcfsetup/install/files/acp/style/testing.css | 22 ++++----- .../install/files/acp/templates/login.tpl | 2 +- .../files/acp/templates/setupFooter.tpl | 3 +- .../files/acp/templates/setupHeader.tpl | 48 ++++++++++++++----- .../files/acp/templates/setupWindowHeader.tpl | 5 +- .../install/files/acp/templates/worker.tpl | 4 +- 6 files changed, 56 insertions(+), 28 deletions(-) diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 4ad5cbf40b..596628e41d 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -220,9 +220,9 @@ nav.mainMenu ul li.activeMenuItem { font-weight: bold; background-color: #e7f2fd; - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#e7f2fd)); + background-image: -webkit-linear-gradient(#fff, #e7f2fd); background-image: -moz-linear-gradient(0% 0% 270deg, #fff, #e7f2fd); - background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#e7f2fd)); + background-image: -ms-linear-gradient(#fff, #e7f2fd); background-image: -o-linear-gradient(#fff, #e7f2fd); background-image: linear-gradient(#fff, #e7f2fd); @@ -1576,9 +1576,9 @@ p.error { div#packageInstallationDialogContainer { background-color: #fefefe; - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee)); - background-image: -moz-linear-gradient(0% 0% 270deg, #fefefe, #eee); - background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee)); + background-image: -webkit-linear-gradient(#fefefe, #eee); + background-image: -moz-linear-gradient(#fefefe, #eee); + background-image: -ms-linear-gradient(#fefefe, #eee); background-image: -o-linear-gradient(#fefefe, #eee); background-image: linear-gradient(#fefefe, #eee); @@ -1810,6 +1810,8 @@ div.ui-widget-overlay { +/* -- -- -- -- -- GUI Widgets -- -- -- -- -- */ + /* Balloon Tooltips */ #balloonTooltip { @@ -1825,12 +1827,6 @@ div.ui-widget-overlay { box-shadow: 0 3px 7px rgba(0, 0, 0, .3); } - - -/* CSS Experiments (active) */ - - - /* Collapsible */ .collapsible { @@ -1845,4 +1841,8 @@ div.ui-widget-overlay { +/* CSS Experiments (active) */ + + + /* -- -- -- -- -- EOF -- -- -- -- -- */ diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl index 264880507a..f8269a290b 100644 --- a/wcfsetup/install/files/acp/templates/login.tpl +++ b/wcfsetup/install/files/acp/templates/login.tpl @@ -58,4 +58,4 @@ -{include file='setupFooter'} +{include file='footer'} diff --git a/wcfsetup/install/files/acp/templates/setupFooter.tpl b/wcfsetup/install/files/acp/templates/setupFooter.tpl index df4b9952ca..909304ea57 100644 --- a/wcfsetup/install/files/acp/templates/setupFooter.tpl +++ b/wcfsetup/install/files/acp/templates/setupFooter.tpl @@ -1,7 +1,8 @@ + - +