sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5691 commits 3 branches 0 tags 1.6 GiB
Commit graph

270 commits

Author SHA1 Message Date
benmanley
e4e6100652 Merge branch 'develop' of https://github.com/benmanley/habitrpg into develop 
Conflicts:
	public/css/inventory.styl
 2014-03-10 20:20:58 +00:00
benmanley
db2ff45551 Add custom css to prevent Flying Pig progress bar being hidden 2014-03-10 19:06:41 +00:00
snicker
1968a22c04 fix(chat): autocomplete list aligns properly with the @ symbol again 2014-03-04 18:54:58 -08:00
TheSisb
2c8a43e248 Fixing buttons alignment in panel headings 2014-03-01 10:18:06 -08:00
benmanley
e050bed42c Remove obsolete comment 2014-02-21 22:25:31 +00:00
benmanley
598088df03 Delete -ms-filter value as it is automatically added when compiled 2014-02-21 21:25:46 +00:00
benmanley
def83b089a Add custom css to prevent Flying Pig progress bar being hidden 2014-02-21 13:28:27 +00:00
benmanley
8c2c940d88 Move styles from stable.jade to inventory.styl file 2014-02-21 12:49:46 +00:00
benmanley
c04caefaac Fix positioning of paw sprites 2014-02-21 12:49:46 +00:00
Tyler Renelle
02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop 
Conflicts:
	views/options/settings.jade
 2014-02-20 16:34:28 -08:00
benmanley
977aeec27f Merge remote-tracking branch 'upstream/develop' into develop 2014-02-18 15:55:33 +00:00
Matteo Pagliazzi
9ba3362642 fix(css): remove padding for heroboxes in modals, fix #2872 2014-02-17 22:43:09 +01:00
Matteo Pagliazzi
705d8a3b1a fix(css): fix chooseClass modal herobox padding 2014-02-16 19:58:53 +01:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Tyler Renelle
c8faffcc72 fix(css): temp fix for bailey height 2014-02-12 22:31:32 -07:00
Tyler Renelle
f72cb21300 feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, & 
chat / invite notifications
 2014-02-12 21:21:36 -07:00
benmanley
783e874690 Fix positioning of paw sprites 2014-02-12 14:40:45 +00:00
Matteo Pagliazzi
8fdc5327e9 refactor(grunt and caching): cache icon fonts, spritesmith and use icons from spritesmith for coins notification 2014-02-12 15:10:22 +01:00
Matteo Pagliazzi
c4244bc3b6 fix(misc) 2014-02-11 21:43:17 +01:00
Matteo Pagliazzi
975b516573 fix(css): menu and gems wallet margin 2014-02-11 18:37:20 +01:00
Matteo Pagliazzi
e75a9423d4 Merge pull request #2813 from benmanley/develop 
Fix alignment of task meta icons (glyphicons)
 2014-02-11 18:10:07 +01:00
Tyler Renelle
cb079977e6 feat(marketing): start fleshing out the about page with images, content, 
etc. Create separate videos page
 2014-02-11 00:51:29 -07:00
benmanley
39ec102326 Fix alignment of task meta icons (glyphicons) 2014-02-10 22:22:54 +00:00
Matteo Pagliazzi
a22e28143f fix(css): lighter columns title 2014-02-10 19:04:57 +01:00
Matteo Pagliazzi
1c41c4ddb9 fix(css): better food tray 2014-02-10 18:38:58 +01:00
benmanley
18f922c756 Fix food tray z-index 2014-02-10 13:30:54 +00:00
Matteo Pagliazzi
3f28d16478 refactor(bs3): add fixed height modals & panels 2014-02-09 16:25:10 +01:00
Matteo Pagliazzi
1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
5874941b94 refactor(bs3): inventory & misc 2014-02-09 12:32:12 +01:00
Matteo Pagliazzi
b4be88f4e0 refactor(bs3): misc 2014-02-08 19:49:47 +01:00
Matteo Pagliazzi
9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Matteo Pagliazzi
ee871ccb01 refactor(bs3): fixes 2014-02-08 16:58:41 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Tyler Renelle
37340d2318 fix(mounts): fix pets & mounts css to position the user based on 
pet/mount equip
 2014-02-07 21:48:11 -07:00
Matteo Pagliazzi
d313a46299 refactor(bs3): push footer down 2014-02-06 18:46:43 +01:00
Matteo Pagliazzi
d6b3279e5c refactor(bs3): misc fixes 2014-02-06 18:35:12 +01:00
Matteo Pagliazzi
4ce2dfd60d refactor(bs3): remove unused bootstrap-datepicker from bower 2014-02-05 20:23:10 +01:00
Matteo Pagliazzi
0cc31465ed refactor(bs3): challenges 2014-02-05 19:39:26 +01:00
Matteo Pagliazzi
5d4d82ad51 refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc 2014-02-05 19:05:42 +01:00
Matteo Pagliazzi
ce5edbee58 refactor(bs3): consistent style for modals 2014-02-05 16:51:35 +01:00
Matteo Pagliazzi
ccc1230828 refactor(bs3): misc 2014-02-04 22:21:12 +01:00
Matteo Pagliazzi
d711d61a1f refactor(bs3): re-enable two columns views for tablets 2014-02-04 21:54:19 +01:00
Matteo Pagliazzi
c663221229 refactor(bs3): misc fixes, use bootstrap own grid for tasks lists 2014-02-04 21:27:05 +01:00
Matteo Pagliazzi
379da41982 refactor(bs3): port notifications 2014-02-04 20:53:09 +01:00
Matteo Pagliazzi
685b7a3cd2 Merge branch 'develop' into paglias/bs3 2014-02-04 20:16:00 +01:00
Tyler Renelle
07a47d353d Merge pull request #2666 from marcgenesis/develop 
Fixed inventory alignment. Issue #2158
 2014-02-04 11:00:52 -08:00
Matteo Pagliazzi
571954b5cf refactor(bs3): misc fixes, port restore, delete and reset modals 2014-02-02 16:06:30 +01:00
Matteo Pagliazzi
317a148760 refactor(bs3): port newStuff and member modals, misc fixes 2014-02-02 15:55:01 +01:00
Matteo Pagliazzi
f31723b0ab refactor(bs3): sync with develop 2014-02-02 13:26:35 +01:00
Cole Gleason
61a4a90d2c Merge pull request #2610 from etryn/develop 
Fixed unnecessary margin on button group buttons
 2014-02-01 23:56:43 -08:00
Matteo Pagliazzi
f6a8b9e4cb refactor(bs3): port some modals & css fixes 2014-02-01 19:19:48 +01:00
Marc-André Larivière
875698c111 Created new CSS entry for equipment-title and modified inventory.jade accordingly 2014-02-01 12:52:38 -05:00
Matteo Pagliazzi
4dcf74a38a refactor(bs3): port avatar level label 2014-02-01 17:18:37 +01:00
Matteo Pagliazzi
af42ec263e refactor(bs3): port several modals & css fixes 2014-02-01 17:04:21 +01:00
Matteo Pagliazzi
ff49695635 refactor(bs3): misc fixes & port death modal 2014-02-01 16:46:48 +01:00
Matteo Pagliazzi
f4c30390f5 refactor(bs3): start porting app, general layout and filters 2014-01-31 21:18:44 +01:00
Matteo Pagliazzi
7354efc1d5 refactor(bs3): working register & prettier login modal 2014-01-29 21:28:11 +01:00
Matteo Pagliazzi
4c9da6883f refactor(bs3): static pages 
works everything exeception made for the login modal, it opens but since this directive has had a lot of changes in angular-ui-bootstrap it will require more work (like all modals), @lefnire
 2014-01-29 18:26:58 +01:00
Matteo Pagliazzi
f0ebd597b3 refactor(dependencies): update dependencies for bootstrap 3 upgrade @lefnire 2014-01-29 16:44:12 +01:00
Tyler Renelle
a582a0546d feat(marketing): some frontpage updates, a screenshot, & "contact us" 
button mods
 2014-01-28 10:36:05 -08:00
Tyler Renelle
66f95cdd4c feat(premium): updates to group plans info page 2014-01-28 09:22:46 -08:00
Etryn
9fa8646768 Fixed unnecessary margin on button group buttons 
Buttons in groups in bootstrap are styled to touch on inside edges to
appear joined, so should not have a 5 px margin between them.
 2014-01-28 01:13:24 -08:00
Tyler Renelle
f7f4a0c166 feat(administrators): start adding features page for admin accounts 2014-01-27 18:24:24 -08:00
Tyler Renelle
0ddaae4d75 feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links 2014-01-27 17:40:43 -08:00
Tyler Renelle
2e18f0eb82 feat(premium): backport client-side premium code to public repo, it's 
client-side anyway (@colegleason @paglias)
 2014-01-27 16:34:22 -08:00
Tyler Renelle
47bcaf83e7 feat(homepage): use .marketing for centering, add playbutton as static 
in footer. This is pretty
ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28), let's iterate
/ prettify. @deilann
 2014-01-26 14:22:01 -08:00
Dušan Juretić
70001b1feb Mark collected items in collection quests 2014-01-24 22:28:19 -03:00
Tyler Renelle
9fa4521739 feat(challenges): add angular-ui-select2 for simpler find/select 
challenge winner.
 2014-01-22 23:22:21 -08:00
Sabe Jones
6e821fa681 Create drop notification Growl style 2014-01-14 22:02:22 -06:00
Sabe Jones
1a92ec1748 Beef up critical hit notification with its own style and icon 2014-01-07 12:03:07 -06:00
steve hiemstra
fd56c17518 work on #2183 resize checklist items 
such that they resize dynamically; however the text will still not wrap
due to the fact that it is an input.
 2014-01-06 21:21:01 -05:00
Tyler Renelle
f6e6d115ac chat: add +1 (like) to messages. @snicker does views/options/social/chat-message.jade flag you for any performance issues which should be optimized with bindonce? (I'm still a bit of a bo-noob) 2014-01-05 22:12:02 -07:00
Tyler Renelle
7f3b6a4470 Merge pull request #2209 from benblank/pet-alignment 
Fix (apparent) misalignment of paws on pets/mounts grids
 2014-01-01 20:14:44 -08:00
Ben Blank
56613910f0 prevent popover shadows from being clipped/overlapped 2013-12-31 14:58:47 -08:00
Ben Blank
32d1ff68b4 fix apparent misalignment of paws on pets/mounts grids 2013-12-31 14:34:24 -08:00
Tyler Renelle
968b091ccd checklists: checklist as <li> instead of <label>, so that inline-editing 
doesn't trigger checkmark. Unfortunately means we need to replicate some
bootstrap css
 2013-12-30 10:33:48 -07:00
Tyler Renelle
74c905f1e1 checklists WIP 2013-12-30 10:33:17 -07:00
Tyler Renelle
61dfb8d129 Merge pull request #2086 from HabitRPG/sabe/tweak2 
Remove sliding effect on avatar mouseover
 2013-12-29 16:19:09 -08:00
Tyler Renelle
e9cb9b8a9f task-icons: larger emoji in task text than chat 2013-12-29 01:24:02 -07:00
Tyler Renelle
e863d5927a Merge pull request #2138 from HabitRPG/sabe/tweak4 
Remove padding from <li> when used in Markdown
 2013-12-27 07:53:52 -08:00
Tyler Renelle
13e1792685 Merge pull request #2123 from HabitRPG/sabe/tweak3 
Fix #2072 (add Mana delta alerts)
 2013-12-27 07:53:12 -08:00
Sabe Jones
f3798c0bc8 Remove padding from <li> when used in Markdown 2013-12-27 08:56:55 -06:00
Sabe Jones
601af6ddc0 Make better use of space for customizations and Market 2013-12-26 07:56:01 -06:00
Sabe Jones
3074cc8f16 Fix #2072 (add Mana delta alerts) 2013-12-26 07:31:00 -06:00
Tyler Renelle
ecb354e2cc Quests: initial Bosses WIP - invite, accept, reject, etc 2013-12-22 17:46:54 -07:00
Sabe Jones
485209ed74 Remove sliding effect on avatar mouseover 2013-12-22 12:20:35 -06:00
Tyler Renelle
8b8f385fff winter: make bailey head more visible with holiday gear (remember to 
revert this after 1/31!)
 2013-12-20 23:14:08 -07:00
Tyler Renelle
676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00
Tyler Renelle
12cc6f51eb classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks 2013-12-15 13:25:19 -07:00
Tyler Renelle
26697546e8 classes: header z-index:100, generalized shop_money classes, only show 
owned gear if == true
 2013-12-14 11:34:41 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since 
we dynamically swap it sometimes)
 2013-12-12 20:03:32 -07:00
Tyler Renelle
f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -07:00
Tyler Renelle
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
Tyler Renelle
19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2013-12-02 18:24:33 -07:00
Nick Gordon
aa133cc5c6 removes line on li elements in markdown, fixes #1951 2013-12-02 15:37:09 -08:00
Tyler Renelle
7200ab16f4 thanksgiving: back to normal 2013-11-30 10:25:51 -07:00
Tyler Renelle
7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Matteo Pagliazzi
bdf32325f6 remove emoji css from manifest and move into index.styl 2013-11-27 16:19:56 +01:00
Matteo Pagliazzi
17c97308f3 stable, pets row 100% width 2013-11-25 16:50:51 +01:00
Nick Gordon
38225896f4 fix for https://github.com/HabitRPG/habitrpg/issues/1860 change tags to scroll horizontally rather than stack floating left 2013-11-23 17:37:20 -08:00
Nick Gordon
b793d2b753 fix for https://github.com/HabitRPG/habitrpg/issues/1900 2013-11-23 16:45:14 -08:00
Nick Gordon
2604d8e21e fix for https://github.com/HabitRPG/habitrpg/issues/1903 2013-11-23 16:20:34 -08:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Adrien Lemaire
47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle
c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -08:00
Adrien Lemaire
d4b25fdc5f change avatars lvl colors 2013-11-24 01:04:27 +11:00
Nick Gordon
f26cb2abf3 making it nicer to be in chat if someone decides to post spammy crap or huge images 2013-11-22 21:15:28 -08:00
Nick Gordon
efe2ff5d70 super awesome mega-fix with unintended awesome collateral-fixes 
* markdown supported in chat
* by proxy, paragraphs are *also* supported in chat now
* AND EVEN PROXIER, the issue with emoji not showing properly is fixed
 2013-11-22 10:38:40 -08:00
Nick Gordon
46410bc244 accomodate longer titles per #1855 2013-11-19 06:39:14 -08:00
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