Merge branch 'develop' into feature/refactor-layout-definition
This commit is contained in:
		
						commit
						600b84c36a
					
				
					 4 changed files with 40 additions and 1 deletions
				
			
		|  | @ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| 	<link rel="stylesheet" type="text/css" href="uhr-green.css" /> | 	<link rel="stylesheet" type="text/css" href="uhr-green.css" /> | ||||||
| 	<link rel="stylesheet" type="text/css" href="uhr-red.css" /> | 	<link rel="stylesheet" type="text/css" href="uhr-red.css" /> | ||||||
| 	<link rel="stylesheet" type="text/css" href="uhr-white.css" /> | 	<link rel="stylesheet" type="text/css" href="uhr-white.css" /> | ||||||
|  | 	<link rel="stylesheet" type="text/css" href="uhr-pink.css" /> | ||||||
| 	<link rel="shortcut icon" type="image/png" href="favicon.png" /> | 	<link rel="shortcut icon" type="image/png" href="favicon.png" /> | ||||||
| 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> | 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> | ||||||
| 	<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" /> | 	<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" /> | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| CACHE MANIFEST | CACHE MANIFEST | ||||||
| # 5.0 | # 5.0.1 | ||||||
| 
 | 
 | ||||||
| COPYING | COPYING | ||||||
| README.md | README.md | ||||||
|  | @ -15,6 +15,7 @@ uhr-de.js | ||||||
| uhr-de_CH.js | uhr-de_CH.js | ||||||
| uhr-en.js | uhr-en.js | ||||||
| uhr-green.css | uhr-green.css | ||||||
|  | uhr-pink.css | ||||||
| uhr-red.css | uhr-red.css | ||||||
| uhr-white.css | uhr-white.css | ||||||
| uhr.css | uhr.css | ||||||
|  |  | ||||||
							
								
								
									
										36
									
								
								uhr-pink.css
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								uhr-pink.css
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,36 @@ | ||||||
|  | /* | ||||||
|  | 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/>. | ||||||
|  | */ | ||||||
|  | .uhr.pink { | ||||||
|  | 	background-color: #f0a; | ||||||
|  | } | ||||||
|  | .uhr.pink .dot.active{ | ||||||
|  | 	border-color: #fff; | ||||||
|  | 	box-shadow: 0 0 0.1em #fff; | ||||||
|  | } | ||||||
|  | .uhr.pink .letter.active{ | ||||||
|  | 	color: #fff; | ||||||
|  | 	text-shadow: 0 0 0.1em #fff; | ||||||
|  | } | ||||||
|  | .pink .onoffswitch-inner:before { | ||||||
|  | 	background-color: #f0a; | ||||||
|  | } | ||||||
|  | .uhr.pink .dot:not(.active) { | ||||||
|  | 	border-color: rgba(255,255,255,0.1); | ||||||
|  | 	box-shadow: 0 0 0.1em rgba(255,255,255,0.1); | ||||||
|  | } | ||||||
|  | .uhr.pink .letter:not(.active) { | ||||||
|  | 	color: rgba(255,255,255,0.1); | ||||||
|  | 	text-shadow: 0 0 0.1em rgba(255,255,255,0.1); | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								uhr.js
									
										
									
									
									
								
							
							
						
						
									
										1
									
								
								uhr.js
									
										
									
									
									
								
							|  | @ -226,6 +226,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| 				themeChooser.append('<option value="blue">Blau</option>'); | 				themeChooser.append('<option value="blue">Blau</option>'); | ||||||
| 				themeChooser.append('<option value="green">Grün</option>'); | 				themeChooser.append('<option value="green">Grün</option>'); | ||||||
| 				themeChooser.append('<option value="white">Weiss</option>'); | 				themeChooser.append('<option value="white">Weiss</option>'); | ||||||
|  | 				themeChooser.append('<option value="pink">Pink</option>'); | ||||||
| 				e.after(themeChooser); | 				e.after(themeChooser); | ||||||
| 			} | 			} | ||||||
| 		}, | 		}, | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue