Sabe Jones
b53c03bca8
Merge branch 'release' into develop
2018-01-10 16:42:13 +00:00
SabreCat
d235576e18
chore(sprites): compile
2018-01-10 16:32:34 +00:00
Keith Holliday
126d90f471
Added keys to the kennel ( #9772 )
...
* Added keys to the kennel
* Added titles and descriptions
2018-01-08 13:15:19 -06:00
Matteo Pagliazzi
6a109adbc5
Task Modal Improvements ( #9560 )
...
* start adding advanced options
* new imput
* partial colors
* update deps
* misc adds
* fix text color
* add advanced options
* initial reordering of task modal labels
* start to fix colors in the modal
* wip colors
* update package-lock.json
* fix merge
* finish modal
* refactor colors
* fix quick add
* fix colors
* new icon colors
* add markdown formatting help
* fix habits colors
* fix rewards colors
* fixed remaining colors
* start to inline inputs
* fix typ
* fixes
* habits hover state
* wip new task modal inputs
* bootstrap: upgrade to v4-beta3
* finish reward edit modal
* fix attributes allocation, checklists and add help tooltips for attributes and difficulty
* lots of fixes
* update datepicker
* misc fixes
2018-01-08 18:43:57 +01:00
SabreCat
2f9cf02932
fix(sprites): rename 2018/01 background icons
2018-01-08 17:11:20 +00:00
SabreCat
71cb4e8510
feat(content): enable Wintery Skins and Hair
2018-01-04 21:35:26 +00:00
Sabe Jones
7e241bb76f
Merge branch 'release' into develop
2018-01-03 00:07:42 +00:00
SabreCat
240dd1b965
chore(sprites): compile
2018-01-02 23:52:35 +00:00
SabreCat
88e6b2da7c
feat(content): Armoire and BGs 2018-01
...
Also ends New Year's hat fanciness
2018-01-02 23:49:50 +00:00
Sabe Jones
6e7f4a231d
chore(sprites): compile
2018-01-02 21:41:37 +00:00
Sabe Jones
da73c5c418
Merge branch 'release' into develop
2017-12-31 02:45:04 +00:00
SabreCat
b9f709ab30
chore(sprites): compile
2017-12-31 02:35:50 +00:00
SabreCat
d57c525fab
feat(event): New Year's 2017-18
2017-12-31 02:34:52 +00:00
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