Skip to content

Commit

Permalink
Merge 4804c72 into ebfa55c
Browse files Browse the repository at this point in the history
  • Loading branch information
FranklinWhale committed Aug 9, 2018
2 parents ebfa55c + 4804c72 commit 0b90ea9
Show file tree
Hide file tree
Showing 10 changed files with 8,940 additions and 42 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ dist/
*.css.map
assets/css/taggle.min.css
.sass-cache
.tscache/
10 changes: 9 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,23 @@ module.exports = function(grunt) {
]
}]
}
},

ts: {
default: {
tsconfig: 'types/tsconfig.json'
}
}
});

grunt.loadNpmTasks('grunt-ts');

// register task
grunt.registerTask('build', ['test', 'css', 'modern', 'ie9', 'ie8']);
grunt.registerTask('build-modern', ['test', 'css', 'uglify:main']);
grunt.registerTask('build-ie9', ['test', 'css', 'ie9']);
grunt.registerTask('build-ie8', ['test', 'css', 'ie8']);
grunt.registerTask('test', ['eslint', 'karma']);
grunt.registerTask('test', ['eslint', 'karma', 'ts']);
grunt.registerTask('css', ['sass', 'postcss']);
grunt.registerTask('dev', ['watch']);

Expand Down
26 changes: 6 additions & 20 deletions example/css/taggle.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,16 @@ p a:hover {
background: #990033;
color: #fff; }

@-webkit-keyframes bounce {
0%, 20%, 50%, 80%, 100% {
-webkit-transform: translateY(0); }
40% {
-webkit-transform: translateY(-16px); }
60% {
-webkit-transform: translateY(-7px); } }

@keyframes bounce {
0%, 20%, 50%, 80%, 100% {
-webkit-transform: translateY(0);
transform: translateY(0); }
transform: translateY(0); }
40% {
-webkit-transform: translateY(-16px);
transform: translateY(-16px); }
transform: translateY(-16px); }
60% {
-webkit-transform: translateY(-7px);
transform: translateY(-7px); } }
transform: translateY(-7px); } }

.bounce {
-webkit-animation-name: bounce;
animation-name: bounce; }
animation-name: bounce; }

#forkongithub a {
background: #990033;
Expand Down Expand Up @@ -115,10 +103,8 @@ p a:hover {
position: relative;
cursor: pointer;
transition: all .3s;
-webkit-animation-duration: 1s;
animation-duration: 1s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both; }
animation-duration: 1s;
animation-fill-mode: both; }

.taggle_list .taggle_hot {
background: #cac8c4; }
Expand Down
2 changes: 1 addition & 1 deletion example/css/taggle.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 18 additions & 17 deletions example/js/scripts.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion example/js/taggle.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 0b90ea9

Please sign in to comment.