Skip to content

Commit 76c8f1d

Browse files
author
Tom Steer
committed
Merge remote-tracking branch 'origin/master'
2 parents 2a87582 + 8ada963 commit 76c8f1d

File tree

6 files changed

+56
-102
lines changed

6 files changed

+56
-102
lines changed

‎docs/404.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<meta http-equiv="Refresh" content="0; url=http://www.sacnview.org/">

‎docs/CNAME‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
www.sacnview.org
1+
sacnview.org

‎docs/_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
theme: jekyll-theme-tactile
1+
theme: jekyll-theme-cayman
22
title: sACNView
33
description: sACNView, a tool for sending and receiving the Streaming ACN control protocol
44
show_downloads: true

‎docs/_layouts/default.html‎

Lines changed: 52 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<!DOCTYPE html>
22
<html lang="{{ site.lang | default: "en-US" }}">
33
<head>
4-
<meta charset='utf-8'>
5-
<meta http-equiv="X-UA-Compatible" content="chrome=1">
6-
<meta name="google-site-verification" content="wJHgZWsy14zStI8D0AtWNWprydP6CumgQwuZs8fkq_U" />
7-
<meta name="description" content="A tool for transmitting, receiving, and dignosing the Streaming ACN lighting control protocol" />
8-
<link href='https://fonts.googleapis.com/css?family=Chivo:900' rel='stylesheet' type='text/css'>
9-
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
10-
<link rel="stylesheet" type="text/css" href="{{ '/assets/css/print.css' | relative_url }}" media="print">
11-
<!--[if lt IE 9]>
12-
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
13-
<![endif]-->
14-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
15-
<title>{{ site.title | default: site.github.repository_name }}</title>
16-
<!-- Script updates the links to the latest release -->
4+
5+
{% if site.google_analytics %}
6+
<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
7+
<script>
8+
window.dataLayer = window.dataLayer || [];
9+
function gtag(){dataLayer.push(arguments);}
10+
gtag('js', new Date());
11+
gtag('config', '{{ site.google_analytics }}');
12+
</script>
13+
{% endif %}
14+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
15+
16+
<!-- Script updates the links to the latest release -->
1717
<script>
1818

1919
<!-- Polyfill for older ECMAScript -->
@@ -29,7 +29,7 @@
2929

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

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

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

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

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

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

@@ -68,70 +68,49 @@
6868
}
6969
});
7070
</script>
71+
72+
<meta charset="UTF-8">
7173

74+
{% seo %}
75+
<meta name="viewport" content="width=device-width, initial-scale=1">
76+
<meta name="theme-color" content="#157878">
77+
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
78+
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
7279
</head>
73-
7480
<body>
75-
<div id="container">
76-
77-
<img src="./assets/images/icon.png" style="display:block; margin:auto; padding:10px" />
81+
<header class="page-header" role="banner">
82+
<h1 class="project-name">{{ page.title | default: site.title | default: site.github.repository_name }}</h1>
83+
<h2 class="project-tagline">{{ page.description | default: site.description | default: site.github.project_tagline }}</h2>
84+
{% if site.show_downloads %}
85+
<section>
86+
<h2 id="name_release">Download Release</h2>
87+
<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>
88+
<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>
89+
<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>
90+
<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>
91+
</section>
92+
<section id="prerelease-download" style="display:none">
93+
<h2 id="name_prerelease"></h1>
94+
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-win" class="btn"><span> Windows</span></a>
95+
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-winxp" class="btn"><span> Win XP</span></a>
96+
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-mac" class="btn"><span> macOS</span></a>
97+
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-linux" class="btn"><span> Linux</span></a>
98+
</section>
99+
{% endif %}
100+
{% if site.github.is_project_page %}
101+
<a href="{{ site.github.repository_url }}" class="btn">View on GitHub</a>
102+
{% endif %}
103+
</header>
78104

