add shared partials submodule (#8)

* add shared partials submodule

* use shared headernav

* use shared footer

* updated js to refernce correct (standarised htmls' css selectors)

* add update submodule script

* updated submodules
This commit is contained in:
Sam Thomson 2018-11-28 15:45:00 +07:00 committed by Andy Tudhope
parent 4abfe6476b
commit 6cf22614aa
9 changed files with 14 additions and 79 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "themes/navy/layout/partial/shared-partials"]
path = themes/navy/layout/partial/shared-partials
url = https://github.com/status-im/status.im-partials

View File

@ -10,7 +10,8 @@
"build": "gulp run && hexo generate",
"eslint": "eslint .",
"deploy": "hexo deploy",
"serve": "gulp run && hexo server"
"serve": "gulp run && hexo server",
"update-submodules": "git submodule update --recursive --remote"
},
"dependencies": {
"cheerio": "^0.20.0",

View File

@ -7,7 +7,7 @@
{{ partial('partial/header') }}
{% endif %}
{{ body }}
{{ partial('partial/footer') }}
{{ partial('partial/shared-partials/partials/footer') }}
</div>
{{ partial('partial/after_footer') }}
</body>

View File

@ -1,49 +0,0 @@
<div class="footer footer--global">
<div class="footer-inner">
<div class="footer-table">
<div class="footer-table__column">
<p class="footer-header">Social links</p>
<ul class="footer-list">
<li class="footer-link footer-link--fb"><a href="https://www.facebook.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Facebook</span></a></li>
<li class="footer-link footer-link--tw"><a href="https://twitter.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
<li class="footer-link footer-link--ri"><a href="https://chat.status.im/#/register" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Riot</span></a></li>
<li class="footer-link footer-link--gh"><a href="https://github.com/status-im" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
<li class="footer-link footer-link--rd"><a href="https://www.reddit.com/r/statusim/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Reddit</span></a></li>
<li class="footer-link footer-link--yt"><a href="https://www.youtube.com/statusim" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li>
</ul>
</div>
<div class="footer-table__column">
<p class="footer-header">More</p>
<ul class="footer-list">
<li class="footer-link"><a href="https://status.im/docs" target="_blank">Status Docs</a></li>
<li class="footer-link"><a href="https://our.status.im/" target="_blank">Status Blog</a></li>
<li class="footer-link"><a href="https://status.im/contribute/" target="_blank">Jobs</a></li>
<li class="footer-link"><a href="https://status.im/privacy-policy.html" target="_blank">Privacy Policy</a></li>
</ul>
</div>
<div class="footer-table__column">
<p class="footer-header">Projects</p>
<ul class="footer-list">
<li class="footer-link"><a href="https://embark.status.im" target="_blank">Embark</a></li>
<li class="footer-link"><a href="https://incubate.status.im/" target="_blank">Incubate</a></li>
<li class="footer-link"><a href="https://nimbus.status.im/" target="_blank">Nimbus</a></li>
<li class="footer-link"><a href="/" target="_blank">Studio</a></li>
</ul>
</div>
</div>
<div class="footer-logo-wrap">
<div class="footer-logo-wrap__inner">
<a class="footer-logo" href="https://status.im" target="_blank"></a>
<div class="footer-address secondary-text">Status Research & Development GmbH<br/>Baarerstrasse 10<br/>Zug, Switzerland</div>
</div>
</div>
</div>
</div>

View File

@ -4,28 +4,7 @@
<a href="https://status.im/"></a>
</div>
<nav>
<ul>
<li>
<a href="https://status.im/get/" class="main-link">App</a>
</li>
<li>
<a href="https://our.status.im/" class="main-link">Blog</a>
</li>
<li>
<a href="https://status.im/docs/" class="main-link">Docs</a>
</li>
<li class="has-popup has-popup-projects">
<a href="#" class="main-link">Projects</a>
<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg"> <g opacity="0.4"> <path fill-rule="evenodd" clip-rule="evenodd" d="M5.23198 3.83006L1.70264 0.292429C1.31888 -0.0922324 0.683447 -0.095995 0.293839 0.294529C-0.0984862 0.687776 -0.0967079 1.31728 0.291744 1.70664L4.52863 5.95348C4.72016 6.14547 4.97439 6.24257 5.22946 6.24313C5.48789 6.2456 5.74145 6.14782 5.93533 5.95348L10.1722 1.70664C10.556 1.32198 10.5597 0.685054 10.1701 0.294529C9.7778 -0.0987176 9.14977 -0.0969352 8.76132 0.292429L5.23198 3.83006Z" fill="#6E777E"/> </g> </svg>
</li>
<li>
<a href="https://status.im/contribute/" class="main-link">Contribute</a>
</li>
<li class="has-popup has-popup-community">
<a href="#">Community</a>
<svg width="11" height="7" viewBox="0 0 11 7" fill="none" xmlns="http://www.w3.org/2000/svg"> <g opacity="0.4"> <path fill-rule="evenodd" clip-rule="evenodd" d="M5.23198 3.83006L1.70264 0.292429C1.31888 -0.0922324 0.683447 -0.095995 0.293839 0.294529C-0.0984862 0.687776 -0.0967079 1.31728 0.291744 1.70664L4.52863 5.95348C4.72016 6.14547 4.97439 6.24257 5.22946 6.24313C5.48789 6.2456 5.74145 6.14782 5.93533 5.95348L10.1722 1.70664C10.556 1.32198 10.5597 0.685054 10.1701 0.294529C9.7778 -0.0987176 9.14977 -0.0969352 8.76132 0.292429L5.23198 3.83006Z" fill="#6E777E"/> </g> </svg>
</li>
</ul>
{{ partial('partial/shared-partials/partials/header-nav') }}
</nav>
</div>
<a href="#" class="mobile-menu-trigger">

@ -0,0 +1 @@
Subproject commit 100498f37bca143184217d3531d33bd5c78f22f0

View File

@ -69,8 +69,8 @@ if(heroImage) {
/* Popups */
let community = document.querySelectorAll(".has-popup-community")[0]
let projects = document.querySelectorAll(".has-popup-projects")[0]
let community = document.querySelectorAll(".item--dropdown-community")[0]
let projects = document.querySelectorAll(".item--dropdown-projects")[0]
let mobileMenu = document.querySelectorAll(".mobile-menu-trigger")[0]
let popups = document.querySelectorAll('.popup-wrap')

View File

@ -69,8 +69,8 @@ if (heroImage) {
/* Popups */
let community = document.querySelectorAll(".has-popup-community")[0];
let projects = document.querySelectorAll(".has-popup-projects")[0];
let community = document.querySelectorAll(".item--dropdown-community")[0];
let projects = document.querySelectorAll(".item--dropdown-projects")[0];
let mobileMenu = document.querySelectorAll(".mobile-menu-trigger")[0];
let popups = document.querySelectorAll('.popup-wrap');

File diff suppressed because one or more lines are too long