Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to the latest template #5

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 71 additions & 30 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,43 @@
<h2 class="section-title">Eclipse Foundation</h2>
<ul class="nav">
<li><a href="https://www.eclipse.org/org/">About Us</a></li>
<li><a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li>
<li><a href="https://www.eclipse.org/donate">Donate</a></li>
<li><a href="https://www.eclipse.org/membership/">Members</a></li>
<li><a href="https://www.eclipse.org/org/documents/">Governance</a></li>
<li><a href="https://www.eclipse.org/org/documents/Community_Code_of_Conduct.php">Code of Conduct</a></li>
<li><a href="https://www.eclipse.org/artwork/">Logo and Artwork</a></li>
<li><a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
<li>
<a href="https://www.eclipse.org/org/foundation/contact.php">Contact Us</a>
</li>
<li><a href="https://www.eclipse.org/sponsor">Sponsor</a></li>
<li><a href="https://www.eclipse.org/membership">Members</a></li>
<li>
<a href="https://www.eclipse.org/org/documents/">Governance</a>
</li>
<li>
<a
href="https://www.eclipse.org/org/documents/Community_Code_of_Conduct.php">Code of Conduct</a
>
</li>
<li>
<a href="https://www.eclipse.org/artwork/">Logo and Artwork</a>
</li>
<li>
<a href="https://www.eclipse.org/org/foundation/directors.php">Board of Directors</a>
</li>
<li><a href="https://www.eclipse.org/careers/">Careers</a></li>
</ul>
</section>
<section class="col-sm-6 hidden-print" id="footer-legal">
<h2 class="section-title">Legal</h2>
<ul class="nav">
<li><a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li>
<li><a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
<li><a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a></li>
<li><a href="https://www.eclipse.org/legal/epl-2.0/">Eclipse Public License</a></li>
<li>
<a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a>
</li>
<li>
<a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a>
</li>
<li>
<a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a>
</li>
<li>
<a href="https://www.eclipse.org/legal/epl-2.0/">Eclipse Public License</a>
</li>
<li><a href="https://www.eclipse.org/legal/">Legal Resources</a></li>
</ul>
</section>
Expand All @@ -32,7 +53,9 @@ <h2 class="section-title">Useful Links</h2>
<ul class="nav">
<li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
<li><a href="//help.eclipse.org/">Documentation</a></li>
<li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
<li>
<a href="https://www.eclipse.org/contribute/">How to Contribute</a>
</li>
<li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
<li><a href="https://www.eclipse.org/forums/">Forums</a></li>
<li><a href="//marketplace.eclipse.org">Marketplace</a></li>
Expand All @@ -43,50 +66,68 @@ <h2 class="section-title">Other</h2>
<ul class="nav">
<li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
<li><a href="https://www.eclipse.org/projects">Projects</a></li>
<li><a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a></li>
<li><a href="https://www.eclipse.org/org/research/">Research@Eclipse</a></li>
<li><a href="https://www.eclipse.org/security/">Report a Vulnerability</a></li>
<li>
<a href="https://www.eclipse.org/org/workinggroups/">Working Groups</a>
</li>
<li>
<a href="https://www.eclipse.org/org/research/">Research@Eclipse</a>
</li>
<li>
<a href="https://www.eclipse.org/security/">Report a Vulnerability</a>
</li>
<li><a href="https://status.eclipse.org">Service Status</a></li>
</ul>
</section>
<div class="col-sm-24 margin-top-20">
<div class="row">
<div id="copyright" class="col-md-16">
<p id="copyright-text">Copyright &copy; Eclipse Foundation, Inc. All Rights Reserved.</p>
<p id="copyright-text">
Copyright © Eclipse Foundation. All Rights Reserved.
</p>
</div>
<div class="col-md-8 social-media">
<ul class="list-inline">
<li>
<a class="social-media-link fa-stack fa-lg" href="https://twitter.com/EclipseFdn">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-twitter fa-stack-1x"></i>
<a class="social-media-link fa-stack fa-lg"
href="https://twitter.com/EclipseFdn">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-twitter fa-stack-1x"></i>
<span class="sr-only">Twitter account</span>
</a>
</li>
<li>
<a class="social-media-link fa-stack fa-lg" href="https://www.facebook.com/eclipse.org">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-facebook fa-stack-1x"></i>
<a class="social-media-link fa-stack fa-lg"
href="https://www.facebook.com/eclipse.org">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-facebook fa-stack-1x"></i>
<span class="sr-only">Facebook account</span>
</a>
</li>
<li>
<a class="social-media-link fa-stack fa-lg" href="https://www.youtube.com/user/EclipseFdn">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-youtube fa-stack-1x"></i>
<a class="social-media-link fa-stack fa-lg"
href="https://www.youtube.com/user/EclipseFdn">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-youtube fa-stack-1x"></i>
<span class="sr-only">Youtube account</span>
</a>
</li>
<li>
<a class="social-media-link fa-stack fa-lg" href="https://www.linkedin.com/company/eclipse-foundation">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-linkedin fa-stack-1x"></i>
<a class="social-media-link fa-stack fa-lg"
href="https://www.linkedin.com/company/eclipse-foundation">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-linkedin fa-stack-1x"></i>
<span class="sr-only">Linkedin account</span>
</a>
</li>
</ul>
</div>
</div>
</div>
<a href="#" class="scrollup">Back to the top</a>
<a href="#" class="scrollup" style="bottom: 100px; display: inline">
Back to the top
</a>
</div>
</div>
</footer>
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/main.min.js?var=1.3"></script>
<script src="https://www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/main.min.js?var=1.3"></script>
149 changes: 73 additions & 76 deletions _includes/nav_more.html
Original file line number Diff line number Diff line change
@@ -1,111 +1,108 @@
<!-- More -->
<li class="dropdown eclipse-more hidden-xs">
<a data-toggle="dropdown" class="dropdown-toggle" role="button">More<b class="caret"></b></a>
<a data-toggle="dropdown" class="dropdown-toggle" role="button">More<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li>
<!-- Content container to add padding -->
<div class="yamm-content">
<div class="row">
<ul class="col-sm-8 list-unstyled">
<li>
<p><strong>Community</strong></p>
<p>
<strong>Community</strong>
</p>
</li>
<li>
<a href="http://marketplace.eclipse.org">Marketplace</a>
</li>
<li>
<a href="http://events.eclipse.org">Events</a>
</li>
<li>
<a href="http://www.planeteclipse.org/">Planet Eclipse</a>
</li>
<li>
<a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a>
</li>
<li>
<a href="https://www.youtube.com/user/EclipseFdn">Videos</a>
</li>
<li>
<a href="https://blogs.eclipse.org">Blogs</a>
</li>
<li><a href="http://marketplace.eclipse.org">Marketplace</a></li>
<li><a href="http://events.eclipse.org">Events</a></li>
<li><a href="http://www.planeteclipse.org/">Planet Eclipse</a></li>
<li><a href="https://www.eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
<li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
<li><a href="https://blogs.eclipse.org">Blogs</a></li>
</ul>
<ul class="col-sm-8 list-unstyled">
<li>
<p><strong>Participate</strong></p>
<p>
<strong>Participate</strong>
</p>
</li>
<li>
<a href="https://www.eclipse.org/downloads">Download</a>
</li>
<li>
<a href="https://www.eclipse.org/forums/">Forums</a>
</li>
<li>
<a href="https://www.eclipse.org/mail/">Mailing Lists</a>
</li>
<li>
<a href="https://wiki.eclipse.org/">Wiki</a>
</li>
<li>
<a href="https://wiki.eclipse.org/IRC">IRC</a>
</li>
<li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
<li><a href="https://www.eclipse.org/forums/">Forums</a></li>
<li><a href="https://www.eclipse.org/mail/">Mailing Lists</a></li>
<li><a href="https://wiki.eclipse.org/">Wiki</a></li>
<li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
<li><a href="https://www.eclipse.org/org/research/">Research</a></li>
</ul>
<ul class="col-sm-8 list-unstyled">
<li>
<p><strong>Eclipse IDE</strong></p>
<p>
<strong>Eclipse IDE</strong>
</p>
</li>
<li>
<a href="https://www.eclipse.org/downloads">Download</a>
</li>
<li>
<a href="https://www.eclipse.org/downloads">Learn more</a>
</li>
<li>
<a href="https://help.eclipse.org">Documentation</a>
</li>
<li>
<a href="https://www.eclipse.org/getting_started">Getting Started / Support</a>
</li>
<li>
<a href="https://www.eclipse.org/contribute/">How to Contribute</a>
</li>
<li>
<a href="https://www.eclipse.org/ide/">IDE and Tools</a>
</li>
<li>
<a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a>
</li>
<li><a href="https://www.eclipse.org/downloads">Download</a></li>
<li><a href="https://www.eclipse.org/eclipseide">Learn More</a></li>
<li><a href="https://help.eclipse.org">Documentation</a></li>
<li><a href="https://www.eclipse.org/getting_started">Getting Started / Support</a></li>
<li><a href="https://www.eclipse.org/contribute/">How to Contribute</a></li>
<li><a href="https://www.eclipse.org/ide/">IDE and Tools</a></li>
<li><a href="https://www.eclipse.org/forums/index.php/f/89/">Newcomer Forum</a></li>
</ul>
</div>
</div>
</li>
</ul>
</li>
<li class="dropdown eclipse-more main-menu-search">
<a data-toggle="dropdown" class="dropdown-toggle" role="button"><i class="fa fa-search"></i> <b class="caret"></b></a>
<a data-toggle="dropdown" class="dropdown-toggle" role="button">
<i class="fa fa-search"></i>
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li>
<!-- Content container to add padding -->
<div class="yamm-content">
<div class="row">
<div class="col-sm-24">
<p>Search</p>
<p><strong>Search</strong></p>
<div class="row">
<div class="col-md-24">
<div id="custom-search-form" class="reset-box-sizing">
<script>
(function() {
var cx = '011805775785170369411:p3ec0igo0qq';
var gcse = document.createElement('script');
gcse.type = 'text/javascript';
gcse.async = true;
gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
'//cse.google.com/cse.js?cx=' + cx;
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(gcse, s);
})();
</script>
<div id="___gcse_0">
<div class="gsc-control-searchbox-only gsc-control-searchbox-only-en" dir="ltr">
<form class="gsc-search-box gsc-search-box-tools" accept-charset="utf-8">
<table cellspacing="0" cellpadding="0" class="gsc-search-box">
<tbody>
<tr>
<td class="gsc-input">
<div class="gsc-input-box" id="gsc-iw-id1">
<table cellspacing="0" cellpadding="0" id="gs_id50" class="gstl_50 gsc-input" style="width: 100%; padding: 0px;">
<tbody>
<tr>
<td id="gs_tti50" class="gsib_a"><input autocomplete="off" type="text" size="10" class="gsc-input" name="search" title="search" id="gsc-i-id1" placeholder="Custom Search" style="width: 100%; padding: 0px; border: none; margin: -0.0625em 0px 0px; height: 1.25em; background: url(&quot;https://www.google.com/cse/static/images/1x/googlelogo_lightgrey_46x16dp.png&quot;) left center no-repeat rgb(255, 255, 255); text-indent: 48px; outline: none;" dir="ltr" spellcheck="false" x-webkit-grammar="builtin:search" lang="en"></td>
<td class="gsib_b">
<div class="gsst_b" id="gs_st50" dir="ltr"><a class="gsst_a" href="javascript:void(0)" style="display: none;" title="Clear search box" role="button"><span class="gscb_a" id="gs_cb50" aria-hidden="true">×</span></a></div>
</td>
</tr>
</tbody>
</table>
</div>
</td>
<td class="gsc-search-button">
<button class="gsc-search-button gsc-search-button-v2">
<svg width="13" height="13" viewBox="0 0 13 13">
<title>search</title>
<path d="m4.8495 7.8226c0.82666 0 1.5262-0.29146 2.0985-0.87438 0.57232-0.58292 0.86378-1.2877 0.87438-2.1144 0.010599-0.82666-0.28086-1.5262-0.87438-2.0985-0.59352-0.57232-1.293-0.86378-2.0985-0.87438-0.8055-0.010599-1.5103 0.28086-2.1144 0.87438-0.60414 0.59352-0.8956 1.293-0.87438 2.0985 0.021197 0.8055 0.31266 1.5103 0.87438 2.1144 0.56172 0.60414 1.2665 0.8956 2.1144 0.87438zm4.4695 0.2115 3.681 3.6819-1.259 1.284-3.6817-3.7 0.0019784-0.69479-0.090043-0.098846c-0.87973 0.76087-1.92 1.1413-3.1207 1.1413-1.3553 0-2.5025-0.46363-3.4417-1.3909s-1.4088-2.0686-1.4088-3.4239c0-1.3553 0.4696-2.4966 1.4088-3.4239 0.9392-0.92727 2.0864-1.3969 3.4417-1.4088 1.3553-0.011889 2.4906 0.45771 3.406 1.4088 0.9154 0.95107 1.379 2.0924 1.3909 3.4239 0 1.2126-0.38043 2.2588-1.1413 3.1385l0.098834 0.090049z"></path>
</svg>
</button>
</td>
<td class="gsc-clear-button">
<div class="gsc-clear-button" title="clear results">&nbsp;</div>
</td>
</tr>
</tbody>
</table>
</form>
</div>
</div>
<script async src="https://cse.google.com/cse.js?cx=011805775785170369411:p3ec0igo0qq"></script>
<gcse:searchbox-only gname="main" resultsUrl="https://www.eclipse.org/home/search.php"></gcse:searchbox-only>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was expecting the new version to not include cse.js

</div>
</div>
</div>
Expand All @@ -114,4 +111,4 @@
</div>
</li>
</ul>
</li>
</li>
8 changes: 4 additions & 4 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

<!--
<!--
Copyright (c) 2018 Eclipse Foundation, Inc.

This program and the accompanying materials are made available under the
Expand All @@ -17,8 +17,8 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/favicon.ico" rel='icon' type='image/x-icon'/>

<link href="https://www.eclipse.org/favicon.ico" rel='icon' type='image/x-icon'/>
<!-- Links and stylesheets -->
<link rel="stylesheet" href="https://www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/quicksilver.min.css?v1.7">
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
Expand All @@ -33,7 +33,7 @@
<div class="container">
<div class="row">
<div class="col-md-18 padding-bottom-30">
{{ content }}
{{ content }}
</div>
<div class="col-md-6 padding-bottom-30">
{% include sidebar.html %}
Expand Down
4 changes: 2 additions & 2 deletions _sass/jekyll-theme-eclipsefdn.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* Copyright (c) 2018 Eclipse Foundation, Inc.
*
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
*
* SPDX-License-Identifier: EPL-2.0
*/

Expand Down
Loading