Merge branch 'pakon-dot-js' into 'speedup'
# Conflicts: # src/templates/pakon/_results.tpl
Showing
- src/static/css/pakon.css 26 additions, 14 deletionssrc/static/css/pakon.css
- src/static/img/filter-add.svg 73 additions, 0 deletionssrc/static/img/filter-add.svg
- src/static/img/filter-remove.svg 43 additions, 0 deletionssrc/static/img/filter-remove.svg
- src/static/sass/pakon.sass 43 additions, 16 deletionssrc/static/sass/pakon.sass
- src/templates/javascript/pakon/pakon.js.tpl 1468 additions, 965 deletionssrc/templates/javascript/pakon/pakon.js.tpl
- src/templates/pakon/_results.tpl 6 additions, 1 deletionsrc/templates/pakon/_results.tpl
Please register or sign in to comment