10 Commits

Author SHA1 Message Date
Zixaphir
6c2c9b281a Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/General/Config.coffee
	src/General/Settings.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-08-12 19:22:37 -07:00
Zixaphir
8606dffacb Rethink some icons, remove 4sight support. 2013-06-03 04:02:22 -07:00
Zixaphir
a2ceddb03b Rethink the #main-menu and settings icons in general 2013-06-02 17:36:15 -07:00
Zixaphir
50cd57d92e Fix slideout thread watcher alignment 2013-06-02 13:55:10 -07:00
Zixaphir
c56470ee28 This will do until I feel like putting some polish into this. 2013-05-31 08:21:20 -07:00
Zixaphir
ab630bd21d This is going to take awhile. 2013-05-30 14:42:21 -07:00
Zixaphir
82299ce9cf min-width to certain dialogs. 2013-05-30 05:27:59 -07:00
Zixaphir
9bd241552e Cut down on math 2013-05-27 17:29:32 -07:00
Zixaphir
d89e17c060 Lighten up on the board title outline 2013-05-03 11:33:27 -07:00
Zixaphir
77433f5da8 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/img/favicons/Original/unreadDead.gif
	src/General/img/favicons/Original/unreadNSFW.gif
	src/General/img/favicons/Original/unreadSFW.gif
	src/General/img/favicons/dead.gif
	src/General/img/favicons/empty.gif
	src/General/img/favicons/ferongr/unreadDead.gif
	src/General/img/favicons/ferongr/unreadNSFW.gif
	src/General/img/favicons/ferongr/unreadSFW.gif
	src/General/meta/metadata.js
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/features/misc/header.coffee
	src/features/monitoring/favicon.coffee
2013-04-28 21:20:22 -07:00