79-
<div class="inner">
80-
<header>
81-
<h1>{{ site.title | default: site.github.repository_name }}</h1>
82-
<h2>{{ site.description | default: site.github.project_tagline }}</h2>
83-
</header>
84-
<section id="downloads" class="clearfix">
85-
{% if site.show_downloads %}
86-
<h1 id="name_release"></h1>
87-
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-win" class="button"><span>Windows</span></a>
88-
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-winxp" class="button"><span>Win XP</span></a>
89-
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-mac" class="button"><span>macOS</span></a>
90-
<a href="https://github.com/docsteer/sacnview/releases/latest" id="download-linux" class="button"><span>Linux</span></a>
91-
</section>
92-
<section id="pre-downloads" class="clearfix">
93-
<div id="prerelease-download" style="display:none">
94-
<h1 id="name_prerelease"></h1>
95-
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-win" class="button"><span>Windows</span></a>
96-
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-winxp" class="button"><span>Win XP</span></a>
97-
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-mac" class="button"><span>macOS</span></a>
98-
<a href="https://github.com/docsteer/sacnview/releases/latest" id="pre-download-linux" class="button"><span>Linux</span></a>
99-
</div>
100-
</section>
101-
{% endif %}
102-
<section id="source" class="clearfix">
103-
{% if site.github.is_project_page %}
104-
<br><h2 id="name_prerelease">Source</h2>
105-
<a href="{{ site.github.repository_url }}" id="view-on-github" class="button"><span>Source</span></a>
106-
{% else %}
107-
<br><h2 id="name_prerelease">Source</h2>
108-
<a href="{{ site.github.owner_url }}" id="view-on-github" class="button"><span>Source</span></a>
109-
{% endif %}
110-
</section>
111-
<hr>
112-
<section id="main_content">
113-
{{ content }}
114-
</section>
105+
<main id="content" class="main-content" role="main">
106+
{{ content }}
115107

116-
<footer>
108+
<footer class="site-footer">
117109
{% if site.github.is_project_page %}
118-
{{ site.title | default: site.github.repository_name }} is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a><br>
110+
<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>
119111
{% endif %}
120-
This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.
121-
</footer>
122-
123-
</div>
124-
</div>
125-
126-
{% if site.google_analytics %}
127-
<script type="text/javascript">
128-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
129-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
130-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
131-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
132-
ga('create', '{{ site.google_analytics }}', 'auto');
133-
ga('send', 'pageview');
134-
</script>
135-
{% endif %}
112+
<span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</span>
113+
</footer>
114+
</main>
136115
</body>
137116
</html>

‎docs/assets/css/style.scss‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,3 @@
1111
a.button {
1212
width: 126px;
1313
}
14-
15-
#download-win span {
16-
background: transparent url(../images/win-icon.png) 12px 50% no-repeat;
17-
}
18-
#download-winxp span {
19-
background: transparent url(../images/winxp-icon.png) 12px 50% no-repeat;
20-
}
21-
#download-mac span {
22-
background: transparent url(../images/mac-icon.png) 12px 50% no-repeat;
23-
}
24-
#download-linux span {
25-
background: transparent url(../images/linux-icon.png) 12px 50% no-repeat;
26-
}
27-
28-
#pre-download-win span {
29-
background: transparent url(../images/win-icon.png) 12px 50% no-repeat;
30-
}
31-
#pre-download-winxp span {
32-
background: transparent url(../images/winxp-icon.png) 12px 50% no-repeat;
33-
}
34-
#pre-download-mac span {
35-
background: transparent url(../images/mac-icon.png) 12px 50% no-repeat;
36-
}
37-
#pre-download-linux span {
38-
background: transparent url(../images/linux-icon.png) 12px 50% no-repeat;
39-
}

‎ui/aboutdialog.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</font>
9898
</property>
9999
<property name="text">
100-
<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>
100+
<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>
101101
</property>
102102
<property name="openExternalLinks">
103103
<bool>true</bool>

0 commit comments

Comments
 (0)