Merge branch 'master' of git://github.com/splitbrain/dokuwiki

5 files changed, 35 insertions, 4 deletions

diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css
index 7ac489929..19e2c4853 100644
--- a/lib/tpl/default/_mediaoptions.css
+++ b/lib/tpl/default/_mediaoptions.css
@@ -5,7 +5,7 @@
     display:none;
     border: 1px solid __border__;
     position: absolute;
-    width:270px;
+    width:280px;
 }
 
 #media__popup h1 {
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index d9231678b..754a6e482 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die();
 
   <?php tpl_metaheaders()?>
 
-  <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" />
+  <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" />
 
   <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
 </head>
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 2831c984f..d412fd9cf 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -1,5 +1,5 @@
 /**
- * The CSS in here cotrols the appearance of the media manager
+ * The CSS in here controls the appearance of the media manager
  */
 
 #media__manager {
diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css
index 60c172585..15c6dad29 100644
--- a/lib/tpl/default/print.css
+++ b/lib/tpl/default/print.css
@@ -43,6 +43,14 @@ div.secedit {
   display: none;
 }
 
+div.clearer {
+  clear: both;
+  line-height: 0;
+  height: 0;
+  overflow: hidden;
+}
+
+
 /* --------------------- Text formating -------------------------------- */
 
 /* external link */
@@ -114,6 +122,21 @@ img.mediaright {
   margin: 0 0 0 1.5em;
 }
 
+img.mediacenter {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* underline */
+em.u {
+  font-style: normal;
+  text-decoration: underline;
+}
+em em.u {
+  font-style: italic;
+}
+
 /* unordered lists */
 ul {
     line-height: 1.5em;
diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index 6c2d1fbd2..e40dd966d 100644
--- a/lib/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css
@@ -1,5 +1,5 @@
 /**
- * Layout and dedsign corrections for right-to-left languages
+ * Layout and design corrections for right-to-left languages
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Dotan Kamber <kamberd@yahoo.com>
@@ -145,3 +145,11 @@ div.dokuwiki blockquote {
     text-align: right;
 }
 
+/* Search corrections */
+div.dokuwiki ul.search_quickhits li {
+    float: right;
+}
+
+div#qsearch__out {
+    text-align: right;
+}