[phpwiki-checkins] SF.net SVN: phpwiki:[9831] trunk/themes/fusionforge

[<var...@us...>]

Revision: 9831
          http://sourceforge.net/p/phpwiki/code/9831
Author:   vargenau
Date:     2016-04-08 12:48:25 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Fix Fusionforge CSS for Bootstrap

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge.css
    trunk/themes/fusionforge/templates/body.tmpl

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2016-04-08 12:44:30 UTC (rev 9830)
+++ trunk/themes/fusionforge/fusionforge.css	2016-04-08 12:48:25 UTC (rev 9831)
@@ -51,6 +51,10 @@
     color: #565c5e; /* Alcatel-Lucent grey */
 }
 
+textarea {
+    font-family: monospace;
+}
+
 form {
     margin: 0;
 }
@@ -61,11 +65,11 @@
 }
 
 h1 {
-    font-size: 1.8em;
+    font-size: 1.6em;
 }
 
 h2 {
-    font-size: 1.6em;
+    font-size: 1.4em;
     line-height: 1.1em;
 }
 
@@ -89,16 +93,14 @@
 
 /* Titles in the page. */
 h1, .titlebar, .widget_titlebar {
-    padding-top: 4px;
-    padding-bottom: 6px;
-    vertical-align: middle;
+    border-bottom: 2px solid #bcbcad;
+    padding-bottom: 3px;
     font-family: 'trebuchet MS', Arial, Helvetica, sans-serif;
-    color: #124191;
+    color: #124191; /* Nokia blue */
+    font-size: 1.6em;
     font-weight: normal;
-    font-size: 1.8em;
     line-height: 1.3em;
     text-align: left;
-    height: 24px;
     margin-top: 4px;
 }
 
@@ -124,6 +126,8 @@
     margin-bottom: 0.3em;
 }
 
+.wikitext input { display: inline; }
+
 input {
     margin: 0.1em;
 }
@@ -440,20 +444,21 @@
     font-weight: bold;
 }
 
-nav, nav ul {
+nav#actionbuttons, nav#actionbuttons ul {
     padding: 0;
 }
 
-nav ul {
+nav#actionbuttons ul {
     display: inline;
     margin-right: 10px;
+    margin-left: -10px;
 }
 
 #actionbuttons {
     white-space: nowrap;
-    margin-left: 0;
+    margin-left: 10px;
     margin-top: 10px;
-    margin-bottom: 0;
+    margin-bottom: -1px;
 }
 
 #actionbuttons .named-wiki,
@@ -477,6 +482,7 @@
     padding-left: 0.8em;
     padding-right: 0.8em;
     margin-right: 10px;
+    margin-left: 0;
 }
 
 #actionbuttons li.bold a {
@@ -504,6 +510,7 @@
 
 /* Make the textarea the full page width */
 textarea.wikiedit {
+    font-family: monospace;
     width: 100%;
     margin-bottom: 0.5ex;
     margin-top: 0.5ex;

Modified: trunk/themes/fusionforge/templates/body.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/body.tmpl	2016-04-08 12:44:30 UTC (rev 9830)
+++ trunk/themes/fusionforge/templates/body.tmpl	2016-04-08 12:48:25 UTC (rev 9831)
@@ -17,7 +17,7 @@
 <a id="contentTop"></a>
 <h1>
 <span class="firstHeading<?php echo $rating ? '-rating' : '' ?>">
-<span style="float: left;"><?php echo $HEADER ?></span>
+<?php echo $HEADER ?>
 <?php if ($rating && $request->getArg('action') == 'browse') { ?>
 <span style="float: right;">
 <?php echo Template('ratings') ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.