32f07afd7a
pets: move pets down a bit
2013-03-26 22:37:19 -07:00
f95a537894
pets: move inventory.styl out of items.styl
2013-03-26 22:35:51 -07:00
f6b2c08a60
Merge branch 'develop' into pets
...
Conflicts:
views/app/rewards.html
2013-03-26 17:54:31 -07:00
0f49ec3ebc
fix 697 remove level from top of herobox
2013-03-25 16:03:13 -04:00
c5c6629419
pets: add base food
2013-03-25 12:42:38 -06:00
4af56b998f
pets: some better default inventory/stable layout
2013-03-25 11:50:32 -06:00
5102b7fc51
Merge branch 'develop' into pets
2013-03-25 08:58:15 -06:00
b038b74534
checkbox shenanigans fix.
2013-03-25 10:05:44 -04:00
52d419a823
add min-width fix to hero-stats being squishd on smalls screens.
...
@zakkain feel free to change, just wanted a quick-fix
2013-03-23 10:07:26 -06:00
cdcf7aa3b2
temp fix to undo being hidden
2013-03-23 08:22:05 -06:00
acdb9eb5e5
add better temporary pet positioning
2013-03-22 22:40:12 -06:00
a1a85241d5
add "hatching powder" (as temporary pet food), clean up some dialogs,
...
fix eggs using their actual animal sprites
2013-03-21 14:56:25 -06:00
3ce2686662
Merge branch 'develop' into switz-inventory
...
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
Merge branch 'develop' into switz-inventory
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
2013-03-21 13:51:38 -06:00
0ddac82f1d
MAD BUG FIXES YO
2013-03-21 14:49:07 -04:00
fa89b20dd5
Merge branch 'develop' into zakkain-ui-tweaks
...
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank
Conflicts:
styles/app/tasks.styl
2013-03-21 12:36:05 -06:00
d737bd0714
remove a ton of public/vendor git submodules, using CDN instead. The
...
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
2013-03-21 11:11:15 -06:00
fa94bef0f6
new input class names on restore function
2013-03-21 13:03:03 -04:00
86f560f69b
layer "new stuff" below "offline" error
2013-03-21 10:32:34 -06:00
7529601dcc
add general "new stuff" notification, linking to changelog
2013-03-21 10:31:23 -06:00
f86aa0316b
fix #679 line height issue
2013-03-20 22:32:01 -04:00
1d93793616
fix customization modal cutting off herobox
2013-03-19 01:02:59 -04:00
fc01b44a5a
by popular demand, we're dropping the crosshatched square and going blank
2013-03-19 00:11:37 -04:00
915c86d8ba
implement avatar variable system with data attributes and css. LIKE A BOSS
2013-03-19 00:04:24 -04:00
507a0fc3c9
MASSIVE HEADER CHANGES OH SHIT
2013-03-18 23:42:03 -04:00
411c614408
fix the 1px gap
2013-03-18 19:33:30 -04:00
4061aaf825
include header.styl, minor tweaks to the button styles, housekeeping
2013-03-18 18:30:25 -04:00
8284693d0f
rebuilt header boiiii. Tested FF, Safari, Chrome
2013-03-18 18:29:53 -04:00
e18c53f97f
middle of wrasslin the new header
2013-03-18 16:48:47 -04:00
13673c3ec7
flattenize header, change to <header>, even margins
2013-03-18 16:46:58 -04:00
3d581358ec
fix text showing behind button b/c of opacity bug
2013-03-18 14:37:24 -04:00
97294b793f
robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold
2013-03-18 14:37:14 -04:00
6d2df1ccc9
fix price input bug
2013-03-18 14:37:03 -04:00
e67295651f
didn't need that reset, probably will remove the whole thing once tested for shenanigans
2013-03-18 14:33:05 -04:00
ba16338bf9
fix text showing behind button b/c of opacity bug
2013-03-18 14:32:44 -04:00
eceae48b2b
robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold
2013-03-18 14:28:00 -04:00
68ca52f125
wah my beautiful designery fonts don't work in modals
2013-03-18 14:15:22 -04:00
932783484a
fix price input bug
2013-03-18 14:02:30 -04:00
2f3d0fa86a
start adding undo functionality
2013-03-17 21:30:24 -04:00
6182a474c7
remoe bootstrap import from .styl, start pulling in from
...
CDN (500.html, static, & dynamic pages)
2013-03-17 09:33:14 -04:00
0c1151b123
don't add bootstrap css files in when instantiating derby-ui-boostrap,
...
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
ee9e6064b2
add a ton of static page, beef up the footer, make this website look
...
official! @zakkain, I hope I didn't break anything!
2013-03-16 23:03:59 -04:00
7083e7a103
yarr, fix all teh bugs
2013-03-16 16:30:45 -04:00
6d34fa8953
Highlight active pet
2013-03-16 15:09:16 -04:00
eeec3cf1bc
FIX Firefox task hover checkbox bug
2013-03-15 12:21:27 -04:00
916ac57917
FIX Firefox outline freakout on tasks
2013-03-15 12:18:57 -04:00
65b7f432a9
get the pets working for the avatar box, with consistent names (need
...
to manually apply with model.set for now)
2013-03-09 12:03:38 -05:00
fd01da4f71
layer shaded box AND check on completed task
2013-03-09 02:10:33 -05:00
fb3cd788df
remove body scrollbar, only on task lists
2013-03-09 01:51:39 -05:00
e5a893a710
revamp rewards and pets UI. Obv pets is temporary pending new pet system
2013-03-09 01:34:15 -05:00
f89037da53
new drag animation, tiny outline & shadow tweaks
2013-03-08 22:26:01 -05:00
Tyler Renelle