Commit Graph

254 Commits

Author SHA1 Message Date
SabreCat 028b9d569d Merge branch 'release' into develop 2017-12-21 23:20:51 +00:00
SabreCat b68e69e1a1 chore(sprites): compile 2017-12-21 23:12:06 +00:00
Keith Holliday a7617fa947 Added broken megaphone icon (#9737) 2017-12-21 10:25:54 -06:00
Keith Holliday 6e0b6171c6 Many ie style fixes (#9728) 2017-12-20 10:33:21 -06:00
SabreCat acf34e2344 chore(sprites): compile 2017-12-20 02:27:43 +00:00
SabreCat 98bb6fd7ce feat(content): Winter Wonderland 2017-18
and Starry Night Hatching Potions
2017-12-20 02:23:11 +00:00
SabreCat e229bc5042 Merge branch 'release' into develop 2017-12-15 05:37:04 +00:00
SabreCat c4ffe39ec9 chore(news): Bailey 2017-12-15 05:34:30 +00:00
Keith Holliday e7fd2b4c79 [WIP] Added initial inapp loading screen with tips (#9710)
* Added initial inapp loading screen with tips

* Added new tips and styles

* Removed unrelated readme
2017-12-14 09:35:10 -06:00
SabreCat b0ebdfeb65 Merge branch 'release' into develop 2017-12-13 22:16:30 +00:00
SabreCat 5a3751cbac chore(news): Blog Bailey 2017-12-13 22:14:19 +00:00
Keith Holliday 566716e2fe Added display logic for npcs (#9709)
* Added display logic for npcs

* Fixed lint
2017-12-12 19:05:18 -06:00
SabreCat 2a42bc9450 Merge branch 'release' into develop 2017-12-12 21:27:04 +00:00
SabreCat 355773ecf3 chore(news): FCC CTA
Also fixes an issue with sprite alignment of the Lamplighter Set.
2017-12-12 21:24:18 +00:00
Andrew Bustos 341f16cc82 Fixed block icon not showing in profile modal. (#9667)
* Fixed block and add icon not showing and the ordering of the buttons. Also fixed and added tooltips for buttons.

* Changed unnecessary change of color in svg icon files and changed tooltip attribute to not be empty
2017-12-05 15:01:18 -06:00
Sabe Jones 9e8807c40d Armoire and Backgrounds December 2017 (#9659)
* feat(content): Armoire and Backgrounds 2017/12

* chore(sprites): compile

* chore(news): Bailey
2017-12-05 19:29:00 +00:00
Sabe Jones 9bfbeaf93e Armoire and Backgrounds December 2017 (#9659)
* feat(content): Armoire and Backgrounds 2017/12

* chore(sprites): compile

* chore(news): Bailey
2017-12-05 13:25:52 -06:00
SabreCat 00dc990974 chore(event): end Thanksgiving, add Bailey 2017-11-29 05:03:01 +00:00
Keith Holliday e628c5dc3b Fixed task best color (#9563) 2017-11-21 14:02:53 -06:00
SabreCat 82497e4041 chore(sprites): compile 2017-11-17 22:22:27 +00:00
SabreCat 2a5e9c0780 feat(event): Turkey Day 2017
and (content) November Subscriber Items
2017-11-17 22:21:05 +00:00
Matteo Pagliazzi b4c4769208 fix: correctly handle bootstrap variables 2017-11-16 21:59:55 +01:00
Matteo Pagliazzi b999d46142 Merge branch 'issue9334' of https://github.com/CSE2410-TeamZero/habitica into CSE2410-TeamZero-issue9334 2017-11-15 17:47:17 +01:00
Sabe Jones cb612d99d7 chore(sprites): recompile 2017-11-15 01:31:01 +00:00
Sabe Jones 838b9a5822 Merge branch 'release' into develop 2017-11-15 01:03:07 +00:00
SabreCat cd5ff04ee4 chore(sprites): compile 2017-11-15 00:53:27 +00:00
Unknown ca3437d676 Added pin.scss to index.scss. 2017-11-14 19:26:11 -05:00
Unknown 6259b68b4f Does not reuse same css classes, imports them from pin.scss. For the togglePin function the notification. 2017-11-14 18:10:33 -05:00
Matteo Pagliazzi bddafd4392 fix bailey css 2017-11-13 12:12:41 +01:00
Matteo Pagliazzi 3ab14e4e5a fix checklist deleting 2017-11-13 12:08:42 +01:00
Matteo Pagliazzi 45696a6273 remove outline from focused inputs 2017-11-10 12:02:20 +01:00
Sabe Jones 0d2737572d Merge branch 'release' into develop 2017-11-09 17:57:48 +00:00
SabreCat 6e6ca05352 fix(sprites): missing Guild image 2017-11-09 17:44:48 +00:00
SabreCat 74d8ecc732 Merge branch 'release' into develop 2017-11-09 17:24:48 +00:00
negue 4108a22d78 [WIP] bootstrap-vue upgrade (#9178)
* update bootstrap-vue to 1.0.0-beta.9 - remove all individual bootstrap components and use BootstrapVue into Vue

* change modal action names from show::modal to bv::show::modal

* check if drops are undefined

* fix modal widths - sellModal now using input instead of dropbox

* upgrade to bootstrap 4.0beta

* include package-lock changes

* fix app menu dropdown position

* upgrade bootstrap to beta2 (was missing grid offset and other fixes) - refix header menu position

* fix tags popup (auto width to max not working) - fix filter panel width (adding width: 100% works until max-width)

* show hide logo on different screensize (new css breakpoints - http://getbootstrap.com/docs/4.0/utilities/display/ )

* fix package-lock?

* fix active button style / app header toggle button

* fix package-lock !

* update package lock after merge - new mixin "openedItemRows" to save the "show more/show less" in stable

* mixin naming style

* fix buyQuestModal marginTop

* fix customMenuDropdown position

* fix userDropdown items
2017-11-08 18:40:37 +01:00
SabreCat 50d3226a86 feat(content): change to Thunderstorm Hatching Potions 2017-11-07 22:02:46 +00:00
Keith Holliday f964e3c0a5 Updated avatar menu icons and style (#9409) 2017-11-07 11:57:42 -07:00
Matteo Pagliazzi 19500600bc cache sprites and fix images caching (#9422) 2017-11-07 11:48:23 +01:00
Matteo Pagliazzi 9cbd7ad62d fix customize-options sprites 2017-11-03 19:06:06 +01:00
SabreCat 4d4c1cfaf3 chore(sprites): compile 2017-11-03 02:54:26 +00:00
SabreCat f8876fe055 feat(content): Backgrounds and Armoire 2017-11
End Habitoween and Fall Festival
2017-11-03 01:56:15 +00:00
Matteo Pagliazzi a208ba4aba Tasks v2 Part 2 (#9236)
* start updating colors for tasks controls

* finish updating controls colors

* change hoevr behavior

* change transition duration

* update color with transition

* refactor menu wip

* wip

* upgrade vue deps

* fix warnings

* fix menu

* misc fixes

* more fixes

* fix badge

* fix margins in menu

* wip tooltips

* tooltips

* fix checklist colors

* add badges

* fix quick add input

* add transition to task controls too

* add batch add

* fix task filtering

* finish tasks badges

* fix menu

* upgrade deps

* fix shop items using all the same image

* fix animation

* disable client tests until we remove phantomjs

* revert changes to tasks colors

* fix opacity in task modal inputs

* remove client unit tests from travis

* wip task dropdown

* fix z-index for task footer/header

* fixes and add files

* fixes

* bigger clickable area

* more space to open task dropdown

* droddown position

* fix menu position

* make sure other dropdowns get closed correctly

* fixes

* start to fix z-index

* draggable = false for task dropdown

* fix for dropdown position

* implement move to top / bottom

* fix push to bottom

* typo

* fix drag and drop

* use standard code

* wider click area for dropdown

* unify badge look

* fix padding

* misc fixes

* more fixes

* make dropdown scrollable

* misc fixes

* fix padding for notes

* use existing code instead of new props
2017-11-02 21:07:38 +01:00
SabreCat 70692752c7 fix(sprites): bad shirt centering 2017-10-31 00:48:37 +00:00
SabreCat d1396e7bc6 chore(sprites): compile 2017-10-30 20:41:32 +00:00
SabreCat d5cedaa925 feat(event): Habitoween 2017-10-30 20:40:29 +00:00
SabreCat 2d4dc9e23c chore(news): blog Bailey 2017-10-26 21:13:04 +00:00
SabreCat a8a915ea8e chore(sprites): compile 2017-10-24 20:23:42 +00:00
SabreCat 0c973b1cf0 chore(news): Bailey 2017-10-21 03:33:42 +00:00
Stephy 1af42aa7fe Set a max-width for Markdown images (#9230)
Prevents images from overflowing in tavern chat, guild sidebars, tasks,
and anywhere else using Markdown

Closes https://github.com/HabitRPG/habitica/issues/9171
2017-10-18 15:47:16 -05:00
tim1234ltp ad50f90ba0 Bug fixes on Merchandise Page [Fixes Issues #9144] (#9195)
* Moved pictures of merch items from assets/images/merch/ to /website/static/merch
Image src in merch.vue is linked to the new path.

* Rebased and fixed.

* Reverted changes of package-lock.json
2017-10-17 10:48:23 -05:00