Merge branch 'dev' into weather
This commit is contained in:
		@@ -76,6 +76,7 @@ hour&minutes
 | 
				
			|||||||
    font-style: bold;
 | 
					    font-style: bold;
 | 
				
			||||||
    float: left;
 | 
					    float: left;
 | 
				
			||||||
    color: white;
 | 
					    color: white;
 | 
				
			||||||
 | 
					    visibility: hidden;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#str-minutes {
 | 
					#str-minutes {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,7 @@
 | 
				
			|||||||
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 | 
					    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 | 
				
			||||||
    <meta name="description" content="Canvas Watch - Canvas API & Time API" />
 | 
					    <meta name="description" content="Canvas Watch - Canvas API & Time API" />
 | 
				
			||||||
    <title>Canvas Watch</title>
 | 
					    <title>Canvas Watch</title>
 | 
				
			||||||
 | 
					   
 | 
				
			||||||
    <link rel="stylesheet" type="text/css" href="css/style.css" />
 | 
					    <link rel="stylesheet" type="text/css" href="css/style.css" />
 | 
				
			||||||
</head>
 | 
					</head>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -25,7 +26,6 @@
 | 
				
			|||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    
 | 
					 | 
				
			||||||
    <script src="js/app.js"></script>
 | 
					    <script src="js/app.js"></script>
 | 
				
			||||||
</body>
 | 
					</body>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								js/jquery-3.5.1.min.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								js/jquery-3.5.1.min.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Reference in New Issue
	
	Block a user