You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/12/24 21:19:33 UTC

[arrow] branch master updated: ARROW-2504: [Website] Add ApacheCon NA link

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new cd543b9  ARROW-2504: [Website] Add ApacheCon NA link
cd543b9 is described below

commit cd543b9756d602ebabda749c60a14d629db7a35a
Author: Tanya Schlusser <ta...@tickel.net>
AuthorDate: Mon Dec 24 15:19:26 2018 -0600

    ARROW-2504: [Website] Add ApacheCon NA link
    
    Place a 234x60 link in the navbar next to the Apache Software Foundation link.
    
    Screenshot for full width:
    ![image](https://user-images.githubusercontent.com/7432951/48995065-1213f700-f10c-11e8-944f-e5d26f1bfe8b.png)
    
    Screenshot for medium width:
    ![image](https://user-images.githubusercontent.com/7432951/48995076-1b04c880-f10c-11e8-8abf-a3d2ef204596.png)
    
    Disappears in small width -- screenshot:
    ![image](https://user-images.githubusercontent.com/7432951/48995108-31128900-f10c-11e8-96a7-066e377081fa.png)
    
    Author: Tanya Schlusser <ta...@tickel.net>
    
    Closes #3030 from tanyaschlusser/master and squashes the following commits:
    
    77c6cd323 <Tanya Schlusser> ARROW-2504:  Add ApacheCon NA link
---
 site/_includes/header.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/site/_includes/header.html b/site/_includes/header.html
index e0f23ec..5344501 100644
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -77,9 +77,14 @@
           </div>
         </li>
       </ul>
-      <a href="http://www.apache.org/" class="flex-row ml-md-auto">
-        <img style="float:right;" src="{{ site.baseurl }}/img/asf_logo.svg" width="120px"/>
-      </a>
+      <div class="flex-row justify-content-end ml-md-auto">
+        <a class="d-sm-none d-md-inline pr-2" href="https://www.apache.org/events/current-event.html">
+          <img src="https://www.apache.org/events/current-event-234x60.png"/>
+        </a>
+        <a href="http://www.apache.org/">
+          <img src="{{ site.baseurl }}/img/asf_logo.svg" width="120px"/>
+        </a>
+      </div>
       </div><!-- /.navbar-collapse -->
     </div>
   </nav>