redesigned header to make user tools look like buttons in preparation for icons coming in

table borders now in line with button borders
designed the download code tab
made changed size of aside h1 (but not lower headings yet...)

2 files changed, 137 insertions, 34 deletions

diff --git a/css/default.css b/css/default.css
index 3846251a8..005a77918 100644
--- a/css/default.css
+++ b/css/default.css
@@ -45,8 +45,6 @@ a:visited{
 }
 
 .dokuwiki pre{
-  border-left: none;
-  border-right: none;
   padding: 0.75em 1em;
 }
 
@@ -56,8 +54,25 @@ a:visited{
 }
 
 #dokuwiki__header{
-  margin-top: 4em;
-  margin-bottom: 3em;
+  padding-top: 2em;
+  padding-bottom: 2em;
+  background: #eee;
+}
+
+#dokuwiki__header #dokuwiki__sitetools,
+#dokuwiki__header .headings{
+  z-index: 12;
+  position: relative;
+}
+
+.header_background{
+  background: #eee;
+  background: -webkit-linear-gradient(top, #eeeeee 98%,#dfdfdf 100%);
+  position: absolute;
+  top: 0;
+  height: 165px;
+  width: 100%;
+  z-index: 1;
 }
 
 #dokuwiki__header .tools{
@@ -70,6 +85,12 @@ a:visited{
 }
 
 #dokuwiki__header h1 a{
+  font-size: 1.5em;
+  font-weight: bold;
+  text-shadow: 1px 1px 0px #fff;
+}
+
+#dokuwiki__header h1 a{
   color: black;
 }
 
@@ -84,8 +105,12 @@ a:visited{
   font-size: 0.875em;
 }
 
+.wrapper{
+  padding-top: 30px;
+}
+
 .wrapper div.breadcrumbs{
-  border: 1px solid #ccc;
+  /*border: 1px solid #ccc;*/
   border-left: 0;
   border-right: 0;
   border-bottom: 0;
@@ -108,12 +133,23 @@ div.breadcrumbs .bcsep{
 }
 
 .mode_show #dokuwiki__aside{
-  border-top: 1px solid #ccc;
+  /*border-top: 1px solid #ccc;*/
   float: left;
   width: 220px;
   font-size: 0.87em;
+  line-height: 1.5;
+}
+
+.mode_show #dokuwiki__aside h1{
+  font-size: 1.25em;
+  margin-top: 1.25em;
+}
+
+.mode_show #dokuwiki__aside h1.sectionedit1{
+  margin-top: 0;
 }
 
+
 #dokuwiki__usertools,
 #dokuwiki__pagetools{
   padding: 10px;
@@ -124,16 +160,27 @@ div.breadcrumbs .bcsep{
 }
 
 #dokuwiki__usertools{
