Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Steer committed May 13, 2020
2 parents 2a87582 + 8ada963 commit 76c8f1d
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 102 deletions.
1 change: 1 addition & 0 deletions docs/404.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<meta http-equiv="Refresh" content="0; url=http://www.sacnview.org/">
2 changes: 1 addition & 1 deletion docs/CNAME
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
www.sacnview.org
sacnview.org
2 changes: 1 addition & 1 deletion docs/_config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
theme: jekyll-theme-tactile
theme: jekyll-theme-cayman
title: sACNView
description: sACNView, a tool for sending and receiving the Streaming ACN control protocol
show_downloads: true
Expand Down
125 changes: 52 additions & 73 deletions docs/_layouts/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<!DOCTYPE html>
<html lang="{{ site.lang | default: "en-US" }}">
<head>
<meta charset='utf-8'>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<meta name="google-site-verification" content="wJHgZWsy14zStI8D0AtWNWprydP6CumgQwuZs8fkq_U" />
<meta name="description" content="A tool for transmitting, receiving, and dignosing the Streaming ACN lighting control protocol" />
<link href='https://fonts.googleapis.com/css?family=Chivo:900' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
<link rel="stylesheet" type="text/css" href="{{ '/assets/css/print.css' | relative_url }}" media="print">
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<title>{{ site.title | default: site.github.repository_name }}</title>
<!-- Script updates the links to the latest release -->

{% if site.google_analytics %}
<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{ site.google_analytics }}');
</script>
{% endif %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>

<!-- Script updates the links to the latest release -->
<script>

<!-- Polyfill for older ECMAScript -->
Expand All @@ -29,7 +29,7 @@

$.getJSON('https://api.github.com/repos/docsteer/sacnview/releases/latest', function (data) {

document.getElementById("name_release").innerHTML = data.name;
document.getElementById("name_release").innerHTML = "Release Version : " + data.name;

$.each(data.assets, function(index, obj){
var download_url = obj.browser_download_url;
Expand All @@ -48,7 +48,7 @@

$.getJSON('https://api.github.com/repos/docsteer/sacnview/releases', function (data) {

document.getElementById("name_prerelease").innerHTML = data[0].name;
document.getElementById("name_prerelease").innerHTML = "Pre-Release Version : "+data[0].name;

$.each(data[0].assets, function(index, obj){

Expand All @@ -68,70 +68,49 @@
}
});
</script>

<meta charset="UTF-8">

{% seo %}
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#157878">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
</head>

<body>
<div id="container">

<img src="./assets/images/icon.png" style="display:block; margin:auto; padding:10px" />
<header class="page-header" role="banner">
<h1 class="project-name">{{ page.title | default: site.title | default: site.github.repository_name }}</h1>
<h2 class="project-tagline">{{ page.description | default: site.description | default: site.github.project_tagline }}</h2>
{% if site.show_downloads %}
<section>
<h2 id="name_release">Download Release</h2>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-win" class="btn"><span><img src="/assets/images/win-icon.png" /> Windows</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-winxp" class="btn"><span><img src="/assets/images/winxp-icon.png" /> Win XP</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-mac" class="btn"><span><img src="/assets/images/mac-icon.png" /> macOS</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-linux" class="btn"><span><img src="/assets/images/linux-icon.png" /> Linux</span></a>
</section>
<section id="prerelease-download" style="display:none">
<h2 id="name_prerelease"></h1>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-win" class="btn"><span> Windows</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-winxp" class="btn"><span> Win XP</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-mac" class="btn"><span> macOS</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-linux" class="btn"><span> Linux</span></a>
</section>
{% endif %}
{% if site.github.is_project_page %}
<a href="{{ site.github.repository_url }}" class="btn">View on GitHub</a>
{% endif %}
</header>

<div class="inner">
<header>
<h1>{{ site.title | default: site.github.repository_name }}</h1>
<h2>{{ site.description | default: site.github.project_tagline }}</h2>
</header>
<section id="downloads" class="clearfix">
{% if site.show_downloads %}
<h1 id="name_release"></h1>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-win" class="button"><span>Windows</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-winxp" class="button"><span>Win XP</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-mac" class="button"><span>macOS</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-linux" class="button"><span>Linux</span></a>
</section>
<section id="pre-downloads" class="clearfix">
<div id="prerelease-download" style="display:none">
<h1 id="name_prerelease"></h1>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-win" class="button"><span>Windows</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-winxp" class="button"><span>Win XP</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-mac" class="button"><span>macOS</span></a>
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-linux" class="button"><span>Linux</span></a>
</div>
</section>
{% endif %}
<section id="source" class="clearfix">
{% if site.github.is_project_page %}
<br><h2 id="name_prerelease">Source</h2>
<a href="{{ site.github.repository_url }}" id="view-on-github" class="button"><span>Source</span></a>
{% else %}
<br><h2 id="name_prerelease">Source</h2>
<a href="{{ site.github.owner_url }}" id="view-on-github" class="button"><span>Source</span></a>
{% endif %}
</section>
<hr>
<section id="main_content">
{{ content }}
</section>
<main id="content" class="main-content" role="main">
{{ content }}

<footer>
<footer class="site-footer">
{% if site.github.is_project_page %}
{{ site.title | default: site.github.repository_name }} is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a><br>
<span class="site-footer-owner"><a href="{{ site.github.repository_url }}">{{ site.github.repository_name }}</a> is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a>.</span>
{% endif %}
This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.
</footer>

</div>
</div>

{% if site.google_analytics %}
<script type="text/javascript">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.google_analytics }}', 'auto');
ga('send', 'pageview');
</script>
{% endif %}
<span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</span>
</footer>
</main>
</body>
</html>
26 changes: 0 additions & 26 deletions docs/assets/css/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,3 @@
a.button {
width: 126px;
}

#download-win span {
background: transparent url(../images/win-icon.png) 12px 50% no-repeat;
}
#download-winxp span {
background: transparent url(../images/winxp-icon.png) 12px 50% no-repeat;
}
#download-mac span {
background: transparent url(../images/mac-icon.png) 12px 50% no-repeat;
}
#download-linux span {
background: transparent url(../images/linux-icon.png) 12px 50% no-repeat;
}

#pre-download-win span {
background: transparent url(../images/win-icon.png) 12px 50% no-repeat;
}
#pre-download-winxp span {
background: transparent url(../images/winxp-icon.png) 12px 50% no-repeat;
}
#pre-download-mac span {
background: transparent url(../images/mac-icon.png) 12px 50% no-repeat;
}
#pre-download-linux span {
background: transparent url(../images/linux-icon.png) 12px 50% no-repeat;
}
2 changes: 1 addition & 1 deletion ui/aboutdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</font>
</property>
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;sACNView&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://www.sacnview.org/sacnview/&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;www.sacnview.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;sACNView&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://www.sacnview.org&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;www.sacnview.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
Expand Down

0 comments on commit 76c8f1d

Please sign in to comment.