Skip to content

Fix merge conflicts and clean footer #28

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: gh-pages
Choose a base branch
from
Open

Fix merge conflicts and clean footer #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ <h3 class="FooterNew-link-title FooterNew-link-title--hideMobile" style="margin-
<script src="static/datro/html/featherlight/release/featherlight.min.js">
</script>
<script src="static/datro/js/smoothloader.js"></script>
<script defer src="static/datro/js/footer-accordion.js"></script>
</body>
</html>

1 change: 1 addition & 0 deletions static/datro/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,5 +510,6 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile" style="margin-
});

</script> <!--// SystemJS -->
<script defer src="js/footer-accordion.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions static/datro/academy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,5 +940,6 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile" style="margin-
noItemsFoundSelector: '.no-apps-found'
});
</script>
<script defer src="js/footer-accordion.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions static/datro/canceled.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile">Hotspotβnβ V
</script>

<!--// SystemJS -->
<script defer src="js/footer-accordion.js"></script>
</body>

</html>
169 changes: 169 additions & 0 deletions static/datro/contactus.html
View file
Open in desktop

Large diffs are not rendered by default.

192 changes: 180 additions & 12 deletions static/datro/docs-intro.html
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions static/datro/docs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,5 +664,6 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile">WaveOS™ V0.5
noItemsFoundSelector: '.no-apps-found'
});
</script>
<script defer src="js/footer-accordion.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions static/datro/documents.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1565,5 +1565,6 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile" style="margin-
</script>

</main>
<script defer src="js/footer-accordion.js"></script>
</body>
</html>
192 changes: 180 additions & 12 deletions static/datro/gpl.html
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions static/datro/history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile">Hotspotβnβ V
</script>

<!--// SystemJS -->
<script defer src="js/footer-accordion.js"></script>
</body>

</html>
1 change: 1 addition & 0 deletions static/datro/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,5 +428,6 @@ <h3 class="FooterNew-link-title FooterNew-link-title--hideMobile" style="margin-
<script defer src="html/featherlight/release/featherlight.min.js"></script>
<script defer src="js/smoothloader2.js"></script>

<script defer src="js/footer-accordion.js"></script>
</body>
</html>
192 changes: 180 additions & 12 deletions static/datro/intro.html
View file
Open in desktop

Large diffs are not rendered by default.

186 changes: 186 additions & 0 deletions static/datro/invest.html
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 54 additions & 0 deletions static/datro/js/footer-accordion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
(function(){
const mq = 768;

function setupSections() {
document.querySelectorAll('.FooterNew-link-section').forEach(sec => {
const content = sec.querySelector('.FooterNew-link-content');
if(!content) return;
if (window.innerWidth > mq) {
sec.classList.add('is-active');
content.style.maxHeight = '';
} else {
sec.classList.remove('is-active');
content.style.maxHeight = 0;
}
});
}

function toggleSection(sec) {
const content = sec.querySelector('.FooterNew-link-content');
if(!content) return;
const open = sec.classList.contains('is-active');
if(open){
sec.classList.remove('is-active');
content.style.maxHeight = 0;
} else {
sec.classList.add('is-active');
content.style.maxHeight = content.scrollHeight + 'px';
}
}

document.addEventListener('DOMContentLoaded', () => {
setupSections();
window.addEventListener('resize', setupSections);

document.querySelectorAll('.FooterNew-link-section').forEach(sec => {
const title = sec.querySelector('.FooterNew-link-title');
if(!title) return;
const handler = (e) => {
if(window.innerWidth <= mq){
e.preventDefault();
toggleSection(sec);
}
};
title.addEventListener('click', handler);
title.addEventListener('touchstart', handler);
title.addEventListener('keypress', e => {
if(window.innerWidth <= mq && (e.key === 'Enter' || e.key === ' ')){
e.preventDefault();
toggleSection(sec);
}
});
});
});
})();
186 changes: 186 additions & 0 deletions static/datro/news.html
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions static/datro/success.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile">Hotspotβnβ V
</script>

<!--// SystemJS -->
<script defer src="js/footer-accordion.js"></script>
</body>