-  padding: 10px 0;
-  z-index: 1;
-  background: #edf1f2;
-  background: -moz-linear-gradient(top, #edf1f2 0%, #eaeaea 88%, #dbdfe0 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#edf1f2), color-stop(88%,#eaeaea), color-stop(100%,#dbdfe0));
-  background: -webkit-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%);
-  background: -o-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%);
-  background: -ms-linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#edf1f2', endColorstr='#dbdfe0',GradientType=0 );
-  background: linear-gradient(top, #edf1f2 0%,#eaeaea 88%,#dbdfe0 100%);
+  padding: 0;
+  z-index: 11;
+  background: transparent;
+}
+
+#dokuwiki__usertools .inner{
+  margin: 0 auto;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  background: #ffffff;
+  background: -moz-linear-gradient(top, #ffffff 0%, #f2f2f2 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f2f2f2));
+  background: -webkit-linear-gradient(top, #ffffff 0%,#f2f2f2 100%);
+  background: -o-linear-gradient(top, #ffffff 0%,#f2f2f2 100%);
+  background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f2f2f2',GradientType=0 );
+  background: linear-gradient(top, #ffffff 0%,#f2f2f2 100%);
+  width: 1004px;
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-top: none;
 }
 
 .wrapper #dokuwiki__pagetools ul, /* making a mess :P */
@@ -167,8 +214,7 @@ div.breadcrumbs .bcsep{
 #dokuwiki__sitetools li,
 #dokuwiki__usertools li,
 #dokuwiki__pagetools li{
-  margin-left: 0;
-  margin-right: 1em;
+  margin-left: 1em;
 }
 
 #dokuwiki__sitetools ul{
@@ -191,6 +237,11 @@ div.breadcrumbs .bcsep{
   box-shadow:inset 0 0 1px #eee;
 }
 
+#dokuwiki__header #dokuwiki__sitetools ul,
+#dokuwiki__header form.search{
+  text-align: right;
+}
+
 #dokuwiki__sitetools .button{
   border: 1px solid #ddd;
   -webkit-border-bottom-right-radius: 2px;
@@ -255,3 +306,52 @@ div.breadcrumbs .bcsep{
   padding: 0.5em 0.9em;
   color: #555;
 }
+
+.dokuwiki dl.code dt, .dokuwiki dl.file dt{
+  padding: 5px 8px 2px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom: 1px dashed #ccc;
+  background: -webkit-linear-gradient(top, #ffffff 0%,#eeeeee 100%);
+  margin-left: 0;
+}
+
+.dokuwiki dl.code dt, .dokuwiki dl.file dt a{
+  background-color: transparent;
+  padding: 0.2em 0 0.1em 1.6em;
+  font-size: 0.875em;
+  font-weight: normal;
+}
+
+.dokuwiki table.inline th, .dokuwiki table.inline td{
+  border: 1px solid #ccc;
+}
+
+.dokuwiki table.inline th{
+  background: #eee;
+}
+
+.dokuwiki div.toolbar button.toolbutton{
+  background: none;
+  background-color: #eee;
+  background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc));
+  background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%);
+  background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%);
+  background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 );
+  background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%);
+  border: 1px solid #ccc;
+  border-right: none;
+}
+
+.dokuwiki div.toolbar button.toolbutton:first-child{
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+.dokuwiki div.toolbar button.toolbutton:last-child{
+  border-left: 1px solid #eee;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
diff --git a/main.php b/main.php
index 76844b428..e230355a7 100755
--- a/main.php
+++ b/main.php
@@ -56,22 +56,24 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
                 <!-- USER TOOLS -->
                 <?php if ($conf['useacl'] && $showTools): ?>
                     <div id="dokuwiki__usertools">
-                        <h3 class="a11y"><?php echo tpl_getLang('user_tools') ?></h3>
-                        <ul>
-                            <?php /* the optional second parameter of tpl_action() switches between a link and a button,
-                                     e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */
-                                if ($_SERVER['REMOTE_USER']) {
-                                    echo '<li class="user">';
-                                    tpl_userinfo(); /* 'Logged in as ...' */
-                                    echo '</li>';
-                                }
-                                tpl_action('admin', 1, 'li');
-                                _tpl_action('userpage', 1, 'li');
-                                tpl_action('profile', 1, 'li');
-                                _tpl_action('register', 1, 'li'); /* DW versions > 2011-02-20 can use the core function tpl_action('register', 1, 'li') */
-                                tpl_action('login', 1, 'li');
-                            ?>
-                        </ul>
+                      <div class="inner">
+                          <h3 class="a11y"><?php echo tpl_getLang('user_tools') ?></h3>
+                          <ul>
+                              <?php /* the optional second parameter of tpl_action() switches between a link and a button,
+                                       e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */
+                                  if ($_SERVER['REMOTE_USER']) {
+                                      echo '<li class="user">';
+                                      tpl_userinfo(); /* 'Logged in as ...' */
+                                      echo '</li>';
+                                  }
+                                  tpl_action('admin', 1, 'li');
+                                  _tpl_action('userpage', 1, 'li');
+                                  tpl_action('profile', 1, 'li');
+                                  _tpl_action('register', 1, 'li'); /* DW versions > 2011-02-20 can use the core function tpl_action('register', 1, 'li') */
+                                  tpl_action('login', 1, 'li');
+                              ?>
+                          </ul>
+                        </div>
                     </div>
                 <?php endif ?>
 
@@ -161,5 +163,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
     <!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]-->
+    <div class="header_background"></div>
 </body>
 </html>