Generate the CSS files by rollup as well. Grunt is now obsolete.
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
41c8f57146
commit
3cb1a940f0
|
|
@ -0,0 +1 @@
|
|||
import '../css/uhr.css';
|
||||
|
|
@ -0,0 +1 @@
|
|||
import '../css/uhr-black.css';
|
||||
|
|
@ -0,0 +1 @@
|
|||
import '../css/uhr-blue.css';
|
||||
|
|
@ -0,0 +1 @@
|
|||
import '../css/uhr-green.css';
|
||||
|
|
@ -0,0 +1 @@
|
|||
import '../css/uhr-pink.css';
|
||||
|
|
@ -0,0 +1 @@
|
|||
import '../css/uhr-red.css';
|
||||
|
|
@ -0,0 +1 @@
|
|||
import '../css/uhr-white.css';
|
||||
|
|
@ -0,0 +1 @@
|
|||
import '../css/uhr-yellow.css';
|
||||
|
|
@ -1 +1 @@
|
|||
.uhr.black{background-color:#111}.black .onoffswitch-inner:before{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)}
|
||||
.black .onoffswitch-inner:before,.uhr.black{background-color:#111}.uhr.black .dot:not(.active){border-color:hsla(0,0%,100%,.1);box-shadow:0 0 .1em hsla(0,0%,100%,.1)}.uhr.black .letter:not(.active){color:hsla(0,0%,100%,.1);text-shadow:0 0 .1em hsla(0,0%,100%,.1)}
|
||||
|
|
@ -1 +1 @@
|
|||
.uhr.blue{background-color:#00a}.blue .onoffswitch-inner:before{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)}
|
||||
.blue .onoffswitch-inner:before,.uhr.blue{background-color:#00a}.uhr.blue .dot:not(.active){border-color:hsla(0,0%,100%,.1);box-shadow:0 0 .1em hsla(0,0%,100%,.1)}.uhr.blue .letter:not(.active){color:hsla(0,0%,100%,.1);text-shadow:0 0 .1em hsla(0,0%,100%,.1)}
|
||||
|
|
@ -1 +1 @@
|
|||
.uhr.green{background-color:#0c0}.green .onoffswitch-inner:before{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)}
|
||||
.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 +1 @@
|
|||
.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}.pink .onoffswitch-inner:before{background-color:#f0a}.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)}
|
||||
.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}.pink .onoffswitch-inner:before{background-color:#f0a}.uhr.pink .dot:not(.active){border-color:hsla(0,0%,100%,.1);box-shadow:0 0 .1em hsla(0,0%,100%,.1)}.uhr.pink .letter:not(.active){color:hsla(0,0%,100%,.1);text-shadow:0 0 .1em hsla(0,0%,100%,.1)}
|
||||
|
|
@ -1 +1 @@
|
|||
.uhr.red{background-color:#700}.red .onoffswitch-inner:before{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)}
|
||||
.red .onoffswitch-inner:before,.uhr.red{background-color:#700}.uhr.red .dot:not(.active){border-color:hsla(0,0%,100%,.1);box-shadow:0 0 .1em hsla(0,0%,100%,.1)}.uhr.red .letter:not(.active){color:hsla(0,0%,100%,.1);text-shadow:0 0 .1em hsla(0,0%,100%,.1)}
|
||||
|
|
@ -1 +1 @@
|
|||
@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}.uhr .reflection{position:absolute;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 scroll;display:block;margin:.15em}.uhr .letterarea{display:block;position:absolute;top:12%;bottom:12%;left:12%;right:12%;overflow:hidden;font-size:200%}.item{transition:box-shadow .5s,text-shadow .5s,border-color .5s,color .5s}.dot{position:absolute;display:block;height:0;width:0;border:.2em solid;border-radius:1em}.dot.active{border-color:#eee;box-shadow:0 0 .2em #eee}.dot1{top:3.75%;left:3.75%}.dot2{top:3.75%;right:3.75%}.dot3{bottom:3.75%;right:3.75%}.dot4{bottom:3.75%;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;color:#fff;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}.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{cursor:pointer;background:url(../resources/settings.png) no-repeat;width:24px;height:24px;display:inline-block;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{cursor:pointer;display:inline-block;position:absolute;right:0;top:-1em;width:24px;height:24px;background:url(../resources/close.png) no-repeat}#disclaimer{font-size:.5em}#disclaimer a{color:#444;text-decoration:underline}
|
||||
@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}.uhr .reflection{position:absolute;top:0;bottom:0;left:0;right:0;background:radial-gradient(225em 45em at 160% 0,hsla(0,0%,100%,.4) 0,hsla(0,0%,100%,.05) 40%,hsla(0,0%,100%,0) 0) no-repeat scroll;display:block;margin:.15em}.uhr .letterarea{display:block;position:absolute;top:12%;bottom:12%;left:12%;right:12%;overflow:hidden;font-size:200%}.item{transition:box-shadow .5s,text-shadow .5s,border-color .5s,color .5s}.dot{position:absolute;display:block;height:0;width:0;border:.2em solid;border-radius:1em}.dot.active{border-color:#eee;box-shadow:0 0 .2em #eee}.dot1{top:3.75%;left:3.75%}.dot2{top:3.75%;right:3.75%}.dot3{right:3.75%}.dot3,.dot4{bottom: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;color:#fff;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}.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{cursor:pointer;background:url(../resources/settings.png) no-repeat;width:24px;height:24px;display:inline-block;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{cursor:pointer;display:inline-block;position:absolute;right:0;top:-1em;width:24px;height:24px;background:url(../resources/close.png) no-repeat}#disclaimer{font-size:.5em}#disclaimer a{color:#444;text-decoration:underline}
|
||||
File diff suppressed because it is too large
Load Diff
25
package.json
25
package.json
|
|
@ -8,14 +8,22 @@
|
|||
],
|
||||
"scripts": {
|
||||
"prebuild": "npm run clean",
|
||||
"build": "npm-run-all --parallel rollup:* run-grunt",
|
||||
"build": "npm-run-all --parallel rollup:js:* rollup:css:*",
|
||||
"clean": "rimraf dist",
|
||||
"rollup:app": "rollup --config rollup.config-app.js",
|
||||
"rollup:base": "rollup --config rollup.config-base.js",
|
||||
"rollup:baselangs": "rollup --config rollup.config-baselangs.js",
|
||||
"rollup:complete": "rollup --config rollup.config-complete.js",
|
||||
"rollup:langs": "rollup --config rollup.config-langs.js",
|
||||
"rollup:libs": "rollup --config rollup.config-libs.js",
|
||||
"rollup:js:app": "rollup --config rollup.config-app.js",
|
||||
"rollup:js:base": "rollup --config rollup.config-base.js",
|
||||
"rollup:js:baselangs": "rollup --config rollup.config-baselangs.js",
|
||||
"rollup:js:complete": "rollup --config rollup.config-complete.js",
|
||||
"rollup:js:langs": "rollup --config rollup.config-langs.js",
|
||||
"rollup:js:libs": "rollup --config rollup.config-libs.js",
|
||||
"rollup:css:app": "rollup --config rollup.config-css-app.js",
|
||||
"rollup:css:black": "rollup --config rollup.config-css-black.js",
|
||||
"rollup:css:blue": "rollup --config rollup.config-css-blue.js",
|
||||
"rollup:css:green": "rollup --config rollup.config-css-green.js",
|
||||
"rollup:css:pink": "rollup --config rollup.config-css-pink.js",
|
||||
"rollup:css:red": "rollup --config rollup.config-css-red.js",
|
||||
"rollup:css:white": "rollup --config rollup.config-css-white.js",
|
||||
"rollup:css:yellow": "rollup --config rollup.config-css-yellow.js",
|
||||
"run-grunt": "grunt"
|
||||
},
|
||||
"homepage": "http://bärneruhr.ch/",
|
||||
|
|
@ -42,6 +50,7 @@
|
|||
"devDependencies": {
|
||||
"@rollup/plugin-node-resolve": "^11.2.0",
|
||||
"chai": "4.2.0",
|
||||
"cssnano": "^4.1.10",
|
||||
"grunt": "^1.3.0",
|
||||
"grunt-cli": "1.3.2",
|
||||
"grunt-contrib-clean": "2.0.0",
|
||||
|
|
@ -59,7 +68,9 @@
|
|||
"mocha": "6.1.4",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"phantomjs-prebuilt": "2.1.16",
|
||||
"postcss": "^8.2.6",
|
||||
"rollup": "^2.39.1",
|
||||
"rollup-plugin-css-bundle": "^1.0.4",
|
||||
"rollup-plugin-terser": "^7.0.2",
|
||||
"time-grunt": "2.0.0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
import cssbundle from 'rollup-plugin-css-bundle';
|
||||
import postcss from "postcss";
|
||||
import cssnano from "cssnano";
|
||||
|
||||
export default {
|
||||
input: 'build-configs/css-app.js',
|
||||
plugins: [cssbundle({
|
||||
transform: code => postcss([cssnano]).process(code),
|
||||
output: 'dist/uhr.min.css'
|
||||
})]
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import cssbundle from 'rollup-plugin-css-bundle';
|
||||
import postcss from 'postcss';
|
||||
import cssnano from 'cssnano';
|
||||
|
||||
export default {
|
||||
input: 'build-configs/css-black.js',
|
||||
plugins: [cssbundle({
|
||||
transform: code => postcss([cssnano]).process(code),
|
||||
output: 'dist/uhr-black.min.css'
|
||||
})]
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import cssbundle from 'rollup-plugin-css-bundle';
|
||||
import postcss from 'postcss';
|
||||
import cssnano from 'cssnano';
|
||||
|
||||
export default {
|
||||
input: 'build-configs/css-blue.js',
|
||||
plugins: [cssbundle({
|
||||
transform: code => postcss([cssnano]).process(code),
|
||||
output: 'dist/uhr-blue.min.css'
|
||||
})]
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import cssbundle from 'rollup-plugin-css-bundle';
|
||||
import postcss from 'postcss';
|
||||
import cssnano from 'cssnano';
|
||||
|
||||
export default {
|
||||
input: 'build-configs/css-green.js',
|
||||
plugins: [cssbundle({
|
||||
transform: code => postcss([cssnano]).process(code),
|
||||
output: 'dist/uhr-green.min.css'
|
||||
})]
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import cssbundle from 'rollup-plugin-css-bundle';
|
||||
import postcss from 'postcss';
|
||||
import cssnano from 'cssnano';
|
||||
|
||||
export default {
|
||||
input: 'build-configs/css-pink.js',
|
||||
plugins: [cssbundle({
|
||||
transform: code => postcss([cssnano]).process(code),
|
||||
output: 'dist/uhr-pink.min.css'
|
||||
})]
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import cssbundle from 'rollup-plugin-css-bundle';
|
||||
import postcss from 'postcss';
|
||||
import cssnano from 'cssnano';
|
||||
|
||||
export default {
|
||||
input: 'build-configs/css-red.js',
|
||||
plugins: [cssbundle({
|
||||
transform: code => postcss([cssnano]).process(code),
|
||||
output: 'dist/uhr-red.min.css'
|
||||
})]
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import cssbundle from 'rollup-plugin-css-bundle';
|
||||
import postcss from 'postcss';
|
||||
import cssnano from 'cssnano';
|
||||
|
||||
export default {
|
||||
input: 'build-configs/css-white.js',
|
||||
plugins: [cssbundle({
|
||||
transform: code => postcss([cssnano]).process(code),
|
||||
output: 'dist/uhr-white.min.css'
|
||||
})]
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import cssbundle from 'rollup-plugin-css-bundle';
|
||||
import postcss from 'postcss';
|
||||
import cssnano from 'cssnano';
|
||||
|
||||
export default {
|
||||
input: 'build-configs/css-yellow.js',
|
||||
plugins: [cssbundle({
|
||||
transform: code => postcss([cssnano]).process(code),
|
||||
output: 'dist/uhr-yellow.min.css'
|
||||
})]
|
||||
}
|
||||
Loading…
Reference in New Issue