Merge branch 'feature/uhrmodul' of /var/lib/git/repositories/manuel/uhr into develop

This commit is contained in:
Manuel Friedli 2013-11-28 11:15:41 +01:00
commit ce56afd0f2
6 changed files with 15 additions and 15 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 3.0 # 3.0.1
COPYING COPYING
index.html index.html

View file

@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
.black .onoffswitch-inner:before { .black .onoffswitch-inner:before {
background-color: #111; background-color: #111;
} }
.uhr.black .dot { .uhr.black .dot:not(.active) {
border-color: rgba(255,255,255,0.1); border-color: rgba(255,255,255,0.1);
box-shadow: 0 0 0.1em rgba(255,255,255,0.1); box-shadow: 0 0 0.1em rgba(255,255,255,0.1);
} }
.uhr.black .letter { .uhr.black .letter:not(.active) {
color: rgba(255,255,255,0.1); color: rgba(255,255,255,0.1);
text-shadow: 0 0 0.1em rgba(255,255,255,0.1); text-shadow: 0 0 0.1em rgba(255,255,255,0.1);
} }

View file

@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
.blue .onoffswitch-inner:before { .blue .onoffswitch-inner:before {
background-color: #00a; background-color: #00a;
} }
.uhr.blue .dot { .uhr.blue .dot:not(.active) {
border-color: rgba(255,255,255,0.1); border-color: rgba(255,255,255,0.1);
box-shadow: 0 0 0.1em rgba(255,255,255,0.1); box-shadow: 0 0 0.1em rgba(255,255,255,0.1);
} }
.uhr.blue .letter { .uhr.blue .letter:not(.active) {
color: rgba(255,255,255,0.1); color: rgba(255,255,255,0.1);
text-shadow: 0 0 0.1em rgba(255,255,255,0.1); text-shadow: 0 0 0.1em rgba(255,255,255,0.1);
} }

View file

@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
.green .onoffswitch-inner:before { .green .onoffswitch-inner:before {
background-color: #0c0; background-color: #0c0;
} }
.uhr.green .dot { .uhr.green .dot:not(.active) {
border-color: rgba(0,0,0,0.1); border-color: rgba(0,0,0,0.1);
box-shadow: 0 0 0.1em rgba(0,0,0,0.1); box-shadow: 0 0 0.1em rgba(0,0,0,0.1);
} }
.uhr.green .letter { .uhr.green .letter:not(.active) {
color: rgba(0,0,0,0.1); color: rgba(0,0,0,0.1);
text-shadow: 0 0 0.1em rgba(0,0,0,0.1); text-shadow: 0 0 0.1em rgba(0,0,0,0.1);
} }

View file

@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
.red .onoffswitch-inner:before { .red .onoffswitch-inner:before {
background-color: #700; background-color: #700;
} }
.uhr.red .dot { .uhr.red .dot:not(.active){
border-color: rgba(255,255,255,0.1); border-color: rgba(255,255,255,0.1);
box-shadow: 0 0 0.1em rgba(255,255,255,0.1); box-shadow: 0 0 0.1em rgba(255,255,255,0.1);
} }
.uhr.red .letter { .uhr.red .letter:not(.active) {
color: rgba(255,255,255,0.1); color: rgba(255,255,255,0.1);
text-shadow: 0 0 0.1em rgba(255,255,255,0.1); text-shadow: 0 0 0.1em rgba(255,255,255,0.1);
} }

View file

@ -16,21 +16,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
background-color: #ccc; background-color: #ccc;
} }
.uhr.white .dot.active{ .uhr.white .dot.active{
border-color: #fff !important; border-color: #fff;
box-shadow: 0 0 0.1em #fff !important; box-shadow: 0 0 0.1em #fff;
} }
.uhr.white .letter.active{ .uhr.white .letter.active{
color: #fff !important; color: #fff;
text-shadow: 0 0 0.1em #fff !important; text-shadow: 0 0 0.1em #fff;
} }
.white .onoffswitch-inner:before { .white .onoffswitch-inner:before {
background-color: #ccc; background-color: #ccc;
} }
.uhr.white .dot { .uhr.white .dot:not(.active) {
border-color: rgba(0,0,0,0.1); border-color: rgba(0,0,0,0.1);
box-shadow: 0 0 0.1em rgba(0,0,0,0.1); box-shadow: 0 0 0.1em rgba(0,0,0,0.1);
} }
.uhr.white .letter { .uhr.white .letter:not(.active) {
color: rgba(0,0,0,0.1); color: rgba(0,0,0,0.1);
text-shadow: 0 0 0.1em rgba(0,0,0,0.1); text-shadow: 0 0 0.1em rgba(0,0,0,0.1);
} }