also minify the CSS files and store them in dist/
This commit is contained in:
parent
607eeabfd2
commit
316e045770
19
Gruntfile.js
19
Gruntfile.js
|
|
@ -83,8 +83,19 @@ module.exports = function (grunt) {
|
|||
dest: 'dist/jquery.<%= pkg.name %>.langs.min.js'
|
||||
}
|
||||
},
|
||||
cssmin: {
|
||||
allcss: {
|
||||
files: [{
|
||||
expand: true,
|
||||
cwd: 'css',
|
||||
src: ['*.css'],
|
||||
dest: 'dist',
|
||||
ext: '.min.css'
|
||||
}]
|
||||
}
|
||||
},
|
||||
mocha_phantomjs: {
|
||||
all:{
|
||||
all: {
|
||||
options: {
|
||||
urls: ['http://localhost:9000/test/test.html']
|
||||
}
|
||||
|
|
@ -138,9 +149,11 @@ module.exports = function (grunt) {
|
|||
});
|
||||
|
||||
grunt.loadNpmTasks('grunt-mocha-phantomjs');
|
||||
grunt.loadNpmTasks('grunt-contrib-cssmin');
|
||||
|
||||
// Default task.
|
||||
grunt.registerTask('default', ['jshint', 'connect', 'mocha_phantomjs', 'clean', 'concat', 'uglify']);
|
||||
grunt.registerTask('buildonly', ['clean', 'concat', 'uglify']);
|
||||
grunt.registerTask('default', ['jshint', 'clean', 'concat', 'connect', 'mocha_phantomjs', 'uglify', 'cssmin']);
|
||||
grunt.registerTask('buildonly', ['clean', 'concat', 'uglify', 'cssmin']);
|
||||
grunt.registerTask('server', function () {
|
||||
grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.');
|
||||
grunt.task.run(['serve']);
|
||||
|
|
|
|||
16
README.md
16
README.md
|
|
@ -8,17 +8,17 @@ Du willst Bärneruhr auf deiner Website verwenden? Dank des jQuery-Plugins geht
|
|||
* Binde folgende CSS-Datei im HTML-Dokument ein:
|
||||
* uhr.css
|
||||
* Binde zusätzlich mindestens eine der folgenden CSS-Dateien im HTML ein, je nach dem, welche Farben deine Uhr unterstützen soll:
|
||||
* uhr-black.css
|
||||
* uhr-white.css
|
||||
* uhr-red.css
|
||||
* uhr-yellow.css
|
||||
* uhr-green.css
|
||||
* uhr-blue.css
|
||||
* uhr-pink.css
|
||||
* dist/uhr-black.min.css
|
||||
* dist/uhr-white.min.css
|
||||
* dist/uhr-red.min.css
|
||||
* dist/uhr-yellow.min.css
|
||||
* dist/uhr-green.min.css
|
||||
* dist/uhr-blue.min.css
|
||||
* dist/uhr-pink.min.css
|
||||
|
||||
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:
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="uhr-black.css" data-class="black" data-name="Schwarz" />
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-black.min.css" data-class="black" data-name="Schwarz" />
|
||||
|
||||
* Binde nach den CSS-Dateien (wichtig!) folgende Javascript-Dateien im HTML-Dokument ein:
|
||||
* dist/libs.min.js: Dies enthält die minifizierten Versionen von jQuery, jQuery-UI (mit den Komponenten `code` und `widget`) und jQuery-Cookie.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! uhr - v8.0.0-dev.0 - 2015-01-18
|
||||
/*! uhr - v8.0.0-dev.0 - 2015-01-19
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
|
||||
(function($) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
/*! uhr - v8.0.0-dev.0 - 2015-01-18
|
||||
/*! uhr - v8.0.0-dev.0 - 2015-01-19
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
|
||||
(function($) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
/*! uhr - v8.0.0-dev.0 - 2015-01-18
|
||||
/*! uhr - v8.0.0-dev.0 - 2015-01-19
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
|
||||
(function($) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
/*! uhr - v8.0.0-dev.0 - 2015-01-18
|
||||
/*! uhr - v8.0.0-dev.0 - 2015-01-19
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
|
||||
(function($) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
/*! uhr - v8.0.0-dev.0 - 2015-01-18
|
||||
/*! uhr - v8.0.0-dev.0 - 2015-01-19
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
|
||||
(function($) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
/*! uhr - v8.0.0-dev.0 - 2015-01-18
|
||||
/*! uhr - v8.0.0-dev.0 - 2015-01-19
|
||||
* http://bärneruhr.ch/
|
||||
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
|
||||
/*!
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1 @@
|
|||
.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)}
|
||||
|
|
@ -0,0 +1 @@
|
|||
.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)}
|
||||
|
|
@ -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)}
|
||||
|
|
@ -0,0 +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)}
|
||||
|
|
@ -0,0 +1 @@
|
|||
.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)}
|
||||
|
|
@ -0,0 +1 @@
|
|||
.uhr.white{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}.white .onoffswitch-inner:before{background-color:#ccc}.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)}
|
||||
|
|
@ -0,0 +1 @@
|
|||
.uhr.yellow{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}.yellow .onoffswitch-inner:before{background-color:#fd0}.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)}
|
||||
|
|
@ -0,0 +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;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;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}
|
||||
16
index.html
16
index.html
|
|
@ -21,14 +21,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
|
||||
<meta name="apple-mobile-web-app-title" content="Bärneruhr"/>
|
||||
<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-black.css" data-class="black" data-name="Schwarz"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-white.css" data-class="white" data-name="Weiss"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-red.css" data-class="red" data-name="Rot"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-yellow.css" data-class="yellow" data-name="Gelb"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-green.css" data-class="green" data-name="Grün"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-blue.css" data-class="blue" data-name="Blau"/>
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-pink.css" data-class="pink" data-name="Pink"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr.min.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-black.min.css" data-class="black" data-name="Schwarz"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-white.min.css" data-class="white" data-name="Weiss"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-red.min.css" data-class="red" data-name="Rot"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-yellow.min.css" data-class="yellow" data-name="Gelb"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-green.min.css" data-class="green" data-name="Grün"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-blue.min.css" data-class="blue" data-name="Blau"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-pink.min.css" data-class="pink" data-name="Pink"/>
|
||||
<link rel="shortcut icon" type="image/png" href="resources/favicon.png"/>
|
||||
<link rel="apple-touch-icon-precomposed" href="resources/apple-touch-icon-precomposed.png"/>
|
||||
<script type="text/javascript" src="dist/libs.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
<title>Die Zeit im Wort - Informationen</title>
|
||||
<meta charset="utf-8"/>
|
||||
<meta name="viewport" content="width=device-width,user-scalable=yes,initial-scale=1"/>
|
||||
<link rel="stylesheet" type="text/css" href="../css/uhr.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="../css/uhr-black.css" data-class="black"/>
|
||||
<link rel="stylesheet" type="text/css" href="../css/uhr-red.css" data-class="red"/>
|
||||
<link rel="stylesheet" type="text/css" href="../dist/uhr.min.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="../dist/uhr-black.min.css" data-class="black"/>
|
||||
<link rel="stylesheet" type="text/css" href="../dist/uhr-red.min.css" data-class="red"/>
|
||||
<link rel="stylesheet" type="text/css" href="info.css"/>
|
||||
<link rel="shortcut icon" type="image/png" href="../resources/favicon.png"/>
|
||||
<script type="text/javascript" src="../dist/libs.min.js"></script>
|
||||
|
|
@ -94,14 +94,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
<p>Füge folgende Zeilen im <code><head></code>-Tag deines HTML-Dokumentes ein. <strong>Beachte dabei,
|
||||
dass die CSS-Dateien <em>vor</em> den Javascript eingebunden werden</strong>.<br/>
|
||||
<code><link rel="stylesheet" type="text/css" href="css/uhr.css" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-black.css" data-class="black" data-name="Schwarz" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-white.css" data-class="white" data-name="Weiss" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-red.css" data-class="red" data-name="Rot" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-yellow.css" data-class="yellow" data-name="Gelb" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-green.css" data-class="green" data-name="Grün" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-blue.css" data-class="blue" data-name="Blau" />
|
||||
<link rel="stylesheet" type="text/css" href="css/uhr-pink.css" data-class="pink" data-name="Pink" />
|
||||
<code><link rel="stylesheet" type="text/css" href="dist/uhr.min.css" />
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-black.min.css" data-class="black" data-name="Schwarz" />
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-white.min.css" data-class="white" data-name="Weiss" />
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-red.min.css" data-class="red" data-name="Rot" />
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-yellow.min.css" data-class="yellow" data-name="Gelb" />
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-green.min.css" data-class="green" data-name="Grün" />
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-blue.min.css" data-class="blue" data-name="Blau" />
|
||||
<link rel="stylesheet" type="text/css" href="dist/uhr-pink.min.css" data-class="pink" data-name="Pink" />
|
||||
<script type="text/javascript" src="dist/libs.min.js"></script>
|
||||
<script type="text/javascript" src="dist/jquery.uhr.complete.min.js"></script></code>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@ CACHE MANIFEST
|
|||
# Version <%=VERSION_PLACEHOLDER=%>
|
||||
|
||||
/
|
||||
css/uhr.css
|
||||
css/uhr-black.css
|
||||
css/uhr-blue.css
|
||||
css/uhr-green.css
|
||||
css/uhr-pink.css
|
||||
css/uhr-red.css
|
||||
css/uhr-white.css
|
||||
css/uhr-yellow.css
|
||||
dist/jquery.uhr.base.min.js
|
||||
dist/jquery.uhr.complete.min.js
|
||||
dist/libs.min.js
|
||||
dist/uhr.min.css
|
||||
dist/uhr-black.min.css
|
||||
dist/uhr-blue.min.css
|
||||
dist/uhr-green.min.css
|
||||
dist/uhr-pink.min.css
|
||||
dist/uhr-red.min.css
|
||||
dist/uhr-white.min.css
|
||||
dist/uhr-yellow.min.css
|
||||
info/
|
||||
info/index.html
|
||||
info/info.css
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
"grunt-contrib-clean": "~0.5.0",
|
||||
"grunt-contrib-concat": "~0.4.0",
|
||||
"grunt-contrib-connect": "~0.8.0",
|
||||
"grunt-contrib-cssmin": "^0.11.0",
|
||||
"grunt-contrib-jshint": "~0.10.0",
|
||||
"grunt-contrib-qunit": "~0.5.1",
|
||||
"grunt-contrib-uglify": "~0.5.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue