Commit Graph

446 Commits

Author SHA1 Message Date
Tyler Renelle 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
Tyler Renelle 49dedf8f2f add responsive to static pages 2013-03-17 00:29:32 -04:00
Tyler Renelle 63cda4c5c7 clegsome static-page cleanup 2013-03-16 23:35:20 -04:00
Tyler Renelle 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 9501e67661 add missing namespaces for rewards & tasks for consistency & organization 2013-03-16 19:22:53 -04:00
Tyler Renelle 081c5c656f another strange derby truthy issue 2013-03-16 16:02:15 -04:00
Tyler Renelle 48cbe7c383 Merge branch 'master' into develop
Conflicts:
	views/app/settings.html
2013-03-15 18:40:21 -04:00
Tyler Renelle 545e5fc2a4 allow manually unlocking party system 2013-03-15 18:39:39 -04:00
Tyler Renelle 14babdbf24 remove snark 2013-03-15 18:26:56 -04:00
Tyler Renelle 4ec94e4ed8 remove snark 2013-03-15 18:26:40 -04:00
Tyler Renelle 368748b67a add delete account functionality (*sigh*, y'all asked for it) 2013-03-15 17:59:15 -04:00
Tyler Renelle 7a7c96ca57 add change for mutlipel subdomain GA tracking 2013-03-15 17:59:10 -04:00
Tyler Renelle 6c61c0f7db add delete account functionality (*sigh*, y'all asked for it) 2013-03-15 17:58:37 -04:00
Tyler Renelle 566f1aa230 add change for mutlipel subdomain GA tracking 2013-03-15 17:47:42 -04:00
Tyler Renelle 37901ef4f4 move settings and API into tabs 2013-03-15 17:31:07 -04:00
Tyler Renelle 281502499b add toggle header to settings dialog 2013-03-15 17:31:03 -04:00
Tyler Renelle 325d906708 begin adding toggle-header 2013-03-15 17:30:59 -04:00
Tyler Renelle 054cf03614 update comment 2013-03-15 17:30:55 -04:00
Tyler Renelle b7425f4964 move party stats to a modal 2013-03-15 17:30:50 -04:00
Tyler Renelle 7f93b525c0 move tnl to a view function instead of model function, beging adding
party stats visuals (hp & exp presently)
2013-03-15 17:30:42 -04:00
Tyler Renelle 3fa6aaceed add 'show helm' option 2013-03-15 17:20:15 -04:00
Tyler Renelle f2faf8c968 add 'show helm' option 2013-03-15 17:20:01 -04:00
Tyler Renelle 12274e2f34 move settings and API into tabs 2013-03-15 16:58:07 -04:00
Tyler Renelle ae96dc8ddb add toggle header to settings dialog 2013-03-15 16:53:39 -04:00
Tyler Renelle 823f524d57 begin adding toggle-header 2013-03-15 16:47:48 -04:00
Tyler Renelle d8918790e5 update comment 2013-03-15 12:27:22 -04:00
Tyler Renelle a7de94f180 move party stats to a modal 2013-03-15 12:24:30 -04:00
Tyler Renelle d2837afbd4 move tnl to a view function instead of model function, beging adding
party stats visuals (hp & exp presently)
2013-03-15 12:00:47 -04:00
Tyler Renelle 646deb2cdd protocol-agnostic fonts 2013-03-14 15:51:29 -04:00
Tyler Renelle 3f251c4b32 Merge pull request #624 from zakkain/ui-tweaks
Time to update the dev preview again!
2013-03-14 11:38:06 -07:00
Zachary Kain e5a893a710 revamp rewards and pets UI. Obv pets is temporary pending new pet system 2013-03-09 01:34:15 -05:00
Zachary Kain f89037da53 new drag animation, tiny outline & shadow tweaks 2013-03-08 22:26:01 -05:00
Zachary Kain 17dcb70e04 Merge remote-tracking branch 'upstream/develop' into ui-tweaks 2013-03-08 19:01:25 -05:00
Tyler Renelle 36677c0585 Merge branch 'origin-develop' 2013-03-07 13:16:54 -05:00
Tyler Renelle db805b6388 Merge pull request #592 from aaron4/patch-1
Added space after each line of text (privacy.html)
2013-03-06 10:11:01 -08:00
Tyler Renelle 467cbfba64 Merge pull request #593 from aaron4/patch-2
Added space after each line of text (terms.html)
2013-03-06 10:09:42 -08:00
Philip How 0dbf2257d7 New Algorithms + fixes 2013-03-06 17:02:08 +00:00
Zachary Kain 81a527e5d6 android mobile bugfixes 2013-03-06 01:29:13 -05:00
Zachary Kain f0462d022f style Todo tabs, misc stuff 2013-03-06 01:15:45 -05:00
Zachary Kain 456580e352 gut & re-style Task Options, only Rewards tasks & options left to go through 2013-03-06 00:50:39 -05:00
Zachary Kain 84e07a0317 better a11y than display:none 2013-03-06 00:50:39 -05:00
Zachary Kain 174c7a8b9f tweaks, most notably DISABLE CHART BUTAN 2013-03-06 00:50:39 -05:00
Zachary Kain a002932210 re-add Lato webfont 2013-03-05 20:29:20 -05:00
Tyler Renelle 4f6a78c0ae add help popover to difficulty 2013-03-05 20:12:09 -05:00
Tyler Renelle 4bb0207564 rename priority multiplier to "Difficulty" -> easy, medium,
hard (people keep getting confused) and putting it back into
"advanced" section
2013-03-05 20:12:05 -05:00
Tyler Renelle 48dc49e1c4 re-enstate double-rewards bug fix 2013-03-05 20:10:03 -05:00
Tyler Renelle 3f33261792 proper derby tabbing 2013-03-05 20:08:31 -05:00
Tyler Renelle 67c42f5e1a Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
	styles/app/tasks.styl
	views/app/tasks.html
2013-03-05 20:04:37 -05:00
Tyler Renelle 4f7cdc38e9 add help popover to difficulty 2013-03-05 18:58:15 -05:00
Tyler Renelle 9c14b29a3d rename priority multiplier to "Difficulty" -> easy, medium,
hard (people keep getting confused) and putting it back into
"advanced" section
2013-03-05 18:07:22 -05:00