improve style

git-svn-id: https://svn.dealii.org/trunk@31805 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/doxygen/CMakeLists.txt b/deal.II/doc/doxygen/CMakeLists.txt
index 56723a24cd3d52c8cf9fa4e7cee1b4c670bffc60..44a7ae3d42aa94f88fa75a516d9c3ecf0115771a 100644 (file)
--- a/deal.II/doc/doxygen/CMakeLists.txt
+++ b/deal.II/doc/doxygen/CMakeLists.txt
@@ -41,18 +41,31 @@ CONFIGURE_FILE(
   COPYONLY
   )
 
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css
+  ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css
+  COPYONLY
+  )
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/images/logo200.png
+  ${CMAKE_CURRENT_BINARY_DIR}/logo200.png
+  COPYONLY
+  )
+
 #
 # Generate header, footer and style files for doxygen
 #
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/header.html
   ${CMAKE_CURRENT_BINARY_DIR}/footer.html
-  ${CMAKE_CURRENT_BINARY_DIR}/style.css
   COMMAND ${DOXYGEN_EXECUTABLE} -w html header.html footer.html style.css options.dox
   COMMAND ${PERL_EXECUTABLE} -pi~ ${CMAKE_SOURCE_DIR}/doc/doxygen/scripts/mod_header.pl header.html
   COMMAND ${PERL_EXECUTABLE} -pi~ ${CMAKE_SOURCE_DIR}/doc/doxygen/scripts/mod_footer.pl footer.html
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/options.dox
+  ${CMAKE_SOURCE_DIR}/doc/doxygen/scripts/mod_header.pl
+  ${CMAKE_SOURCE_DIR}/doc/doxygen/scripts/mod_footer.pl
   )
 
 #

