From 1385341bc81cced752970bd38f9fd674a2893d36 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Thu, 27 Jun 2013 22:41:34 +0200
Subject: [PATCH] Layout and CSS fixes for the installer.

---
 templates/2k11/admin/installer.inc.tpl | 11 +++++++----
 templates/2k11/admin/style.css         | 26 ++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/templates/2k11/admin/installer.inc.tpl b/templates/2k11/admin/installer.inc.tpl
index 0d50d4fe..f70bd5b2 100644
--- a/templates/2k11/admin/installer.inc.tpl
+++ b/templates/2k11/admin/installer.inc.tpl
@@ -17,7 +17,7 @@
         </div>
     </header>
 
-    <main class="clearfix serendipityAdminContent">
+    <main class="clearfix serendipityAdminContent installer">
         <div id="content" class="clearfix">
         {if $is_errors && is_array($errors)}
             {foreach $errors AS $error}
@@ -27,7 +27,7 @@
         {if $getstepint0}
             <h2>{$CONST.WELCOME_TO_INSTALLATION}</h2>
 
-            <h3>{$CONST.FIRST_WE_TAKE_A_LOOK}</h3>
+            <p>{$CONST.FIRST_WE_TAKE_A_LOOK}</p>
 
             <p>{$print_ERRORS_ARE_DISPLAYED_IN}</p>
 
@@ -225,9 +225,12 @@
 
                 <a class="block_level" href="serendipity_admin.php">{$CONST.RECHECK_INSTALLATION}</a>
             {else}
-                <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.SELECT_INSTALLATION_TYPE}:</span>
+                <p><strong>{$CONST.SELECT_INSTALLATION_TYPE}:</strong></p>
 
-                <div><a href="?serendipity[step]=2a">{$CONST.SIMPLE_INSTALLATION}</a> - <a href="?serendipity[step]=2b">{$CONST.EXPERT_INSTALLATION}</a></div>
+                <div class="form_buttons">
+                    <a class="button_link state_submit" href="?serendipity[step]=2a">{$CONST.SIMPLE_INSTALLATION}</a>
+                    <a class="button_link state_submit" href="?serendipity[step]=2b">{$CONST.EXPERT_INSTALLATION}</a>
+                </div>
             {/if}
             </div>
         {elseif $s9yGETstep == '2a'}
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 808eb9bc..1f78a03b 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -947,7 +947,8 @@ h3 {
     margin: 1.16667em 0;
 }
 
-h4 {
+h4,
+#diagnose caption {
     font-size: 1.14286em;
     line-height: 1.3125em;
     margin: 1.3125em 0;
@@ -1130,7 +1131,8 @@ main {
 .configuration_group .form_field input,
 .configuration_group .form_area textarea,
 #uploadform .form_select select,
-#uploadform .form_field input {
+#uploadform .form_field input,
+#diagnose > table {
     width: 100%;
 }
 
@@ -1335,6 +1337,10 @@ form > .button_link:first-of-type {
     margin-top: 0;
 }
 
+.installer .configuration_group h3 {
+    margin-top: 1.16667em;
+}
+
 #template_options,
 #pluginlist_sidebar {
     margin-bottom: 3em;
@@ -1711,11 +1717,20 @@ form > .button_link:first-of-type {
 .no-js .template_show_info,
 .no-js .comment_summary,
 .no-js .editor_toolbar,
+.js .additional_info,
+.installer .toggle_info,
 .hidden {
     display: none !important;
     visibility: hidden;
 }
 
+.js .installer .additional_info {
+    display: block !important;
+    visibility: visible;
+}
+
+
+
 input[name="serendipity[filter][fileCategory]"] {
     display: none;
 }
@@ -2029,6 +2044,13 @@ input[name="serendipity[filter][fileCategory]"] {
         width: 73%;
     }
 
+    .installer #content {
+        float: none;
+        margin: 0 auto;
+        max-width: 45em;
+        width: 100%;
+    }
+
     #edit_entry_status select[multiple],
     #sort_entries .form_select select,
     #filter_entries .form_select select,