Merge branch 'pmd7-doc-logo' into 7.0.x

README.md

@@ -1,5 +1,7 @@
 # PMD
 
+![PMD Logo](https://raw.githubusercontent.com/pmd/pmd/pmd/7.0.x/docs/images/logo/pmd-logo-300px.png)
+
 [![Join the chat at https://gitter.im/pmd/pmd](https://badges.gitter.im/pmd/pmd.svg)](https://gitter.im/pmd/pmd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/pmd/pmd.svg?branch=master)](https://travis-ci.org/pmd/pmd)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.sourceforge.pmd/pmd/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.sourceforge.pmd/pmd)

docs/_includes/footer.html

@@ -1,9 +1,12 @@
 <footer>
             <div class="row">
                 <div class="col-lg-12 footer">
-               &copy;{{ site.time | date: "%Y"  }} {{site.company_name}}. All rights reserved. <br />
-{% if page.last_updated %}<span>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Site last generated: {{ site.time | date: "%b %-d, %Y"  }} <br />
-<p><img src="{{ "images/pmd-logo-small.png" }}" alt="Company logo"/></p>
+                    <p class="float-right"><img src="{{ "images/logo/pmd-logo-70px.png" }}" alt="PMD logo"/></p>
+                    <p>
+                        &copy;{{ site.time | date: "%Y"  }} {{site.company_name}}. All rights reserved. <br />
+                        {% if page.last_updated %}<span>Page last updated:</span> {{page.last_updated}}<br/>{% endif %}
+                        Site last generated: {{ site.time | date: "%b %-d, %Y"  }}
+                    </p>
                 </div>
             </div>
 </footer>

docs/_includes/head.html

@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="{{ "css/modern-business.css" }}">
 <link rel="stylesheet" href="{{ "css/lavish-bootstrap.css" }}">
 <link rel="stylesheet" href="{{ "css/customstyles.css" }}">
-<link rel="stylesheet" href="{{ "css/theme-blue.css" }}">
+<link rel="stylesheet" href="{{ "css/theme-green.css" }}">
 <link rel="stylesheet" href="{{ "css/pmd-customstyles.css" }}">
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>

docs/css/pmd-customstyles.css

@@ -84,3 +84,15 @@ details[open] summary {
 .xpath-fun-doc .code-examples dt {
     font-weight: normal;
 }
+
+.float-right {
+    float: right;
+}
+
+.float-left {
+    float: left;
+}
+
+.footer p img {
+    margin-left: 1em;
+}

docs/css/theme-green.css

@@ -1,11 +1,11 @@
 .summary {
     color: #808080;
-    border-left: 5px solid #E50E51;
+    border-left: 5px solid #4d94ff;
     font-size:16px;
 }
 
 
-h3 {color: #E50E51; }
+h3 {color: #4d94ff; }
 h4 {color: #808080; }
 
 .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
@@ -14,20 +14,20 @@ h4 {color: #808080; }
 }
 
 .nav > li.active > a {
-    background-color: #72ac4a;
+    background-color: #01c172;
 }
 
 .nav > li > a:hover {
-    background-color: #72ac4a;
+    background-color: #01c172;
 }
 
 div.navbar-collapse .dropdown-menu > li > a:hover {
-    background-color: #72ac4a;
+    background-color: #01c172;
 }
 
 .nav li.thirdlevel > a {
     background-color: #FAFAFA !important;
-    color: #72ac4a;
+    color: #01c172;
     font-weight: bold;
 }
 
@@ -38,7 +38,7 @@ a[data-toggle="tooltip"] {
 }
 
 .navbar-inverse {
-    background-color: #72ac4a;
+    background-color: #01c172;
     border-color: #5b893c;
 }
 
@@ -53,7 +53,7 @@ a[data-toggle="tooltip"] {
 
 /* not sure if using this ...*/
 .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form {
-    border-color: #72ac4a !important;
+    border-color: #01c172 !important;
 }
 
 .btn-primary {
@@ -67,7 +67,7 @@ a[data-toggle="tooltip"] {
 .btn-primary:active,
 .btn-primary.active,
 .open .dropdown-toggle.btn-primary {
-    background-color: #72ac4a;
+    background-color: #01c172;
     border-color: #5b893c;
 }
 
@@ -77,7 +77,7 @@ a[data-toggle="tooltip"] {
 
 body.print h1 {color: #5b893c !important; font-size:28px;}
 body.print h2 {color: #595959 !important; font-size:24px;}
-body.print h3 {color: #E50E51 !important; font-size:14px;}
+body.print h3 {color: #4d94ff !important; font-size:14px;}
 body.print h4 {color: #679DCE !important; font-size:14px; font-style: italic;}
 
 .anchorjs-link:hover {
@@ -85,14 +85,14 @@ body.print h4 {color: #679DCE !important; font-size:14px; font-style: italic;}
 }
 
 div.sidebarTitle {
-    color: #E50E51;
+    color: #4d94ff;
 }
 
 li.sidebarTitle {
     margin-top:40px;
     font-weight:normal;
     font-size:130%;
-    color: #ED1951;
+    color: #4d94ff;
     margin-bottom:10px;
     margin-left: 5px;
 

docs/index.md

@@ -12,6 +12,7 @@ author: Jeff Jensen <jjensen@apache.org>, Andreas Dangel <andreas.dangel@adangel
         Clément Fournier <clement.fournier76@gmail.com>
 ---
 
+<!-- {% include image.html file="logo/pmd-logo-300px.png" alt="PMD Logo" %} -->
 
 
 {% unless site.output == "pdf" %}
@@ -144,8 +145,6 @@ you may also use the search bar in the top right, or the sidebar on the left.
 </div>
 </div>
 
-<!-- {% include image.html file="pmd-logo-big.png" alt="PMD Logo" %} -->
-
 {% unless site.output == "pdf" %}
 
 {% include initialize_shuffle.html %}

docs/pages/next_major_development.md

@@ -18,6 +18,8 @@ the logo in anywhere without offense.
 
 The current tasks are listed here: [Integrate new PMD logo #1931](https://github.com/pmd/pmd/issues/1931)
 
+The new logo is available from the [Logo Project Page](pmd_projectdocs_logo.html).
+
 ### API
 
 The API of PMD has been growing over the years and needs to be cleaned up. The goal is, to