Merge branch 'master' into fancypodcast

[ikiwiki.git] / themes / actiontabs / style.css

diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
index f48448e2ee35e26328a3fd45d17598b30551cf20..d4afc0915b86a44ce2ad20d5d9e574e17abae945 100644 (file)
--- a/themes/actiontabs/style.css
+++ b/themes/actiontabs/style.css
@@ -37,15 +37,21 @@ body {
 
 .pageheader {
        margin: 0;
-       padding: 1em 2em 0 2em;
+       padding: 1em 2em;
+       position: relative;
+       overflow: hidden;
        background: #eee;
        border-color: #999;
        border-style: none none solid none;
        border-width: 1px;
 }
 
+.pageheader .header {
+       float: left;
+       font-size: 120%;
+}
+
 .header {
-       font-size: 100%;
        font-weight: normal;
 }
 
@@ -53,16 +59,25 @@ body {
        display: block;
        margin-top: .2em;
        font: 140% sans-serif;
-       text-transform: capitalize;
 }
 
-.actions {
+#searchform {
+       position: absolute;
+       top: 0.5em;
+       right: 2em;
+}
+
+.pageheader .actions {
+       position: absolute;
+       bottom: 0;
+       right: 2em;
+       width: 100%;
        text-align: right;
-       padding: 0;
+       padding: 2px;
 }
 
-#content, #comments, #footer {
-       margin: 1em 2em;
+#content, #enclosure, #comments, #footer {
+       margin: 1em 2em;
 }
 
 #pageinfo {
@@ -78,13 +93,11 @@ body {
 
 .inlineheader {
        font-size: 120%;
-       font-weight: normal;
 }
 
 h1 { font: 120% sans-serif }
 h2 { font: bold 100% sans-serif }
-h3 { font: italic 100% sans-serif }
-h4, h5, h6 { font: small-caps 100% sans-serif }
+h3, h4, h5, h6 { font: bold 80% sans-serif }
 
 /* Smaller headings for inline pages */
 .inlinepage h1 { font-size: 110% }
@@ -96,7 +109,6 @@ h4, h5, h6 { font: small-caps 100% sans-serif }
 }
 
 .actions ul {
-       font-size: 75%;
        padding: 0;
        border-style: none;
 }
@@ -105,7 +117,7 @@ h4, h5, h6 { font: small-caps 100% sans-serif }
        text-decoration: none;
 }
 
-.actions ul li {
+.pageheader .actions ul li {
        margin: 0;
        padding: .1em .5em 0 .5em;
        background: white;
@@ -121,3 +133,17 @@ div.recentchanges {
 .pagecloud {
        width: auto;
 }
+
+.sidebar {
+        border-bottom: 0;
+       border-right: 0;
+       border-top: 0;
+       margin-top: 0.5em;
+       padding: 0 0 0 2ex;
+       border-color: #999;
+}
+
+.pageheader .trails {
+       /* allow space for the action tabs */
+       margin-bottom: 2em;
+}