manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'develop' into feature/new-splashscreen

Browse source 
Conflicts:
	index.html
	manifest.appcache
This commit is contained in:
Manuel Friedli 2014-06-28 02:14:50 +02:00
commit 4360f5aee1
5 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
index.html
View file

@ -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" />
<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" /> <link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" />
<link rel="apple-touch-startup-image" href="startup-320x460.png" media="screen and (max-device-width : 320px)" /> <link rel="apple-touch-startup-image" href="startup-320x460.png" media="screen and (max-device-width : 320px)" />

1
info/index.html
View file

@ -32,6 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<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="../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" />
<meta name="viewport" content="width=device-width,user-scalable=yes,initial-scale=1" />
</head> </head>
<body> <body>
<h1 id="main-title">Die Zeit im Wort</h1> <h1 id="main-title">Die Zeit im Wort</h1>

4
manifest.appcache
View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 5.0-beta1 # 5.0.1
COPYING COPYING
README.md README.md
@ -12,13 +12,13 @@ index.html
jquery-2.1.0.min.js jquery-2.1.0.min.js
jquery-cookie-1.4.0.js jquery-cookie-1.4.0.js
jquery-ui-1.10.4.custom.min.js jquery-ui-1.10.4.custom.min.js
splash.png
uhr-black.css uhr-black.css
uhr-blue.css uhr-blue.css
uhr-de.js 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
View 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
View file

@ -227,6 +227,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);
} }
}, },