Commit Graph

159 Commits

Author SHA1 Message Date
Blade Barringer 4f1a4393e1 fix: Adjust spacing of emoji in tags 2016-04-26 12:50:37 -05:00
Blade Barringer e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05:00
Blade Barringer ae14d405cb fix(css): Scope textarea z-index to just task boxes 2016-04-05 20:07:11 -05:00
MathWhiz c7d058f2bc Add z-index to notes textarea 2016-04-04 20:48:54 -05:00
Blade Barringer 9508ed45df refactor: Move order by equipmentment button to top of view 2016-03-15 19:41:11 -05:00
Matt Harrington a6fb945120 inventory sorting
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
2016-03-15 19:41:11 -05:00
Martin Colwell 93410c4f7a issue(6774): add support for markdown blockquote 2016-02-26 20:07:12 -05:00
Alys ffb5cfd46e Merge pull request #6582 from tylerxo/remove_modal_username
Adds user details to the removal modal
2016-02-18 06:39:31 +10:00
Tyler Smith 065238525c Removing extra class in favor of .lead 2016-02-02 10:22:17 -08:00
Josh Holland f7163519c1 Make task help icons consistent across browsers
The zoom CSS property isn't supported by Firefox, and nor is
vertical-align: -webkit-baseline-middle. font-size: 1.5em has the same
effect, and vertical-align: middle ensures that the tooltip doesn't
overlap with the icon.
2016-01-31 15:41:00 +00:00
Sabe Jones 91c6ce27c5 feat(event): Habit Birthday 2016
Also adds AWS Elastic Beanstalk local config file to .gitignore.
2016-01-28 17:16:01 -05:00
Tyler Smith 77cfc99b59 Adding user details to the removal modal 2016-01-25 17:37:18 -08:00
Shellbot 7d0ad86c43 Color code quest accepted/rejected text 2016-01-22 21:56:39 +00:00
Sabe Jones 016b080836 Merge branch 'anowlcalledjosh/add-task-fix' into develop 2016-01-20 14:27:21 -05:00
Sabe Jones af53285e01 Merge branch 'proarunas/fix-css-bugs' into develop 2016-01-20 14:17:39 -05:00
Josh Holland 77342e5790 Fix 'add task' button jumping around 2016-01-19 20:56:06 +00:00
Sabe Jones c6b4b24052 Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
Sabe Jones 9b008f71a0 fix(CSS): remove redundant style 2016-01-18 16:13:24 -05:00
Blade Barringer af19d0d77b fix: Correct stylus comment about modal height 2016-01-17 16:11:42 -06:00
Blade Barringer 0a2c833f9b Merge branch 'tylerxo-develop' into develop 2016-01-17 16:10:59 -06:00
Tyler Smith 1d7c30a06d Fixes for the profile modal
This commit fixes the following:

1. Unintented scrollbar was being created on the .modal container element
2. 15px gap between the footer and scrollable content, creating an odd visual lapse
3. Modal was too wide between 768px and 900px, bleeding off the page.
2016-01-16 16:14:20 -08:00
Joshua Holland c85f994f4c Make .img-rendering-auto apply to descendants 2016-01-16 22:39:40 +00:00
Sabe Jones 23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Josh Holland a0b264f686 Align progress and help icons on to-dos column
Fixes #6474

As per #6474, progress and help icons on the to-dos column were
previously misaligned due to inline styles. This commit adds the same
inline styles to both icons.

Move inline styles on task column icons to a class

This uses existing classes instead of adding a new one, because if new
icons are added in the future this should catch them without any extra
classes having to be added to the new icons.

In addition, this will catch any new .option-box added to .task-column
in the future; this may be good or bad, but is easy to fix in any case.
2016-01-14 20:24:09 -06:00
Sabe Jones b6b2c25358 style(modal): text and visual tweaks for Gems 2016-01-14 15:58:14 -05:00
Sabe Jones 2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng 8bc78af5ae Added specificity to CSS, removed exxtra line 2016-01-12 15:00:07 -05:00
AnitaYCheng 313a18971e Add CSS changes for conditional buy-gem modal 2016-01-12 14:58:39 -05:00
pittaxx 8cd34e49bd Removed extra scrollbars at medium width. Cleared floating for todo tab in medium width. 2016-01-09 18:47:04 +02:00
pittaxx 6fff7f9b93 Changed css bootstrap screen-width constants to variables. 2015-12-27 13:28:41 +02:00
pittaxx c7d47dcd0a Fixed css bug, where both min-width and max-width were set to 768.
Max-width was changed to 767 to prevent overlap, which produces artifacts when
screen width is exactly 768 pixels.
2015-12-26 21:37:42 +02:00
Daniel Van Camp 3c7ddf8df1 Merge branch 'develop' into static-page-merch 2015-12-14 21:27:50 +01:00
Blade Barringer 530babf516 chore(css): Add explanation for empty-task-notification rule 2015-12-12 17:27:43 -06:00
Blade Barringer 963995e42e refactor(css): Adjust mount heads pixel paw positioning 2015-12-12 10:50:05 -06:00
Daniel Van Camp 3d9b2047d0 updated static.styl with less classes
added key attribute to merchant array
changed item to merchant for clearity
added fallback for when no logo is found (no image can be provided)
updated guidelines
updated json
2015-11-30 22:33:12 +01:00
Daniel Van Camp afecae9ef0 cleared merch.json of attributes that should not be translated 2015-11-29 19:05:32 +01:00
Daniel Van Camp 6a535277a7 updated tab indent
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
2015-11-27 23:25:56 +01:00
Daniel Van Camp 37378e8497 once more i try to add it back 2015-11-27 10:28:45 +01:00
Daniel Van Camp 169a8d9915 added static merch page
added lang en .json
modified pages.js with the extra merch page
2015-11-26 23:51:57 +01:00
Mark Howson fa462a1829 Renamed to wide-popover as it's the only remaining use 2015-11-26 12:56:22 +00:00
Mark Howson 848a96a9fa Fix for #6252 2015-11-26 11:56:32 +00:00
Gautham Chandra 8df005d29e Added noscript content for the landing page 2015-11-15 16:42:48 -05:00
Gautham Chandra b5e10bf1e9 Added a helpful message for when JS is disabled 2015-11-15 14:12:12 -05:00
Gautham Chandra b9b2536478 User can now check out of inn from tasks page
Fixes #5651
2015-11-07 18:32:19 -05:00
Blade Barringer 78cfbd2c6a Revert btn-buy style change 2015-11-04 22:02:50 -06:00
Blade Barringer 2eb6cab2be Merge pull request #6014 from ahstro/toggle-chevrons
Toggle chevron direction
2015-10-30 23:13:51 -05:00
Blade Barringer 92271c2049 Clean up view for market. 2015-10-30 22:49:13 -05:00
Thrashmandicoot c2222a42c7 Add 70% width styling for item sales 2015-10-30 20:01:06 -07:00
Thrashmandicoot 04550a3346 Add btn-sell to increase width of market button to container 2015-10-07 19:18:54 -07:00
ahstro 76fcbfc19f Toggle chevron direction
When editing a task, there are some expandable options available with a
chevron next to them (e.g. 'Tags' and 'Advanced Options'). This commit
makes the chevrons' directions toggle based on whether the related
option is expanded or collapsed, up and down respectively.
2015-10-05 22:17:28 +02:00