Zixaphir
db5cccc70f
Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;)
...
Conflicts:
css/burichan.css
css/futaba.css
css/photon.css
css/tomorrow.css
css/yotsuba-b.css
css/yotsuba.css
html/General/Settings-section-Main.html
html/General/Settings.html
src/Filtering/PostHiding.coffee
src/General/Build.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Settings.coffee
src/Miscellaneous/AnnouncementHiding.coffee
src/Monitoring/ThreadUpdater.coffee
2014-02-28 19:59:04 -07:00
Zixaphir
6c4e97b388
Restore CSS I accidentally deleted
...
This is Seaweed's stuff, and he kinda-sorta originally wrote the
stylesheets for a lot of these styles for 4chan (not 4chan X)
so it's probably best we leave them to his vision.
2014-02-28 19:12:13 -07:00
Zixaphir
9d95bbea35
Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
css/burichan.css
css/futaba.css
css/photon.css
css/style.css
css/tomorrow.css
css/yotsuba-b.css
css/yotsuba.css
html/General/Index-navlinks.html
html/General/Settings-section-Rice.html
html/General/Settings.html
html/Posting/QR.html
json/archives.json
package.json
src/Filtering/PostHiding.coffee
src/Filtering/Recursive.coffee
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Get.coffee
src/General/Header.coffee
src/General/Index.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/UI.coffee
src/General/lib/$.coffee
src/General/lib/databoard.class
src/General/lib/post.class
src/General/lib/thread.class
src/Images/ImageExpand.coffee
src/Images/RevealSpoilers.coffee
src/Linkification/Linkify.coffee
src/Menu/Menu.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/IDColor.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/Unread.coffee
src/Posting/QR.captcha.coffee
src/Posting/QR.coffee
src/Posting/QR.cooldown.coffee
src/Quotelinks/QuoteBacklink.coffee
src/Quotelinks/QuoteCT.coffee
src/Quotelinks/QuoteOP.coffee
src/Quotelinks/QuoteStrikeThrough.coffee
src/Quotelinks/QuoteYou.coffee
src/Quotelinks/Quotify.coffee
2014-02-23 14:04:45 -07:00
Jordan
a1e3793cb5
Make a few changes specific to the fixed header
...
Close #239
2014-01-11 22:18:03 -07:00
Jordan
9a66c0286c
Restyle QR link
...
Close #224
2014-01-09 20:22:08 -07:00
Jordan
6e5e4cfb45
Rgba instead of opacity
...
Close #228
2014-01-09 18:18:38 -07:00
Jordan
37accb230d
Touch up menus and .current border
...
Close #227 , close #229
2014-01-09 18:12:30 -07:00
Jordan
feca837cbc
Restyle header a bit, close #220
2014-01-09 01:55:52 -07:00
seaweedchan
40a0fd3d07
Undo watcher class change
2013-08-14 03:31:32 -07:00
seaweedchan
6b98f8acb4
Make classes consistent with Mayhem X
2013-08-14 02:41:07 -07:00
seaweedchan
e75ad405bf
Revert class name changes
2013-08-13 00:18:01 -07:00
seaweedchan
b9b4efae5e
Merge in new thread watcher and change a few things
2013-08-13 00:03:29 -07:00
Zixaphir
ade7628838
css classes yo
2013-08-12 19:44:46 -07:00
seaweedchan
875f0cd4f8
Merge Zixaphir X
2013-08-12 00:07:39 -07:00
Jordan Bates
4b0b8df894
Change watcher icon to heart
2013-05-14 07:46:25 -07:00
Jordan Bates
09baa3feea
Merge Mayhem's structure
2013-04-26 14:04:12 -07:00
