Commit Graph

60 Commits

Author SHA1 Message Date
Sabe Jones b701e2b24a Go with the borderless option 2013-11-17 10:21:43 -06:00
Sabe Jones 44a82c71e2 Remove bland/harsh border styling on eggs and avatar options. Falls back to a button look that's much nicer. 2013-11-17 07:40:19 -06:00
Tyler Renelle 4c3f04cc49 Merge branch 'mounts' into develop
Conflicts:
	views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
Tyler Renelle 56b1684a45 Merge pull request #1798 from snicker/develop
Fixed issues with positioning of userlist
2013-11-12 20:16:42 -08:00
Nick Gordon edcafcc3ce Fixed issues with positioning of userlist 2013-11-12 07:41:26 -08:00
Tyler Renelle 32a94871d2 Merge pull request #1796 from snicker/develop
Autocompletion of nicknames in chat
2013-11-12 00:17:29 -08:00
Nick Gordon cd693835ce Autocompletion of nicknames in chat works. this commit will require a npm install to fetch new packages 2013-11-11 22:32:52 -08:00
Tyler Renelle bfbc907fa1 mounts: show when selectedFood by green-circle highlighting pets 2013-11-10 22:53:20 -08:00
Tyler Renelle 05c3e71a92 mounts: fixes to starter food css 2013-11-10 19:18:06 -08:00
Tyler Renelle 085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Nicole Foster 95031fb6ee Even space between limited edition skins and rainbow skins 2013-11-09 15:25:31 -05:00
Tyler Renelle 962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -08:00
Tyler Renelle 557ce59c71 back to non-halloween NPCs 2013-11-03 17:44:46 -08:00
Tyler Renelle 646a5c942b [#1716 #1705] working modal for challenge.participants.stats! also don't
scroll to top of page. We'll want to test that this doesn't break
anything else in the app, @paglias looks like the guys on that thread
felt pretty dirty about this workaround for some reason
2013-11-02 16:07:12 -07:00
Matteo Pagliazzi 2da33b0355 add loading bar to front page too 2013-11-01 21:07:44 +01:00
Matteo Pagliazzi 3562079ba6 small design tweaks, fix #1682 2013-11-01 18:33:50 +01:00
Matteo Pagliazzi 1490380e53 @lefnire since we are just testing and not deploying from this I liked to try the loading bar we talked about so that everyone can say what they do think 2013-10-30 19:13:21 +01:00
J. Ozymandias Fallick 22b429242f Merge remote-tracking branch 'upstream/develop' into manual-due-date 2013-10-23 14:34:36 -04:00
Tyler Renelle f59d5b056c Merge branch 'halloween' into develop 2013-10-22 17:57:57 -07:00
Tyler Renelle e7886e00b4 halloween: highlght limited skins, add description about limited, rename
to "rainbow" and "spooky" @lemoness
2013-10-22 17:56:46 -07:00
Tyler Renelle 2c7fc72419 better modal indenting 2013-10-22 16:33:06 -07:00
Tyler Renelle a1959a9beb halloween: use halloween npcs habitrpg-shared@0ffd265 2013-10-22 16:20:37 -07:00
Tyler Renelle 534a761875 remove customizer css, moved to habitrg-shared@06e489d 2013-10-22 16:19:54 -07:00
Tyler Renelle d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Matteo Pagliazzi 18c06b5043 user top right button should not cover notifications, they can be closed with a click on the "x" 2013-10-21 20:44:31 +02:00
Tyler Renelle 378d158a44 pegs: restructure inventory/market html so we market is aware of
inventory and we can sell items
2013-10-19 19:36:59 -07:00
Tyler Renelle be624a03b0 pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs 2013-10-19 19:30:39 -07:00
Tyler Renelle 81f9f9b4c5 gems: justin in gem-purchase dialog 2013-10-12 20:01:18 -07:00
Tyler Renelle 4c018d84c1 Merge branch 'paypal' into develop
Conflicts:
	bower.json
2013-10-12 19:23:44 -07:00
Tyler Renelle 5de0c928fe paypal: conslidate buy gems modals 2013-10-12 16:51:01 -07:00
Tyler Renelle 43be09a5d5 Merge pull request #1575 from Shaners/newSkin
New skin tones
2013-10-04 15:27:09 -07:00
Matteo Pagliazzi bb8bbe4e0f remove stable flickering, fixes #1557 2013-09-29 16:43:01 +02:00
Shane Lister ab9d6a53fe Update customizer.styl
Add new skin types to customizer style. Add shirts to cropped images for customizer to fit with other customization options.
2013-09-26 23:25:50 -07:00
Matteo Pagliazzi 332b4bd899 allow header to be scrolled horizontally 2013-09-21 16:25:17 +02:00
Matteo Pagliazzi 190c617d4c fix #1045 2013-09-18 17:02:17 +02:00
Tyler Renelle 5ab3ea7311 [#1397 #1543 #1540]use justin in popovers instead of indicator icons (may want to revisit) 2013-09-17 14:15:57 -04:00
Tyler Renelle 36b3a77877 [#1397 #1543 #1540] start adding in unlock notifications (working for some, not for all). Also some tour & header fixes 2013-09-17 14:10:10 -04:00
J. Ozymandias Fallick 5457bfb2e5 Better due date placement and formatting 2013-09-12 17:04:52 -04:00
Matteo Pagliazzi dc96df43cc add margin-right to all .btn, typo in stylus, add build to .nodemonignore 2013-09-11 20:36:57 +02:00
Matteo Pagliazzi 1bc5f0eb0c add margin to buttons in setting page 2013-09-11 15:42:11 +02:00
Tyler Renelle 964eb91799 update tour to conform to guidelines at #1507 2013-09-10 18:31:26 -04:00
Tyler Renelle 16a4e87fea [#1396] Add justin to tour bubbles 2013-09-10 18:20:10 -04:00
Matteo Pagliazzi c9212d76d8 add padding to gem wallet 2013-09-10 15:30:38 +02:00
Tyler Renelle e1828153dd [#1489] add edit-gropu server route, basic editing of group info for now (with markdown!) 2013-09-09 17:09:45 -04:00
Matteo Pagliazzi 75613b0508 add word-wrap to member modal, linky and <a> for website 2013-09-08 12:13:55 +02:00
Tyler Renelle 5cb8238b7c change badge from master => royal 2013-09-07 15:31:36 -04:00
Tyler Renelle b820417953 slight updates to chat colors 2013-09-07 13:44:08 -04:00
Matteo Pagliazzi d30d20d987 add margin to chat-btn 2013-09-07 15:16:49 +02:00
Tyler Renelle e23acc4c0a Merge branch 'paglias/grunt' into develop 2013-09-06 22:23:02 -04:00
Matteo Pagliazzi 9046bd5041 css 2013-09-06 21:39:18 +02:00