9255644108
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-18 21:51:54 -06:00
507a0fc3c9
MASSIVE HEADER CHANGES OH SHIT
2013-03-18 23:42:03 -04:00
b287d854f1
add tag-editing context (add new, delete). still have to refresh after everything, do to the live-bound each bug
2013-03-18 20:25:01 -04:00
f6c5495495
add new tag
2013-03-18 19:51:02 -04:00
494d5cecf9
for now don't live-bind to {#each _user.tags}. There's a derby bug
...
here, so we'll have to refresh when users add new tags until we get
that fixed
2013-03-18 19:47:15 -04:00
411c614408
fix the 1px gap
2013-03-18 19:33:30 -04:00
f453eb9833
cut old menu. Next up, avatars then MODALS
2013-03-18 18:31:26 -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
d6652bcf12
rename user._tagFilters to user.filters
2013-03-18 18:13:05 -04:00
f332c5d9a8
Merge branch 'develop' into toebu-tags-filters
...
Conflicts:
src/app/index.coffee
src/app/tasks.coffee
styles/app/index.styl
views/app/index.html
views/app/tasks.html
2013-03-18 17:09:42 -04:00
e18c53f97f
middle of wrasslin the new header
2013-03-18 16:48:47 -04:00
70dcd0b886
move rewards column into rewards rewards.html
2013-03-18 16:47:03 -04:00
13673c3ec7
flattenize header, change to <header>, even margins
2013-03-18 16:46:58 -04:00
a4cfd9d19c
wrap avatars with <span>. #each requires an element, so #if / #unless
...
blocks nested immediately inside cause issues if they return false,
see https://github.com/codeparty/derby/issues/215
2013-03-18 15:46:35 -04:00
49db610602
fix to "editing profile" bug. move {#with _user.preferences as :p}
...
into minimum allowable depth in HTML hierachy at which it's required.
Still trying to put my finger on it, but I'm getting close
2013-03-18 15:43:02 -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
5799a155af
set timeout interval on undo (disappear after 10s)
2013-03-17 23:16:05 -04:00
16bb4879e3
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-17 22:10:04 -04:00
de1eca084e
bugfix to "can't delete task"
2013-03-17 22:09:33 -04:00
07a3a3c3b6
fix to reward issue in undo
2013-03-17 22:02:06 -04:00
903745f7c9
pass in whole task object to taskClasses
2013-03-17 21:50:02 -04:00
10e9d3eb40
fixed undo on checkboxed items
2013-03-17 21:43:03 -04:00
2f3d0fa86a
start adding undo functionality
2013-03-17 21:30:24 -04:00
b576290ee6
Merge pull request #671 from ruddfawcett/develop
...
Added "btn" class to "Show Header"
2013-03-17 13:33:52 -07:00
f8be873241
Added "btn" class to "Show Header"
2013-03-17 15:25:23 -03:00
3df22d72d9
privacy & terms page titles
2013-03-17 09:47:02 -04:00
2276867f6c
use cloudflare cdn for bootstrap too
2013-03-17 09:45:57 -04:00
2be827f484
Merge branch 'cdn-scripts' into develop
2013-03-17 09:33:19 -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
8e845d6586
add bootstrap-responsive into master. remove when develop is merged in
2013-03-17 09:19:55 -04:00
dc3af9aa49
better "reroll" comment
2013-03-17 09:16:33 -04:00
2ca7c65abc
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
Conflicts:
src/app/index.coffee
2013-03-17 09:16:31 -04:00
83b29177bc
add responsive to static pages
2013-03-17 09:15:56 -04:00
76064be3d8
clegsome static-page cleanup
2013-03-17 09:15:50 -04:00
b030fb60ec
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-17 09:15:44 -04:00
4e9fc85193
start static-pages redesign
2013-03-17 09:15:34 -04:00
0bcea534ae
better "reroll" comment
2013-03-17 09:13:25 -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
4614e48cdc
Adding first rudimentary version of tagging and filtering. New users get three tags: morning, afternoon and evening. At the moment, one can not change these tags or add new ones. There are also some problems: tagging a newly added task, also tags one of the existing tasks. Also, when having an active filter and removing the corresponding tag from a task, that task is immediately hidden, although you are still editing it.
2013-03-17 09:10:27 -04:00
49dedf8f2f
add responsive to static pages
2013-03-17 00:29:32 -04:00
63cda4c5c7
clegsome static-page cleanup
2013-03-16 23:35:20 -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
Tyler Renelle