Author: dmagda
Date: Wed Nov 27 19:30:12 2019
New Revision: 1870519
URL: http://svn.apache.org/viewvc?rev=1870519&view=rev
Log:
updated the pages
Modified:
ignite/site/trunk/download.html
ignite/site/trunk/managedservices.html
Modified: ignite/site/trunk/download.html
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/download.html?rev=1870519&r1=1870518&r2=1870519&view=diff
==============================================================================
--- ignite/site/trunk/download.html (original)
+++ ignite/site/trunk/download.html Wed Nov 27 19:30:12 2019
@@ -106,10 +106,10 @@ under the License.
onclick="ga('send', 'event',
'community', 'top_menu_click', 'ignite_events');">
<i class="fa fa-calendar"
aria-hidden="true"></i> Events</a>
</li>
- <li><a href="/screencasts.html"
+ <!--li><a href="/screencasts.html"
onclick="ga('send', 'event',
'community', 'top_menu_click', 'screencasts');">
<i class="fa fa-video-camera"
aria-hidden="true"></i> Screencasts</a>
- </li>
+ </li-->
</ul>
</ul>
</div>
@@ -119,7 +119,7 @@ under the License.
</div>
<div class="row">
<div class="col-md-2 col-sm-2 col-xs-6">
- <div class="logo" style="width:150px;"><a
href="/index.html"><img src="/images/Ignite_tm_Logo_wht_RGB.svg"
alt="ApacheIgnite"></a></div>
+ <div class="logo" style="width:150px;"><a
href="/index.html"><img src="/images/ignite_logo_inv.svg" alt="Apache Ignite
Logo"></a></div>
</div>
<div class="col-md-10 col-sm-10 col-xs-6">
@@ -369,7 +369,8 @@ under the License.
<li><a
href="/managedservices.html">Managed Services</a></li>
</ul>
</li>
- <li class="dropdown download-button-visibilty"
style="cursor: pointer;">
+ <a
class="download-button-dropdown" href="/download.cgi">Download</a>
+ <!--li class="dropdown
download-button-visibilty" style="cursor: pointer;">
<a class="download-button-dropdown
dropdown-toggle" data-toggle="dropdown">Download<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a
href="/download.cgi#sources">Source Releases</a></li>
@@ -394,7 +395,7 @@ under the License.
<li class="divider"></li>
<li><a
href="/download.cgi#3rdparty">3<sup>rd</sup> Party Binaries</a></li>
</ul>
- </li>
+ </li-->
</ul>
</div>
</div>
@@ -1853,8 +1854,8 @@ under the License.
<div class="container">
<div class="row">
<div class="col-md-4 col-sm-5">
- <div class="logo"><a href="#wrapper"><img
src="/images/Ignite_tm_Logo_blk_RGB.svg"></a></div>
- <a href="https://donate.apache.org/";><img
src="/images/support-apache.png" height="50" width="50" style="margin-top:
30px; margin-left: 10px;"/></a>
+ <div class="logo"><a href="#wrapper"><img
src="/images/ignite_logo_full.svg"></a></div>
+ <a href="https://donate.apache.org/";><img
src="/images/support-apache-opt.png" height="50" width="50" style="margin-top:
30px; margin-left: 10px;"/></a>
</div>
<nav class="col-md-4 col-sm-3 footer-nav">
<!--<ul class="list-unstyled">-->
@@ -1875,6 +1876,23 @@ under the License.
or trademarks The Apache Software Foundation.
</p>
<ul class="social-networks list-unstyled">
+<<<<<<< .mine
+ <li><a
href="https://www.linkedin.com/company/apache-ignite"; aria-label="Linkedin"
class="icon-linkedin"
+ target="_blank" rel="noopener"></a></li>
+ <li><a href="https://twitter.com/ApacheIgnite";
aria-label="Twitter" class="icon-twitter" target="_blank"
rel="noopener"></a></li>
+ <li><a
href="https://plus.google.com/109419715166167783665"; aria-label="Google"
class="icon-google-plus"
+ target="_blank" rel="noopener"></a></li>
+ <li><a
href="https://www.facebook.com/Apache-Ignite-813431118713318/";
aria-label="Facebook" class="icon-facebook"
+ target="_blank" rel="noopener"></a></li>
+||||||| .r1870163
+ <li><a
href="https://www.linkedin.com/company/apache-ignite"; class="icon-linkedin"
+ target="_blank"></a></li>
+ <li><a href="https://twitter.com/ApacheIgnite";
class="icon-twitter" target="_blank"></a></li>
+ <li><a
href="https://plus.google.com/109419715166167783665"; class="icon-google-plus"
+ target="_blank"></a></li>
+ <li><a
href="https://www.facebook.com/Apache-Ignite-813431118713318/";
class="icon-facebook"
+ target="_blank"></a></li>
+=======
<li><a
href="https://www.linkedin.com/company/apache-ignite"; class="icon-linkedin"
target="_blank" rel="noopener"></a></li>
<li><a href="https://twitter.com/ApacheIgnite";
class="icon-twitter" target="_blank" rel="noopener"></a></li>
@@ -1882,6 +1900,7 @@ under the License.
target="_blank" rel="noopener"></a></li>
<li><a
href="https://www.facebook.com/Apache-Ignite-813431118713318/";
class="icon-facebook"
target="_blank" rel="noopener"></a></li>
+>>>>>>> .r1870517
</ul>
</div>
</div>
Modified: ignite/site/trunk/managedservices.html
URL:
http://svn.apache.org/viewvc/ignite/site/trunk/managedservices.html?rev=1870519&r1=1870518&r2=1870519&view=diff
==============================================================================
Binary files - no diff available.
