Merge branch 'develop' into feature/splashscreen
This commit is contained in:
commit
6ef4f36b07
8 changed files with 44 additions and 6 deletions
BIN
apple-touch-icon-precomposed.png
Normal file
BIN
apple-touch-icon-precomposed.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
BIN
icon.png
BIN
icon.png
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB |
|
|
@ -26,10 +26,10 @@ 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" href="icon.png" />
|
<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" />
|
||||||
<link rel="apple-touch-startup-image" href="splash.png" />
|
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
<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-status-bar-style" content="black" />
|
||||||
<meta name="apple-mobile-web-app-title" content="Bärneruhr" />
|
<meta name="apple-mobile-web-app-title" content="Bärneruhr" />
|
||||||
|
|
|
||||||
|
|
@ -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>
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
CACHE MANIFEST
|
CACHE MANIFEST
|
||||||
# 5.0-beta
|
# 5.0.1
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
README.md
|
README.md
|
||||||
|
apple-touch-icon-precomposed.png
|
||||||
favicon.png
|
favicon.png
|
||||||
icon.png
|
|
||||||
index.html
|
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
|
||||||
uhr.js
|
uhr.js
|
||||||
uhr.woff
|
uhr.woff
|
||||||
info/index.html
|
info/index.html
|
||||||
info/info.css
|
info/info.css
|
||||||
|
|
|
||||||
BIN
splash.png
BIN
splash.png
Binary file not shown.
|
Before Width: | Height: | Size: 27 KiB |
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
|
|
@ -228,6 +228,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…
Reference in a new issue