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

moved stuff from bower to npm, adapted gruntfile. tests fail for now.

This commit is contained in:
Manuel Friedli 2016-06-27 18:07:24 +02:00
parent 852ff910f0
commit 909e263d41
25 changed files with 2138 additions and 2795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.bowerrc
View File

@ -1,3 +0,0 @@
{
"directory": "bower_components"
}

8
Gruntfile.js
View File

@ -25,10 +25,10 @@ module.exports = function (grunt) {
},
libs: {
src: [
'bower_components/jquery/dist/jquery.js',
'bower_components/jquery-ui/ui/core.js',
'bower_components/jquery-ui/ui/widget.js',
'bower_components/jquery-cookie/jquery.cookie.js'
'node_modules/jquery/dist/jquery.js',
'node_modules/jqueryui-browser/ui/jquery.ui.core.js',
'node_modules/jqueryui-browser/ui/jquery.ui.widget.js',
'node_modules/jquery.cookie/jquery.cookie.js'
],
dest: 'dist/libs.js'
},

2
VERSION
View File

@ -1 +1 @@
8.0.3
8.0.4-dev.0

2
dist/jquery.uhr.base.js vendored
View File

@ -1,4 +1,4 @@
/*! uhr - v8.0.3 - 2016-06-27
/*! uhr - v8.0.4-dev.0 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {

4
dist/jquery.uhr.base.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/jquery.uhr.baselangs.js vendored
View File

@ -1,4 +1,4 @@
/*! uhr - v8.0.3 - 2016-06-27
/*! uhr - v8.0.4-dev.0 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {

4
dist/jquery.uhr.baselangs.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/jquery.uhr.complete.js vendored
View File

@ -1,4 +1,4 @@
/*! uhr - v8.0.3 - 2016-06-27
/*! uhr - v8.0.4-dev.0 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {

4
dist/jquery.uhr.complete.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/jquery.uhr.langs.js vendored
View File

@ -1,4 +1,4 @@
/*! uhr - v8.0.3 - 2016-06-27
/*! uhr - v8.0.4-dev.0 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {

4
dist/jquery.uhr.langs.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/jquery.uhr.main.js vendored
View File

@ -1,4 +1,4 @@
/*! uhr - v8.0.3 - 2016-06-27
/*! uhr - v8.0.4-dev.0 - 2016-06-27
* http://bärneruhr.ch/
* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
(function($) {

4
dist/jquery.uhr.main.min.js vendored
View File

File diff suppressed because one or more lines are too long

4863
dist/libs.js vendored
View File

File diff suppressed because it is too large Load Diff

7
dist/libs.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/uhr-black.min.css vendored
View File

@ -1 +0,0 @@
.black .onoffswitch-inner:before,.uhr.black{background-color:#111}.uhr.black .dot:not(.active){border-color:rgba(255,255,255,.1);box-shadow:0 0 .1em rgba(255,255,255,.1)}.uhr.black .letter:not(.active){color:rgba(255,255,255,.1);text-shadow:0 0 .1em rgba(255,255,255,.1)}

1
dist/uhr-blue.min.css vendored
View File

@ -1 +0,0 @@
.blue .onoffswitch-inner:before,.uhr.blue{background-color:#00a}.uhr.blue .dot:not(.active){border-color:rgba(255,255,255,.1);box-shadow:0 0 .1em rgba(255,255,255,.1)}.uhr.blue .letter:not(.active){color:rgba(255,255,255,.1);text-shadow:0 0 .1em rgba(255,255,255,.1)}

1
dist/uhr-green.min.css vendored
View File

@ -1 +0,0 @@
.green .onoffswitch-inner:before,.uhr.green{background-color:#0c0}.uhr.green .dot:not(.active){border-color:rgba(0,0,0,.1);box-shadow:0 0 .1em rgba(0,0,0,.1)}.uhr.green .letter:not(.active){color:rgba(0,0,0,.1);text-shadow:0 0 .1em rgba(0,0,0,.1)}

1
dist/uhr-pink.min.css vendored
View File

@ -1 +0,0 @@
.pink .onoffswitch-inner:before,.uhr.pink{background-color:#f0a}.uhr.pink .dot.active{border-color:#fff;box-shadow:0 0 .1em #fff}.uhr.pink .letter.active{color:#fff;text-shadow:0 0 .1em #fff}.uhr.pink .dot:not(.active){border-color:rgba(255,255,255,.1);box-shadow:0 0 .1em rgba(255,255,255,.1)}.uhr.pink .letter:not(.active){color:rgba(255,255,255,.1);text-shadow:0 0 .1em rgba(255,255,255,.1)}

1
dist/uhr-red.min.css vendored
View File

@ -1 +0,0 @@
.red .onoffswitch-inner:before,.uhr.red{background-color:#700}.uhr.red .dot:not(.active){border-color:rgba(255,255,255,.1);box-shadow:0 0 .1em rgba(255,255,255,.1)}.uhr.red .letter:not(.active){color:rgba(255,255,255,.1);text-shadow:0 0 .1em rgba(255,255,255,.1)}

1
dist/uhr-white.min.css vendored
View File

@ -1 +0,0 @@
.uhr.white,.white .onoffswitch-inner:before{background-color:#ccc}.uhr.white .dot.active{border-color:#fff;box-shadow:0 0 .1em #fff}.uhr.white .letter.active{color:#fff;text-shadow:0 0 .1em #fff}.uhr.white .dot:not(.active){border-color:rgba(0,0,0,.1);box-shadow:0 0 .1em rgba(0,0,0,.1)}.uhr.white .letter:not(.active){color:rgba(0,0,0,.1);text-shadow:0 0 .1em rgba(0,0,0,.1)}

1
dist/uhr-yellow.min.css vendored
View File

@ -1 +0,0 @@
.uhr.yellow,.yellow .onoffswitch-inner:before{background-color:#fd0}.uhr.yellow .dot.active{border-color:#fff;box-shadow:0 0 .1em #fff}.uhr.yellow .letter.active{color:#fff;text-shadow:0 0 .1em #fff}.uhr.yellow .dot:not(.active){border-color:rgba(0,0,0,.05);box-shadow:0 0 .1em rgba(0,0,0,.05)}.uhr.yellow .letter:not(.active){color:rgba(0,0,0,.05);text-shadow:0 0 .1em rgba(0,0,0,.05)}

1
dist/uhr.min.css vendored
View File

@ -1 +0,0 @@
@font-face{font-family:Uhrenfont;src:url(../resources/uhr.woff) format('woff')}body{font-family:Uhrenfont,sans-serif}.uhr{position:relative;margin:0;transition:background-color .5s}.dot,.uhr .letterarea,.uhr .reflection{position:absolute;display:block}.uhr .reflection{top:0;bottom:0;left:0;right:0;background:radial-gradient(225em 45em at 160% 0,rgba(255,255,255,.4) 0,rgba(255,255,255,.05) 40%,rgba(255,255,255,0) 40%) no-repeat;margin:.15em}.uhr .letterarea{top:12%;bottom:12%;left:12%;right:12%;overflow:hidden;font-size:200%}.dot1,.dot2{top:3.75%}.dot3,.dot4{bottom:3.75%}.dot2,.dot3{right:3.75%}.item{transition:box-shadow .5s,text-shadow .5s,border-color .5s,color .5s}.dot{height:0;width:0;border:.2em solid;border-radius:1em}.dot.active{border-color:#eee;box-shadow:0 0 .2em #eee}.dot1{left:3.75%}.dot4{left:3.75%}.letter{height:10%;width:9.0909%;padding:0;margin:0;display:inline-block;text-align:center;line-height:160%}.letter.active{color:#eee;text-shadow:0 0 .2em #eee}.onoffswitch{position:relative;width:86px;margin:1em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border:2px solid #999;border-radius:50px}.modeswitch-inner,.onoffswitch-inner{width:200%;margin-left:-100%;-moz-transition:margin .3s ease-in 0s;-webkit-transition:margin .3s ease-in 0s;-o-transition:margin .3s ease-in 0s;transition:margin .3s ease-in 0s}.modeswitch-inner:after,.modeswitch-inner:before,.onoffswitch-inner:after,.onoffswitch-inner:before{float:left;width:50%;height:24px;padding:0;line-height:24px;font-size:18px;font-weight:700;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.onoffswitch-inner:before{content:"EIN";padding-left:12px;color:#eee;transition:background-color .5s}.onoffswitch-inner:after{content:"AUS";padding-right:12px;background-color:#eee;color:#999;text-align:right}.onoffswitch-switch{width:30px;margin:-3px;background:#fff;border:2px solid #999;border-radius:50px;position:absolute;top:0;bottom:0;right:58px;-moz-transition:all .3s ease-in 0s;-webkit-transition:all .3s ease-in 0s;-o-transition:all .3s ease-in 0s;transition:all .3s ease-in 0s}a.uhr-closecontrolpanel,a.uhr-configlink{cursor:pointer;display:inline-block;width:24px;height:24px}.onoffswitch-checkbox:checked+.onoffswitch-label .modeswitch-inner,.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-left:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:0}.modeswitch-inner:before{content:"MIN";padding-left:12px;background-color:#fff;color:#000}.modeswitch-inner:after{content:"SEC";padding-right:12px;background-color:#fff;color:#000;text-align:right}a.uhr-configlink{background:url(../resources/settings.png) no-repeat;margin:2px;vertical-align:top}.uhr-controlpanel{border-radius:.5em;box-shadow:0 0 1em #000;background-color:#fff;display:inline-block;padding:.5em;position:sticky;bottom:0;margin-left:1em}.uhr-controlpanel .content{position:relative}a.uhr-closecontrolpanel{position:absolute;right:0;top:-1em;background:url(../resources/close.png) no-repeat}#disclaimer{font-size:.5em}#disclaimer a{color:#444;text-decoration:underline}

2
manifest.appcache
View File

@ -1,5 +1,5 @@
CACHE MANIFEST
# Version 8.0.3
# Version 8.0.4-dev.0
/
dist/jquery.uhr.base.min.js

10
package.json
View File

@ -22,8 +22,12 @@
}
],
"license": "GPL-3.0",
"dependencies": {
"jquery": "~2.1.3",
"jqueryui-browser": "~1.10.2-1",
"jquery.cookie": "~1.4.1"
},
"devDependencies": {
"bower": "^1.5.3",
"grunt": "~0.4.5",
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "~0.6.0",
@ -39,6 +43,8 @@
"jshint-stylish": "~2.0.1",
"load-grunt-tasks": "~3.3.0",
"phantomjs": "^1.9.18",
"time-grunt": "~1.2.1"
"time-grunt": "~1.2.1",
"mocha": "~2.3.3",
"chai": "~3.3.0"
}
}