</html>
2 changes: 2 additions & 0 deletions static/datro/team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<link rel="stylesheet" href="css/style.css" media="screen" type="text/css" />
<link href="css/store.css" rel="stylesheet" media="screen" type="text/css" />
<link rel="stylesheet" href="css/footer.min.css" type="text/css" >
<link rel="stylesheet" href="css/footer.css" type="text/css">
<link rel="stylesheet" href="css/download-buttons.css" type="text/css">
<link rel="stylesheet" href="css/dropdownboxes.css">
<link rel="stylesheet" href="css/glyphicon.css" type="text/css" >
Expand Down Expand Up @@ -707,6 +708,7 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile">Hotspotβnβ V

<!--// SystemJS -->

<script defer src="js/footer-accordion.js"></script>
</body>

</html>
1 change: 1 addition & 0 deletions static/datro/technology.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,5 +656,6 @@ <h5 class="FooterNew-link-title FooterNew-link-title--hideMobile" style="margin-
<script defer id="systemjs-config" src="html/more-footer/systemjs-config-4223b4bd.js.download">
</script>

<script defer src="js/footer-accordion.js"></script>
</body>
</html>
129 changes: 0 additions & 129 deletions static/datro/wavedistributors.html
View file
Open in desktop

This file was deleted.

35 changes: 3 additions & 32 deletions static/gui/app-store/apps/003-001/fetch.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,3 @@
<<<<<<< HEAD
<!doctype html>
<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
<head>
<meta charset="utf-8">

<script src="../../../dashboard/js/jquery-3.3.1.min.js"></script>

<script>

if (window.location.href.indexOf("datro.") > -1) {
window.location.href = 'https://' + 'demo.jellyfin.org/stable/web/index.html' ;
}

if(document.URL.indexOf("datro.") <= -1){
window.location.href = 'https://' + window.location.hostname + window.location.port + ':8089' ;
}

</script>

<meta http-equiv="Page-Enter" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
<meta http-equiv="Page-Exit" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
</head>
<body id="body">
</body>
</html>
=======
<!doctype html>
<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
Expand All @@ -35,21 +7,20 @@
<script src="../../../dashboard/js/jquery-3.3.1.min.js"></script>

<script>

if (window.location.href.indexOf("datro.") > -1) {
window.location.href = 'https://' + 'gamepad.bucklerfamilyestate.com' ;
window.location.href = 'https://' + 'demo.jellyfin.org/stable/web/index.html' ;
}

if(document.URL.indexOf("datro.") <= -1){
window.location.href = 'https://' + window.location.hostname + window.location.port + ':8089' ;
}

</script>
</script>

<meta http-equiv="Page-Enter" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
<meta http-equiv="Page-Exit" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
</head>
<body id="body">
</body>
</html>
>>>>>>> 741d0a0ca1ee372699f08f24b26ce103144db70c
35 changes: 3 additions & 32 deletions static/gui/app-store/apps/004-003/fetch.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,3 @@
<<<<<<< HEAD
<!doctype html>
<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
<head>
<meta charset="utf-8">

<script src="../../../dashboard/js/jquery-3.3.1.min.js"></script>

<script>

if (window.location.href.indexOf("datro.") > -1) {
window.location.href = 'https://' + '' ;
}

if(document.URL.indexOf("datro.") <= -1){
window.location.href = 'https://' + window.location.hostname + window.location.port + ':8083' ;
}

</script>

<meta http-equiv="Page-Enter" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
<meta http-equiv="Page-Exit" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
</head>
<body id="body">
</body>
</html>
=======
<!doctype html>
<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
Expand All @@ -35,21 +7,20 @@
<script src="../../../dashboard/js/jquery-3.3.1.min.js"></script>

<script>

if (window.location.href.indexOf("datro.") > -1) {
window.location.href = 'https://' + 'emoncms.bucklerfamilyestate.com/app/view/?name=MySolar&readkey=7334a89f9409984dc6d0192f69a483c4&embed=1' ;
window.location.href = 'https://' + '' ;
}

if(document.URL.indexOf("datro.") <= -1){
window.location.href = 'https://' + window.location.hostname + window.location.port + ':8083' ;
}

</script>
</script>

<meta http-equiv="Page-Enter" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
<meta http-equiv="Page-Exit" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
</head>
<body id="body">
</body>
</html>
>>>>>>> 741d0a0ca1ee372699f08f24b26ce103144db70c
Loading