Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
This commit is contained in:
		
						commit
						14ba6ae90c
					
				
					 3 changed files with 13 additions and 13 deletions
				
			
		
							
								
								
									
										20
									
								
								index.html
									
										
									
									
									
								
							
							
						
						
									
										20
									
								
								index.html
									
										
									
									
									
								
							|  | @ -1,16 +1,16 @@ | ||||||
| <!DOCTYPE html> | <!DOCTYPE html> | ||||||
| <html manifest="manifest.appcache"> | <html manifest="manifest.appcache"> | ||||||
| <head> | <head> | ||||||
| <title>Die Zeit als Wort - in HTML, CSS und JS</title> | 	<title>Die Zeit als Wort - in HTML, CSS und JS</title> | ||||||
| <script type="text/javascript" src="jquery-2.0.3.min.js"></script> | 	<script type="text/javascript" src="jquery-2.0.3.min.js"></script> | ||||||
| <script type="text/javascript" src="jquery.cookie.js"></script> | 	<script type="text/javascript" src="jquery.cookie.js"></script> | ||||||
| <script type="text/javascript" src="uhr.js"></script> | 	<script type="text/javascript" src="uhr.js"></script> | ||||||
| <script type="text/javascript" src="uhr-de_CH.js"></script> | 	<script type="text/javascript" src="uhr-de_CH.js"></script> | ||||||
| <script type="text/javascript" src="uhr-de.js"></script> | 	<script type="text/javascript" src="uhr-de.js"></script> | ||||||
| <script type="text/javascript" src="uhr-en.js"></script> | 	<script type="text/javascript" src="uhr-en.js"></script> | ||||||
| <link rel="stylesheet" type="text/css" href="uhr.css" /> | 	<link rel="stylesheet" type="text/css" href="uhr.css" /> | ||||||
| <link rel="stylesheet" type="text/css" href="uhr-black.css" id="theme" /> | 	<link rel="stylesheet" type="text/css" href="uhr-black.css" id="theme" /> | ||||||
| <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> | 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> | ||||||
| </head> | </head> | ||||||
| <body> | <body> | ||||||
| 	<div id="uhr"> | 	<div id="uhr"> | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| CACHE MANIFEST | CACHE MANIFEST | ||||||
| # 2.1 | # 2.1.1 | ||||||
| 
 | 
 | ||||||
| index.html | index.html | ||||||
| jquery-2.0.3.min.js | jquery-2.0.3.min.js | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								uhr.js
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								uhr.js
									
										
									
									
									
								
							|  | @ -125,9 +125,9 @@ function renderLayout() { | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| function Letter(value, style = '') { | function Letter(value, style) { | ||||||
| 	this.value = value; | 	this.value = value; | ||||||
| 	this.style = style; | 	this.style = style || ''; | ||||||
| 	this.getStyle = function() { | 	this.getStyle = function() { | ||||||
| 		return "item letter " + style; | 		return "item letter " + style; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue