Merge branch 'master' of github.com:designcreateplay/NodeBB

v1.18.x
Julian Lam 12 years ago
commit 8a7e2577aa

1
.gitignore vendored

@ -9,6 +9,7 @@ config.json
public/config.json
public/css/*.css
public/themes/*
!/public/themes/vanilla
*.sublime-project
*.sublime-workspace
plugins/*

@ -1,13 +1 @@
@import "style";
@import "topic";
@import "category";
@import "noscript";
@import "home";
@import "header";
@import "account";
@import "search";
@import "unread";
@import "admin";
@import "users";
@import "footer";
@import "../themes/vanilla/vanilla.less";

@ -13,7 +13,7 @@ define(function() {
taskbar.taskbar.id = 'taskbar';
taskbar.tasklist = taskbar.taskbar.querySelector('ul');
document.body.insertBefore(taskbar.taskbar, footerEl);
document.body.insertBefore(taskbar.taskbar, footerEl.nextSibling);
// Posts bar events
jTaskbar.on('click', 'li', function() {

@ -0,0 +1,12 @@
@import "style";
@import "topic";
@import "category";
@import "noscript";
@import "home";
@import "header";
@import "account";
@import "search";
@import "unread";
@import "admin";
@import "users";
@import "footer";
Loading…
Cancel
Save