changeset 2164:5162d3e8ba06

Merge.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 11 Oct 2019 07:38:30 +0300
parents dded23313b4f (current diff) ed5417ec9924 (diff)
children b86fcd501e1c
files www/maps.css
diffstat 4 files changed, 2 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/www/faq.php	Fri Oct 11 07:38:01 2019 +0300
+++ b/www/faq.php	Fri Oct 11 07:38:30 2019 +0300
@@ -4,6 +4,6 @@
 require "mfaq.inc.php";
 
 mpPrintPageHeader($pageTitle);
-cmPrintFAQ("Frequently Asked Questions", "faq.xml");
+cmPrintFAQ("Infrequently Asked Questions", "faq.xml");
 mpPrintPageFooter();
 ?>
\ No newline at end of file
--- a/www/faq.xml	Fri Oct 11 07:38:01 2019 +0300
+++ b/www/faq.xml	Fri Oct 11 07:38:30 2019 +0300
@@ -51,8 +51,7 @@
 <ul>
  <li><b>Ooga</b> - Did the original mapping of new continents, providing raw
  mapdata and some locations. His work was invaluable in the early days of
- the project. He still maintains <a href="http://www.zerobelow.net/maps/">his own popular mapsite</a>, which is nowadays
- based on PupuMaps location data, however.
+ the project.
  </li>
  <li><b>Jeskko</b> - Did his own <a href="http://jeskko.pupunen.net/">Google Maps-style
  implementation</a>, which has become rather popular. Worked with BatMUD staff
--- a/www/maps.css	Fri Oct 11 07:38:01 2019 +0300
+++ b/www/maps.css	Fri Oct 11 07:38:30 2019 +0300
@@ -434,7 +434,4 @@
 
 
 #controls button {
-	font-size: 0.75em;
-	padding-left: 0.1em;
-	padding-right: 0.1em;
 }
--- a/www/search.css	Fri Oct 11 07:38:01 2019 +0300
+++ b/www/search.css	Fri Oct 11 07:38:30 2019 +0300
@@ -17,11 +17,6 @@
 	color: yellow;
 }
 
-h1 {
-  font-size: 1.3em;
-  margin: 0.2em;
-}
-
 h2 {
   font-size: 0.75em;
   margin: 0.2em;