diff --git a/dist/uhr.min.css b/dist/uhr.min.css deleted file mode 100644 index 04e1d74..0000000 --- a/dist/uhr.min.css +++ /dev/null @@ -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} \ No newline at end of file diff --git a/.bowerrc b/legacy/.bowerrc similarity index 100% rename from .bowerrc rename to legacy/.bowerrc diff --git a/.gitlab-ci.yml b/legacy/.gitlab-ci.yml similarity index 100% rename from .gitlab-ci.yml rename to legacy/.gitlab-ci.yml diff --git a/.htaccess b/legacy/.htaccess similarity index 100% rename from .htaccess rename to legacy/.htaccess diff --git a/.jshintrc b/legacy/.jshintrc similarity index 100% rename from .jshintrc rename to legacy/.jshintrc diff --git a/Gruntfile.js b/legacy/Gruntfile.js similarity index 100% rename from Gruntfile.js rename to legacy/Gruntfile.js diff --git a/README.md b/legacy/README.md similarity index 99% rename from README.md rename to legacy/README.md index a353c2f..a2227e7 100644 --- a/README.md +++ b/legacy/README.md @@ -19,7 +19,8 @@ Du willst Bärneruhr auf deiner Website verwenden? Dank des jQuery-Plugins geht Beim Einbinden muss das attribut `data-class` angegeben werden, welches die CSS-Klasse des Themes definiert. Optional kann mit `data-name` ein im Dropdown anzuzeigender Name angegeben werden. Beispiel: ```html - + + ``` * Binde nach den CSS-Dateien (wichtig!) folgende Javascript-Dateien im HTML-Dokument ein: diff --git a/VERSION b/legacy/VERSION similarity index 100% rename from VERSION rename to legacy/VERSION diff --git a/bower.json b/legacy/bower.json similarity index 100% rename from bower.json rename to legacy/bower.json diff --git a/css/uhr-black.css b/legacy/css/uhr-black.css similarity index 100% rename from css/uhr-black.css rename to legacy/css/uhr-black.css diff --git a/css/uhr-blue.css b/legacy/css/uhr-blue.css similarity index 100% rename from css/uhr-blue.css rename to legacy/css/uhr-blue.css diff --git a/css/uhr-green.css b/legacy/css/uhr-green.css similarity index 100% rename from css/uhr-green.css rename to legacy/css/uhr-green.css diff --git a/css/uhr-pink.css b/legacy/css/uhr-pink.css similarity index 100% rename from css/uhr-pink.css rename to legacy/css/uhr-pink.css diff --git a/css/uhr-red.css b/legacy/css/uhr-red.css similarity index 100% rename from css/uhr-red.css rename to legacy/css/uhr-red.css diff --git a/css/uhr-white.css b/legacy/css/uhr-white.css similarity index 100% rename from css/uhr-white.css rename to legacy/css/uhr-white.css diff --git a/css/uhr-yellow.css b/legacy/css/uhr-yellow.css similarity index 100% rename from css/uhr-yellow.css rename to legacy/css/uhr-yellow.css diff --git a/css/uhr.css b/legacy/css/uhr.css similarity index 96% rename from css/uhr.css rename to legacy/css/uhr.css index 7ea3917..40c3de3 100644 --- a/css/uhr.css +++ b/legacy/css/uhr.css @@ -14,7 +14,7 @@ along with this program. If not, see . */ @font-face { font-family: 'Uhrenfont'; - src: url('../resources/uhr.woff') format('woff'); + src: url('legacy/resourcesrces/uhr.woff') format('woff'); } body { @@ -206,7 +206,7 @@ body { a.uhr-configlink { cursor: pointer; - background: url("../resources/settings.png") no-repeat; + background: url("legacy/resourcesrces/settings.png") no-repeat; width: 24px; height: 24px; display: inline-block; @@ -236,7 +236,7 @@ a.uhr-closecontrolpanel { top: -1em; width: 24px; height: 24px; - background: url("../resources/close.png") no-repeat; + background: url("legacy/resourcesrces/close.png") no-repeat; } #disclaimer { diff --git a/deploy.sh b/legacy/deploy.sh similarity index 100% rename from deploy.sh rename to legacy/deploy.sh diff --git a/dist/jquery.uhr.base.js b/legacy/dist/jquery.uhr.base.js similarity index 100% rename from dist/jquery.uhr.base.js rename to legacy/dist/jquery.uhr.base.js diff --git a/dist/jquery.uhr.base.min.js b/legacy/dist/jquery.uhr.base.min.js similarity index 100% rename from dist/jquery.uhr.base.min.js rename to legacy/dist/jquery.uhr.base.min.js diff --git a/dist/jquery.uhr.baselangs.js b/legacy/dist/jquery.uhr.baselangs.js similarity index 100% rename from dist/jquery.uhr.baselangs.js rename to legacy/dist/jquery.uhr.baselangs.js diff --git a/dist/jquery.uhr.baselangs.min.js b/legacy/dist/jquery.uhr.baselangs.min.js similarity index 100% rename from dist/jquery.uhr.baselangs.min.js rename to legacy/dist/jquery.uhr.baselangs.min.js diff --git a/dist/jquery.uhr.complete.js b/legacy/dist/jquery.uhr.complete.js similarity index 100% rename from dist/jquery.uhr.complete.js rename to legacy/dist/jquery.uhr.complete.js diff --git a/dist/jquery.uhr.complete.min.js b/legacy/dist/jquery.uhr.complete.min.js similarity index 100% rename from dist/jquery.uhr.complete.min.js rename to legacy/dist/jquery.uhr.complete.min.js diff --git a/dist/jquery.uhr.langs.js b/legacy/dist/jquery.uhr.langs.js similarity index 100% rename from dist/jquery.uhr.langs.js rename to legacy/dist/jquery.uhr.langs.js diff --git a/dist/jquery.uhr.langs.min.js b/legacy/dist/jquery.uhr.langs.min.js similarity index 100% rename from dist/jquery.uhr.langs.min.js rename to legacy/dist/jquery.uhr.langs.min.js diff --git a/dist/jquery.uhr.main.js b/legacy/dist/jquery.uhr.main.js similarity index 100% rename from dist/jquery.uhr.main.js rename to legacy/dist/jquery.uhr.main.js diff --git a/dist/jquery.uhr.main.min.js b/legacy/dist/jquery.uhr.main.min.js similarity index 100% rename from dist/jquery.uhr.main.min.js rename to legacy/dist/jquery.uhr.main.min.js diff --git a/dist/libs.js b/legacy/dist/libs.js similarity index 100% rename from dist/libs.js rename to legacy/dist/libs.js diff --git a/dist/libs.min.js b/legacy/dist/libs.min.js similarity index 100% rename from dist/libs.min.js rename to legacy/dist/libs.min.js diff --git a/dist/uhr-black.min.css b/legacy/dist/uhr-black.min.css similarity index 100% rename from dist/uhr-black.min.css rename to legacy/dist/uhr-black.min.css diff --git a/dist/uhr-blue.min.css b/legacy/dist/uhr-blue.min.css similarity index 100% rename from dist/uhr-blue.min.css rename to legacy/dist/uhr-blue.min.css diff --git a/dist/uhr-green.min.css b/legacy/dist/uhr-green.min.css similarity index 100% rename from dist/uhr-green.min.css rename to legacy/dist/uhr-green.min.css diff --git a/dist/uhr-pink.min.css b/legacy/dist/uhr-pink.min.css similarity index 100% rename from dist/uhr-pink.min.css rename to legacy/dist/uhr-pink.min.css diff --git a/dist/uhr-red.min.css b/legacy/dist/uhr-red.min.css similarity index 100% rename from dist/uhr-red.min.css rename to legacy/dist/uhr-red.min.css diff --git a/dist/uhr-white.min.css b/legacy/dist/uhr-white.min.css similarity index 100% rename from dist/uhr-white.min.css rename to legacy/dist/uhr-white.min.css diff --git a/dist/uhr-yellow.min.css b/legacy/dist/uhr-yellow.min.css similarity index 100% rename from dist/uhr-yellow.min.css rename to legacy/dist/uhr-yellow.min.css diff --git a/legacy/dist/uhr.min.css b/legacy/dist/uhr.min.css new file mode 100644 index 0000000..ace6df7 --- /dev/null +++ b/legacy/dist/uhr.min.css @@ -0,0 +1 @@ +@font-face{font-family:Uhrenfont;src:url(legacy/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(legacy/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(legacy/resources/close.png) no-repeat}#disclaimer{font-size:.5em}#disclaimer a{color:#444;text-decoration:underline} diff --git a/index.html b/legacy/index.html similarity index 100% rename from index.html rename to legacy/index.html diff --git a/info/index.html b/legacy/info/index.html similarity index 100% rename from info/index.html rename to legacy/info/index.html diff --git a/info/info.css b/legacy/info/info.css similarity index 100% rename from info/info.css rename to legacy/info/info.css diff --git a/manifest.appcache b/legacy/manifest.appcache similarity index 100% rename from manifest.appcache rename to legacy/manifest.appcache diff --git a/package.json b/legacy/package.json similarity index 100% rename from package.json rename to legacy/package.json diff --git a/resources/apple-touch-icon-precomposed.png b/legacy/resources/apple-touch-icon-precomposed.png similarity index 100% rename from resources/apple-touch-icon-precomposed.png rename to legacy/resources/apple-touch-icon-precomposed.png diff --git a/resources/close.png b/legacy/resources/close.png similarity index 100% rename from resources/close.png rename to legacy/resources/close.png diff --git a/resources/favicon.png b/legacy/resources/favicon.png similarity index 100% rename from resources/favicon.png rename to legacy/resources/favicon.png diff --git a/resources/settings.png b/legacy/resources/settings.png similarity index 100% rename from resources/settings.png rename to legacy/resources/settings.png diff --git a/resources/uhr.woff b/legacy/resources/uhr.woff similarity index 100% rename from resources/uhr.woff rename to legacy/resources/uhr.woff diff --git a/src/uhr-de.js b/legacy/src/uhr-de.js similarity index 100% rename from src/uhr-de.js rename to legacy/src/uhr-de.js diff --git a/src/uhr-de_CH.js b/legacy/src/uhr-de_CH.js similarity index 100% rename from src/uhr-de_CH.js rename to legacy/src/uhr-de_CH.js diff --git a/src/uhr-de_CH_genau.js b/legacy/src/uhr-de_CH_genau.js similarity index 100% rename from src/uhr-de_CH_genau.js rename to legacy/src/uhr-de_CH_genau.js diff --git a/src/uhr-dk.js b/legacy/src/uhr-dk.js similarity index 100% rename from src/uhr-dk.js rename to legacy/src/uhr-dk.js diff --git a/src/uhr-en.js b/legacy/src/uhr-en.js similarity index 100% rename from src/uhr-en.js rename to legacy/src/uhr-en.js diff --git a/src/uhr-es.js b/legacy/src/uhr-es.js similarity index 100% rename from src/uhr-es.js rename to legacy/src/uhr-es.js diff --git a/src/uhr-fr.js b/legacy/src/uhr-fr.js similarity index 100% rename from src/uhr-fr.js rename to legacy/src/uhr-fr.js diff --git a/src/uhr-it.js b/legacy/src/uhr-it.js similarity index 100% rename from src/uhr-it.js rename to legacy/src/uhr-it.js diff --git a/src/uhr-nl.js b/legacy/src/uhr-nl.js similarity index 100% rename from src/uhr-nl.js rename to legacy/src/uhr-nl.js diff --git a/src/uhr-pt.js b/legacy/src/uhr-pt.js similarity index 100% rename from src/uhr-pt.js rename to legacy/src/uhr-pt.js diff --git a/src/uhr.js b/legacy/src/uhr.js similarity index 100% rename from src/uhr.js rename to legacy/src/uhr.js diff --git a/test/.jshintrc b/legacy/test/.jshintrc similarity index 100% rename from test/.jshintrc rename to legacy/test/.jshintrc diff --git a/test/css/mocha.css b/legacy/test/css/mocha.css similarity index 100% rename from test/css/mocha.css rename to legacy/test/css/mocha.css diff --git a/test/fastforward.html b/legacy/test/fastforward.html similarity index 100% rename from test/fastforward.html rename to legacy/test/fastforward.html diff --git a/test/lib/chai.js b/legacy/test/lib/chai.js similarity index 99% rename from test/lib/chai.js rename to legacy/test/lib/chai.js index a75da85..ce4892d 100644 --- a/test/lib/chai.js +++ b/legacy/test/lib/chai.js @@ -4774,9 +4774,9 @@ require.alias("chaijs-type-detect/lib/type.js", "chaijs-deep-eql/deps/type-detec require.alias("chaijs-type-detect/lib/type.js", "chaijs-type-detect/index.js"); require.alias("chaijs-deep-eql/lib/eql.js", "chaijs-deep-eql/index.js"); require.alias("chai/index.js", "chai/index.js");if (typeof exports == "object") { - module.exports = require("chai"); + module.exports = require("legacy/test/lib/chai"); } else if (typeof define == "function" && define.amd) { - define([], function(){ return require("chai"); }); + define([], function(){ return require("legacy/test/lib/chai"); }); } else { - this["chai"] = require("chai"); -}})(); \ No newline at end of file + this["chai"] = require("legacy/test/lib/chai"); +}})(); diff --git a/test/lib/mocha.js b/legacy/test/lib/mocha.js similarity index 99% rename from test/lib/mocha.js rename to legacy/test/lib/mocha.js index 19edc87..ea3ac73 100644 --- a/test/lib/mocha.js +++ b/legacy/test/lib/mocha.js @@ -700,28 +700,28 @@ Progress.prototype.draw = function(ctx){ , y = half , rad = half - 1 , fontSize = this._fontSize; - + ctx.font = fontSize + 'px ' + this._font; - + var angle = Math.PI * 2 * (percent / 100); ctx.clearRect(0, 0, size, size); - + // outer circle ctx.strokeStyle = '#9f9f9f'; ctx.beginPath(); ctx.arc(x, y, rad, 0, angle, false); ctx.stroke(); - + // inner circle ctx.strokeStyle = '#eee'; ctx.beginPath(); ctx.arc(x, y, rad - 1, 0, angle, true); ctx.stroke(); - + // text var text = this._text || (percent | 0) + '%' , w = ctx.measureText(text).width; - + ctx.fillText( text , x - w / 2 + 1 @@ -5746,7 +5746,7 @@ process.on = function(e, fn){ * Expose mocha. */ -var Mocha = global.Mocha = require('mocha'), +var Mocha = global.Mocha = require('legacy/test/lib/mocha'), mocha = global.mocha = new Mocha({ reporter: 'html' }); // The BDD UI is registered by default, but no UI will be functional in the @@ -5839,4 +5839,4 @@ mocha.run = function(fn){ */ Mocha.process = process; -})(); \ No newline at end of file +})(); diff --git a/test/test.html b/legacy/test/test.html similarity index 100% rename from test/test.html rename to legacy/test/test.html diff --git a/test/test.js b/legacy/test/test.js similarity index 100% rename from test/test.js rename to legacy/test/test.js