diff --git a/deal.II/doc/doxygen/headers/main.h b/deal.II/doc/doxygen/headers/main.h
index 8f4995fa9a26cf560dedc542c9bbdbf16e53c5b0..dd728dd4330535db8cbdf6dfaa23b996f11571a8 100644 (file)
--- a/deal.II/doc/doxygen/headers/main.h
+++ b/deal.II/doc/doxygen/headers/main.h
@@ -18,8 +18,6 @@
 /**
  * @mainpage
  *
- * @image html logo200.png
- *
  * This is the main starting page for the deal.II class and function
  * documentation.  Documentation on other aspects, such as the build system,
  * can be found elsewhere. In addition, there are <a

diff --git a/deal.II/doc/doxygen/options.dox.in b/deal.II/doc/doxygen/options.dox.in
index 20e6c8943bcdfe338010415fe0e8104a1b94b5ea..3f5c114cb9a4a380fcd62c66b0542617234326a9 100644 (file)
--- a/deal.II/doc/doxygen/options.dox.in
+++ b/deal.II/doc/doxygen/options.dox.in
@@ -1,8 +1,9 @@
 # This file contains project-specific configurations for the 
 # deal.II documentation.
 
-PROJECT_NAME           = "The deal.II library"
+PROJECT_NAME           = "The deal.II Library"
 PROJECT_NUMBER         = "Reference documentation for deal.II version @DEAL_II_PACKAGE_VERSION@"
+PROJECT_LOGO           = "logo200.png"
 OUTPUT_DIRECTORY       = .
 
 # The doxygen documentation says this about the following flag:
@@ -100,6 +101,9 @@ HTML_FOOTER            = footer.html
 USE_MATHJAX            = YES
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 MATHJAX_EXTENSIONS     = TeX/AMSmath TeX/AMSsymbols
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 200
+HTML_EXTRA_STYLESHEET  = stylesheet.css
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------

diff --git a/deal.II/doc/doxygen/scripts/mod_footer.pl b/deal.II/doc/doxygen/scripts/mod_footer.pl
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..149545d707619e6ac7020d42662910d48cf67aac 100644 (file)
--- a/deal.II/doc/doxygen/scripts/mod_footer.pl
+++ b/deal.II/doc/doxygen/scripts/mod_footer.pl
@@ -0,0 +1,15 @@
+
+use Sys::Hostname;
+my $host = hostname;
+
+my $hosting = << 'EOT'
+&nbsp;&nbsp; Hosting provided by
+<a href="http://www.iwr.uni-heidelberg.de/"><img src="http://www.dealii.org/pictures/IWRlogo4.png" alt="IWR"></a>
+<a href="http://www.uni-heidelberg.de/"><img src="http://www.dealii.org/pictures/UniLogo4.png" alt="Universität Heidelberg"></a>
+EOT
+    ;
+
+if ($host eq "simweb")
+{
+    s/\$doxygenversion/\$doxygenversion $hosting/;
+}

diff --git a/deal.II/doc/doxygen/scripts/mod_header.pl b/deal.II/doc/doxygen/scripts/mod_header.pl
index 96debb8297769ea0c9aea86dfcea57e4cb5726a5..d2d5a1da9976552a927a6287c173c43df04070cc 100644 (file)
--- a/deal.II/doc/doxygen/scripts/mod_header.pl
+++ b/deal.II/doc/doxygen/scripts/mod_header.pl
@@ -12,3 +12,5 @@ if (m'</head>')
     print '<meta name="copyright" content="Copyright (C) 1998 - ', $year, ' by the deal.II authors"></meta>', "\n";
     print '<meta name="deal.II-version" content="', $version, '"></meta>', "\n";
 }
+
+s/\$projectname// unless (m/<title>/);

diff --git a/deal.II/doc/doxygen/stylesheet.css b/deal.II/doc/doxygen/stylesheet.css
index ba968f6bbda9154f5984f6f50381777d2282d4bf..5ac8648c74731c99c2ce661083274db19a92a3a4 100644 (file)
--- a/deal.II/doc/doxygen/stylesheet.css
+++ b/deal.II/doc/doxygen/stylesheet.css
@@ -1,324 +1,6 @@
-//
-// Copyright (C) 1998 - 2013 by the deal.II authors
-//
 
-h1, h2, h3, h4, h5, h6 {
-    color: Black;
-    background: none;
-    font-weight: normal;
-    margin: 0;
-    padding-top: 0.5em;
-    padding-bottom: 0.17em;
-    border-bottom: 1px solid #aaaaaa;
-}
-
-h1 {
-       font-size: 175%;
-}
-
-h2 {
-       font-size: 144%;
-       font-weight: bold;
-}
-
-h3 { font-size: 120%;
-     padding-bottom: 0.17em;
-     font-weight: bold;
-     border-bottom: 1px dashed #aaaaaa; }
-h4 { font-size: 110%; 
-     border-bottom: none;
-     font-weight: bold;
-}
-h5 { font-size: 100%; 
-     border-bottom: none;
-     font-weight: bold;
-}
-h6 { font-size: 80%;  
-     border-bottom: none;
-     font-weight: bold;
-}
-
-h1.head {
-       position:relative;
-        text-align:center;
-       font-weight: bold;
-       color:black;
-       padding-top: 10px;
-       padding-bottom: 10px;
-       border-bottom: 0;
-}
-
-div.head {
-       background-color: #CCD8E8; 
-       border: 1px solid #B0B0B0;
-       width: 100%;
-       margin: 2px;
-       padding: 2px;
-        text-align:center;
-}
-
-CAPTION { font-weight: bold }
-DIV.qindex {
-       width: 100%;
-       background-color: #eeeeff;
-       border: 1px solid #B0B0B0;
-       text-align: center;
-       margin: 2px;
-       padding: 2px;
-}
-A.qindex {
-       text-decoration: none;
-       font-weight: bold;
-       color: #1A419D;
-       padding: 2px;
-}
-A.qindex:visited {
-       text-decoration: none;
-       font-weight: bold;
-       color: #1A419D
-       padding: 2px;
-}
-A.qindex:hover {
-       text-decoration: none;
-       background-color: #ddddff;
-       padding: 2px;
-}
-A.qindexHL {
-       text-decoration: none;
-       font-weight: bold;
-       background-color: #6666cc;
-       color: #ffffff;
-       padding: 2 6px;
-       border: 1px double #9295C2;
-           }
-A.qindexHL:hover {
-       text-decoration: none;
-       background-color: #6666cc;
-       color: #ffffff;
-       padding: 2px 6px;
-}
-A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
-A.el { text-decoration: none; font-weight: normal; color: #1A41FF;  }
-A.el:visited { text-decoration: none; font-weight: normal; color: #1A41B0; }
-A.elRef { font-weight: bold }
-A.code { text-decoration: none; font-weight: normal; color: #1A419D}
-A.codeRef { font-weight: normal; color: #1A419D}
-A:hover { text-decoration: none; background-color: #f2f2ff }
-DL.el { margin-left: -1cm }
-PRE.fragment {
-       background-color: #f5f5f5;
-       margin-top: 4px;
-       margin-bottom: 4px;
-       margin-left: 2px;
-       margin-right: 8px;
-}
-DIV.fragment {
-       border: 1px solid #CCCCCC;
-       background-color: #f5f5f5;
-       padding: 6px;
-}
-DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
-TD.md { background-color: #F4F4FB; font-weight: bold; }
-TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; }
-TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020; width: 600px; }
-DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold }
-DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }
-BODY {
-       background: white;
-       color: black;
-       margin-right: 20px;
-       margin-left: 20px;
-       font-family: sans-serif;
-}
-TD.indexkey {
-       background-color: #eeeeff;
-       font-weight: bold;
-       padding-right  : 10px;
-       padding-top    : 2px;
-       padding-left   : 10px;
-       padding-bottom : 2px;
-       margin-left    : 0px;
-       margin-right   : 0px;
-       margin-top     : 2px;
-       margin-bottom  : 2px;
-       border: 1px solid #CCCCCC;
-}
-TD.indexvalue {
-       background-color: #eeeeff;
-       font-style: italic;
-       padding-right  : 10px;
-       padding-top    : 2px;
-       padding-left   : 10px;
-       padding-bottom : 2px;
-       margin-left    : 0px;
-       margin-right   : 0px;
-       margin-top     : 2px;
-       margin-bottom  : 2px;
-       border: 1px solid #CCCCCC;
-}
-TR.memlist {
-   background-color: #f0f0f0; 
-}
-P.formulaDsp { text-align: center; }
-IMG.formulaDsp { }
-IMG.formulaInl { vertical-align: middle; }
-SPAN.keyword       { color: #008000 }
-SPAN.keywordtype   { color: #604020 }
-SPAN.keywordflow   { color: #e08000 }
-SPAN.comment       { color: #800000 }
-SPAN.preprocessor  { color: #806020 }
-SPAN.stringliteral { color: #002080 }
-SPAN.charliteral   { color: #008080 }
-.mdTable {
-       border: 1px solid #868686;
-       background-color: #F4F4FB;
-}
-.mdRow {
-       padding: 8px 10px;
-}
-.mdescLeft {
-       font-size: smaller;
-       font-family: Arial, Helvetica, sans-serif;
-       background-color: #FAFAFA;
-       padding-left: 8px;
-       border-top: 1px none #E0E0E0;
-       border-right: 1px none #E0E0E0;
-       border-bottom: 1px none #E0E0E0;
-       border-left: 1px none #E0E0E0;
-       margin: 0px;
-}
-.mdescRight {
-       font-size: smaller;
-       font-family: Arial, Helvetica, sans-serif;
-       font-style: italic;
-       background-color: #FAFAFA;
-       padding-left: 4px;
-       border-top: 1px none #E0E0E0;
-       border-right: 1px none #E0E0E0;
-       border-bottom: 1px none #E0E0E0;
-       border-left: 1px none #E0E0E0;
-       margin: 0px;
-       padding-bottom: 0px;
-       padding-right: 8px;
-}
-.memItemLeft {
-       padding: 1px 0px 0px 8px;
-       margin: 4px;
-       border-top-width: 1px;
-       border-right-width: 1px;
-       border-bottom-width: 1px;
-       border-left-width: 1px;
-       border-top-style: solid;
-       border-top-color: #E0E0E0;
-       border-right-color: #E0E0E0;
-       border-bottom-color: #E0E0E0;
-       border-left-color: #E0E0E0;
-       border-right-style: none;
-       border-bottom-style: none;
-       border-left-style: none;
-       background-color: #FAFAFA;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-       font-size: 12px;
-}
-.memItemRight {
-       padding: 1px 0px 0px 8px;
-       margin: 4px;
-       border-top-width: 1px;
-       border-right-width: 1px;
-       border-bottom-width: 1px;
-       border-left-width: 1px;
-       border-top-style: solid;
-       border-top-color: #E0E0E0;
-       border-right-color: #E0E0E0;
-       border-bottom-color: #E0E0E0;
-       border-left-color: #E0E0E0;
-       border-right-style: none;
-       border-bottom-style: none;
-       border-left-style: none;
-       background-color: #FAFAFA;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-       font-size: 13px;
-}
-.memTemplItemLeft {
-       padding: 1px 0px 0px 8px;
-       margin: 4px;
-       border-top-width: 1px;
-       border-right-width: 1px;
-       border-bottom-width: 1px;
-       border-left-width: 1px;
-       border-top-style: solid;
-       border-top-color: #E0E0E0;
-       border-right-color: #E0E0E0;
-       border-bottom-color: #E0E0E0;
-       border-left-color: #E0E0E0;
-       border-right-style: none;
-       border-bottom-style: none;
-       border-left-style: none;
-       background-color: #FAFAFA;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-       font-size: 12px;
-}
-.memTemplParams {
-       padding: 1px 0px 0px 8px;
-       margin: 4px;
-       border-top-width: 1px;
-       border-right-width: 1px;
-       border-bottom-width: 1px;
-       border-left-width: 1px;
-       border-top-style: solid;
-       border-top-color: #E0E0E0;
-       border-right-color: #E0E0E0;
-       border-bottom-color: #E0E0E0;
-       border-left-color: #E0E0E0;
-       border-right-style: none;
-       border-bottom-style: none;
-       border-left-style: none;
-       background-color: #FAFAFA;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-       font-size: 12px;
-}
-.memTemplItemRight {
-       padding: 1px 0px 0px 8px;
-       margin: 4px;
-       border-top-width: 1px;
-       border-right-width: 1px;
-       border-bottom-width: 1px;
-       border-left-width: 1px;
-       border-top-style: solid;
-       border-top-color: #E0E0E0;
-       border-right-color: #E0E0E0;
-       border-bottom-color: #E0E0E0;
-       border-left-color: #E0E0E0;
-       border-right-style: none;
-       border-bottom-style: none;
-       border-left-style: none;
-       background-color: #FAFAFA;
-       font-family: Geneva, Arial, Helvetica, sans-serif;
-       font-size: 13px;
-}
-.search     { color: #003399;
-              font-weight: bold;
-}
-FORM.search {
-              margin-bottom: 0px;
-              margin-top: 0px;
-}
-INPUT.search { font-size: 75%;
-               color: #000080;
-               font-weight: normal;
-               background-color: #eeeeff;
-}
-TD.tiny      { font-size: 75%;
-}
-
-dt.glossary {
-              font-size: large;
-              font-weight: bold;
-}
-table.tutorial {
-    color: black;
-    border: 1px solid #aaa;
-    background-color: #f9f9f9;
-    padding: 5px;
-    font-size: 95%;
+#titlearea
+{
+    background-color: #0000ff;
+    color: #80ff00;
 }