Merge branch 'cleanup/frontpage_issue5' into 'develop'
Cleanup/frontpage issue5 fixes #5 See merge request !23
This commit is contained in:
		
						commit
						164ef0c6c3
					
				
					 2 changed files with 1 additions and 65 deletions
				
			
		|  | @ -52,7 +52,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> - <a href="showcase">View full showcase!</a></p> |         onclick="go('info/')" href="#">Read more!</a></p> | ||||||
| <script type="text/javascript"> | <script type="text/javascript"> | ||||||
|     (function($) { |     (function($) { | ||||||
|         var width = $(window).width(); |         var width = $(window).width(); | ||||||
|  |  | ||||||
|  | @ -1,64 +0,0 @@ | ||||||
| <!DOCTYPE html> |  | ||||||
| <!-- |  | ||||||
| This program is free software: you can redistribute it and/or modify |  | ||||||
| it under the terms of the GNU General Public License as published by |  | ||||||
| the Free Software Foundation, either version 3 of the License, or |  | ||||||
| (at your option) any later version. |  | ||||||
| 
 |  | ||||||
| This program is distributed in the hope that it will be useful, |  | ||||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of |  | ||||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the |  | ||||||
| GNU General Public License for more details. |  | ||||||
| 
 |  | ||||||
| You should have received a copy of the GNU General Public License |  | ||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. |  | ||||||
| --> |  | ||||||
| <html manifest="../manifest.appcache"> |  | ||||||
| <head> |  | ||||||
|     <title>Bärneruhr - Die Zeit im Wort: Showcase</title> |  | ||||||
|     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/> |  | ||||||
|     <meta name="apple-mobile-web-app-capable" content="yes"/> |  | ||||||
|     <meta name="apple-mobile-web-app-status-bar-style" content="black"/> |  | ||||||
|     <meta name="apple-mobile-web-app-title" content="Bärneruhr"/> |  | ||||||
|     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1"/> |  | ||||||
|     <link rel="stylesheet" type="text/css" href="../css/uhr.css"/> |  | ||||||
|     <link rel="stylesheet" type="text/css" href="../css/uhr-black.css" data-class="black" data-name="Schwarz"/> |  | ||||||
|     <link rel="stylesheet" type="text/css" href="../css/uhr-white.css" data-class="white" data-name="Weiss"/> |  | ||||||
|     <link rel="stylesheet" type="text/css" href="../css/uhr-red.css" data-class="red" data-name="Rot"/> |  | ||||||
|     <link rel="stylesheet" type="text/css" href="../css/uhr-green.css" data-class="green" data-name="Grün"/> |  | ||||||
|     <link rel="stylesheet" type="text/css" href="../css/uhr-yellow.css" data-class="yellow" data-name="Gelb"/> |  | ||||||
|     <link rel="stylesheet" type="text/css" href="../css/uhr-blue.css" data-class="blue" data-name="Blau"/> |  | ||||||
|     <link rel="stylesheet" type="text/css" href="../css/uhr-pink.css" data-class="pink" data-name="Pink"/> |  | ||||||
|     <link rel="shortcut icon" type="image/png" href="../resources/favicon.png"/> |  | ||||||
|     <link rel="apple-touch-icon-precomposed" href="../resources/apple-touch-icon-precomposed.png"/> |  | ||||||
|     <script type="text/javascript" src="../lib/jquery-2.1.0.min.js"></script> |  | ||||||
|     <script type="text/javascript" src="../lib/jquery-ui-1.10.4.custom.min.js"></script> |  | ||||||
|     <script type="text/javascript" src="../lib/jquery-cookie-1.4.0.js"></script> |  | ||||||
|     <script type="text/javascript" src="../js/uhr.js"></script> |  | ||||||
| </head> |  | ||||||
| <body style="padding:0;margin:0;"> |  | ||||||
| <div id="uhr"></div> |  | ||||||
| <p><a href="..">Go back to the main page</a></p> |  | ||||||
| <script type="text/javascript" src="../js/uhr-de_CH.js"></script> |  | ||||||
| <script type="text/javascript" src="../js/uhr-de_CH_genau.js"></script> |  | ||||||
| <script type="text/javascript" src="../js/uhr-de_CH-seconds.js"></script> |  | ||||||
| <script type="text/javascript" src="../js/uhr-de.js"></script> |  | ||||||
| <script type="text/javascript" src="../js/uhr-en.js"></script> |  | ||||||
| <script type="text/javascript" src="../js/uhr-fr.js"></script> |  | ||||||
| <script type="text/javascript" src="../js/uhr-it.js"></script> |  | ||||||
| <script type="text/javascript"> |  | ||||||
|     (function($) { |  | ||||||
|         var width = $(window).width(); |  | ||||||
|         var height = $(window).height() - 150; |  | ||||||
|         var size = Math.min(width, height); |  | ||||||
|         if (size < 200) { |  | ||||||
|             size = 200; |  | ||||||
|         } |  | ||||||
|         $('#uhr').uhr({ |  | ||||||
|             width: size + 'px', |  | ||||||
|             language: 'de_CH' |  | ||||||
|         }); |  | ||||||
|     })(jQuery); |  | ||||||
| </script> |  | ||||||
| </body> |  | ||||||
| </html> |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue