Commit Graph

302 Commits

Author SHA1 Message Date
K Bell 0f2adcad14 highlight spell item when it has class of 'active' 2015-01-10 10:35:27 -05:00
Sabe Jones ee339fba4a feat(event): World boss
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
2015-01-08 15:22:42 -06:00
Blade Barringer 33abd30217 Adjusted look of gem wallet in modal 2015-01-01 23:22:40 -06:00
Blade Barringer 5f179baf60 Adjusted look of tasks on mobile devices 2014-12-31 10:41:40 -06:00
Blade Barringer 5d958b1456 Adjusted styles for snowball and spookDust so they would align like the coins 2014-12-31 09:31:56 -06:00
Tyler Renelle edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
benmanley 118ba88d3d fix(tasks): improve UI consistency and layout
* Match UI elements with rest of site
* Tidy up layout
2014-12-24 09:53:41 +00:00
benmanley 8cf3cd66cc fix(avatar): prevent avatar from obscuring name
Increase z-index of avatar-name so that avatar image doesn’t obscure it
when riding a mount
2014-12-24 09:53:40 +00:00
Blade Barringer 7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
Conflicts:
	views/options/social/chat-message.jade
2014-12-18 21:55:50 -06:00
Blade Barringer 7db273c0be Merge pull request #3773 from benlind/buttonless_habits_full_space
Fixes #3260: Buttonless habits full width
2014-12-18 13:52:01 -06:00
Blade Barringer dde3f5ffef Adjusted tooltip wrapping so it would only affect long titles 2014-12-14 12:18:59 -06:00
Blade Barringer a961d6b342 Added wrapping rule for user tooltip in chat messages closes #4367 2014-12-14 12:05:36 -06:00
Blade Barringer d0df9e46d6 Added helper classes for floats at various screen sizes 2014-12-14 08:31:40 -06:00
Blade Barringer 41e1f4c75f Conditionally allow completed quest image to be centered if no
completion text is present
2014-12-14 08:13:50 -06:00
Blade Barringer 195a8a5ca3 Merge pull request #4375 from thehindenburg/questimage
Quest image added in the completion screen
2014-12-14 07:39:16 -06:00
thehindenburg 7c6d8d4dc2 Update quests.styl
further white space cleanup
2014-12-12 11:02:55 -08:00
thehindenburg 670542f3ce cleaning up white space 2014-12-12 10:44:06 -08:00
thehindenburg 2db80c6841 changed to style sheet 2014-12-12 10:26:55 -08:00
benmanley 0943a229ec fix(avatar.styl): improve label layout
Fixes #4349

* Tweak position of labels to align better with background border.
* Increase z-index of share button to prevent it being obscured by
avatar.
* Move share button to bottom left corner to prevent it obscuring
avatar name.
2014-12-12 17:41:45 +00:00
Blade Barringer 0cf7bba822 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 2014-12-11 10:21:19 -06:00
Blade Barringer 5ac7f479d3 Added some spacing between icons and text on challenge/guild buttons 2014-12-07 21:03:09 -06:00
Blade Barringer 05c01ebd3c Made glyphicons white on for challenge/guild join/leave buttons 2014-12-07 21:01:40 -06:00
Blade Barringer 2f506ce0e0 Give flag text danger class and already reported message if already
reproted
2014-12-07 13:50:47 +01:00
Blade Barringer 60f3e0032e Adjusted margin for markdown list in tast-text. Closes #2721 2014-12-06 16:41:59 -06:00
Blade Barringer 66f913e833 closes #4353. If time on chat would break onto new line, just puts whole
time statment on new line
2014-12-05 23:51:07 -06:00
Blade Barringer ea869a4487 Adjust trasnparent class of challenge buttons. Closes #4346 2014-12-05 15:13:34 -06:00
Sabe Jones aa346c9271 Merge pull request #4328 from SabreCat/gems
Add available Gems counter to Market
2014-12-04 20:30:46 -06:00
Sabe Jones c9b0898499 fix(style): help emoji line up with task text
Adds a `vertical-align` property to `span.emoji` so adding an emoji to a task doesn't cause it to bounce out of alignment with the rest of the task's text.
2014-12-04 16:32:00 -06:00
Blade Barringer 6b8a4f966b Merge pull request #4321 from sbreiler/develop
Fix #2879 (Check-Icons)
2014-12-04 08:15:38 -06:00
Sabe Jones ce8b6d2901 fix(style): Give room for badge 2014-12-03 22:22:21 -06:00
Tyler Renelle 7e9b92fcad feat(gifts): allow gifting from balance 2014-12-03 14:17:07 -07:00
Steffen Breiler ffb073102f Fix #2879 (Check-Icons)
IE11 shows checkmark in wierd position. It seems that IE does size the "checkmark" differently than firefox, which make them appear to be more to the right and bottom. I'm using glyphicons to fix that. The look is constistent in different browser. Though its kind of thicker than the original was.
2014-12-03 18:51:17 +01:00
benmanley 073b338bde fix(tasks): stop reward values overflowing
Fixes #1993

* Restyle reward cost area to fit three digit rewards into default view
* Apply custom styles to rewards with higher values to prevent them
from overflowing
2014-12-03 15:40:08 +00:00
benmanley 9c2c08c03d fix(.task-filter): force long words to wrap
Fixes #4308 Task tabs cut off long words

Prevents long words from overflowing outside of tab width in button
bars by forcing them to break.
2014-12-01 13:31:15 +00:00
Blade Barringer 0c675f704b Simplified styles for locked and unlocked backgrounds 2014-11-30 18:57:01 -06:00
Blade Barringer 632d0fdf5d Merge pull request #4299 from pollockjj/develop
Solution for: Differentiate Locked and Unlocked Backgrounds (#4261)
2014-11-30 18:41:51 -06:00
pollockjj 6520caed7d Modified to 15px border and lock icon based on feedback from dev team 2014-11-29 21:56:10 -06:00
pollockjj 1a567ce82f Changes to address github ticket: Differentiate Locked and Unlocked Backgrounds (#4261). Added two new background-specific styles to customizer.styl and utilized them in profile.jade by checking for ownership of the asset and displaying a border or not, as appropriate 2014-11-29 12:25:21 -06:00
benmanley 50b1cba0a6 refactor(tasks) improve UI consistency
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
Tyler Renelle 69da58503a feat(sharing): move avatar-sharing to herobox, use addthis instead of
custom solution. refactor from pages/* to export/*
2014-11-11 19:11:49 -07:00
Alice Harris b79118c976 fix decapitated mount head 2014-11-02 18:54:33 +10:00
Alice Harris 0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
2014-11-01 10:25:38 +10:00
Tyler Renelle b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
hospect 76de909683 Minor bug: In challenges area, Join button has a yellow background 2014-10-22 01:45:37 +03:00
Blade Barringer ee0e8efa9d Changed margin .row under .container-fluid to match padding
Since the default is padding: 0 15px, changing it to 0 5px
also requires a change to the row right after it
2014-10-16 16:13:33 -05:00
gjoyner 36bf09d984 Adding checklist item drag and drop feature 2014-10-12 01:48:51 -07:00
Alice Harris e5700a35e2 make whitespace consistent (tabs changed to spaces) - yes this IS pedantic, sorry :) 2014-10-06 11:53:24 +10:00
Alice Harris 7e0022817f remove unused menu.mounts style (probably best anyway to keep using menu.pets in both pets and mounts pages for consistency of appearance) 2014-10-06 11:52:15 +10:00
Alice Harris e53dd0da20 add padding-top: -30px --> vertical-align: top fix from a previous PR 2014-10-06 11:44:53 +10:00
Alice Harris ecd61ee602 Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop
Conflicts:
	views/options/inventory/stable.jade
2014-10-06 11:36:32 +10:00