Merge branch 'feature/update-toolchain' into feature/unify-versioninfo

This commit is contained in:
Manuel Friedli 2015-01-18 18:54:18 +01:00
commit 2295283ba4
3 changed files with 30 additions and 5 deletions

View file

@ -13,7 +13,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<html lang="de"> <html lang="de" manifest="manifest.appcache">
<head> <head>
<title>Bärneruhr - Die Zeit im Wort</title> <title>Bärneruhr - Die Zeit im Wort</title>
<meta charset="utf-8"/> <meta charset="utf-8"/>
@ -43,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<body style="padding:0;margin:0;"> <body style="padding:0;margin:0;">
<div id="uhr"></div> <div id="uhr"></div>
<p id="disclaimer">Created by <a href="http://www.fritteli.ch/">fritteli</a>, inspired by <a href="http://www.qlocktwo.com/">QLOCKTWO</a>. <a <p id="disclaimer">Created by <a href="http://www.fritteli.ch/">fritteli</a>, inspired by <a href="http://www.qlocktwo.com/">QLOCKTWO</a>. <a
onclick="go('info/')" href="#">Read more!</a></p> onclick="go('info/index.html')" href="#">Read more!</a></p>
<script type="text/javascript"> <script type="text/javascript">
(function($) { (function($) {
var width = $(window).width(); var width = $(window).width();

View file

@ -13,7 +13,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<html lang="de"> <html lang="de" manifest="../manifest.appcache">
<head> <head>
<title>Die Zeit im Wort - Informationen</title> <title>Die Zeit im Wort - Informationen</title>
<meta charset="utf-8"/> <meta charset="utf-8"/>
@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<link rel="stylesheet" type="text/css" href="../css/uhr-red.css" data-class="red"/> <link rel="stylesheet" type="text/css" href="../css/uhr-red.css" data-class="red"/>
<link rel="stylesheet" type="text/css" href="info.css"/> <link rel="stylesheet" type="text/css" href="info.css"/>
<link rel="shortcut icon" type="image/png" href="../resources/favicon.png"/> <link rel="shortcut icon" type="image/png" href="../resources/favicon.png"/>
<script type="text/javascript" src="../dist/libs.js"></script> <script type="text/javascript" src="../dist/libs.min.js"></script>
<script type="text/javascript" src="../dist/jquery.uhr.base.min.js"></script> <script type="text/javascript" src="../dist/jquery.uhr.base.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
function go(url) { function go(url) {
@ -68,7 +68,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<p><a onclick="go('../')" href="#">Das interessiert mich nicht, ich will zurück zur grossen Uhr!</a></p> <p><a onclick="go('../')" href="#">Das interessiert mich nicht, ich will zurück zur grossen Uhr!</a></p>
<h2 id="the-clock">Die Uhr<a href="#toc" class="toclink">Zum Inhalt</a></h2> <h2 id="the-clock">Die Uhr<a href="#toc" class="toclink">Zum Inhalt</a></h2>
<a onclick="go('../')" href="#"> <a onclick="go('../index.html')" href="#">
<div id="uhr1" style="display:inline-block"></div> <div id="uhr1" style="display:inline-block"></div>
<div id="uhr2" style="display:inline-block"></div> <div id="uhr2" style="display:inline-block"></div>
</a> </a>

25
manifest.appcache Normal file
View file

@ -0,0 +1,25 @@
CACHE MANIFEST
# Version <%=VERSION_PLACEHOLDER=%>
/
css/uhr.css
css/uhr-black.css
css/uhr-blue.css
css/uhr-green.css
css/uhr-pink.css
css/uhr-red.css
css/uhr-white.css
css/uhr-yellow.css
dist/jquery.uhr.base.min.js
dist/jquery.uhr.complete.min.js
dist/libs.min.js
info/
info/index.html
info/info.css
resources/apple-touch-icon-precomposed.png
resources/close.png
resources/favicon.png
resources/settings.png
resources/uhr.woff
index.html
README.md