nifi-site git commit: Added ApacheCon logo

[pvillard]

Repository: nifi-site
Updated Branches:
  refs/heads/master dc6bc4729 -> 7a857a151


Added ApacheCon logo


Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/7a857a15
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/7a857a15
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/7a857a15

Branch: refs/heads/master
Commit: 7a857a151356521b090da60e437ae26f70d69da5
Parents: dc6bc47
Author: Pierre Villard <pierre.villard...@gmail.com>
Authored: Mon Apr 9 17:52:19 2018 +0200
Committer: Pierre Villard <pierre.villard...@gmail.com>
Committed: Mon Apr 9 17:52:19 2018 +0200

----------------------------------------------------------------------
 src/includes/disclaimer.hbs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/7a857a15/src/includes/disclaimer.hbs
----------------------------------------------------------------------
diff --git a/src/includes/disclaimer.hbs b/src/includes/disclaimer.hbs
index a33ae61..cde3c08 100644
--- a/src/includes/disclaimer.hbs
+++ b/src/includes/disclaimer.hbs
@@ -1,7 +1,10 @@
 <div class="row">
     <div class="large-12 columns footer">
         <a href="https://www.apache.org";>
-            <img id="asf-logo" alt="Apache Software Foundation" 
src="{{assets}}/images/asf_logo.png" width="200">
+            <img id="asf-logo" alt="Apache Software Foundation" 
src="{{assets}}/images/asf_logo.png" width="200" style="margin:0px 10px" />
+        </a>
+        <a  href="http://www.apache.org/events/current-event.html";>
+            <img src="http://www.apache.org/events/current-event-234x60.png"; 
style="margin:0px 10px" />
         </a>
         <div id="copyright">
             <p>Copyright &#169; 2017 The Apache Software Foundation, Licensed 
under the <a