0f31873262
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
website/views/options/social/index.jade
2015-08-14 11:23:35 -05:00
a29dd4cc16
Correct styling for focusable buttons
...
Fixes #5767
2015-08-11 18:34:46 -05:00
beacce7fe0
Merge branch 'develop' into sabrecat/party-page
2015-08-10 13:43:44 -05:00
f97012798e
WIP(party-page): Party preview graphic
2015-08-06 16:36:28 -05:00
f1704a6a92
WIP(party-page): Active party page
2015-08-06 12:13:50 -05:00
2343e4720c
Add tooltips for day buttons to show "due" or "not due"
2015-08-05 22:25:03 +02:00
c275db6b4b
Merge branch 'develop' into sabrecat/party-page
2015-08-05 12:43:56 -05:00
68cc0fd56a
fix(avatar): Delist Splashy Skins
...
Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.
2015-08-04 15:17:38 -05:00
c402ec61b2
Remove checkmark from focused task, increase opacity of background
...
Fixes #5682
2015-08-04 08:16:31 -05:00
1de80a3ed8
WIP(party-page): Revised invite modals
2015-07-30 16:48:08 -05:00
f8d7547923
WIP(party): Incomplete no-party page
2015-07-29 16:28:23 -05:00
f31d1b4b1b
Merge branch 'develop' into TheHollidayInn-tasks-select-with-keys-fix
2015-07-24 22:16:57 -05:00
f749d1a3cb
Make todos selectable with vimium
2015-07-24 22:08:13 -05:00
d022a0eb67
Merge branch 'develop' into sabrecat/death-modal
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-07-24 16:11:51 -05:00
966e90da4e
Added height and width so Vimium can find the checkboxes
2015-07-23 21:20:18 -05:00
c286d08bc8
WIP(death): New death modal
2015-07-20 16:24:05 -05:00
ffc441ab82
feat(quests): Improve drop notif
2015-07-16 16:22:49 -05:00
73a1c7c596
fix(style): Remove extra class
2015-07-16 11:29:04 -05:00
32a74471db
Merge branch 'sabrecat/quests-page' into develop
2015-07-14 18:56:32 -05:00
7ad2839f05
Adjust look of page blurbs
2015-07-14 08:18:02 -05:00
7e60864d41
Fixing color on blurbs
2015-07-14 07:46:57 -05:00
65b7465081
adding blurbs to pages
2015-07-14 07:44:51 -05:00
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
00f7af7807
Introducing a class for buttons allowing wrapping
...
New .btn-wrap class for buttons with long text allowing wrapping
2015-07-10 02:33:09 +05:00
78d4989544
WIP(event): Summer Splash cont'd
...
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
6e7d94a317
Added keyboard selection for rewards and habits
2015-07-08 08:36:00 -05:00
0089a260c7
Added opacity to hide input field. Added enter to submit input fields. Added background color change when user focuses task with keyboard
2015-07-06 23:22:35 -05:00
2946dd5c4a
Restyled task when focused with keyboard.
2015-07-04 19:51:51 -05:00
6845e8caf3
fix(experiment): Style fixes
...
Corrects the display of Google Experiment variants in the absence of an API callback, and widens the avatar stat bar for users who don't have a party.
2015-07-03 13:46:22 -05:00
fb81c79b78
feat(analytics): Invite Friends experiment
...
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
2015-07-02 16:13:22 -05:00
25dd82ffa0
feat(event): Summer Splash cont'd
...
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
7719f46e49
Removed style preventing user from selecting tasks with keyboard
2015-06-30 16:54:04 -05:00
a946f2b5a5
rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section
2015-06-29 21:49:54 +10:00
11396d4756
make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204
2015-06-28 19:40:39 +10:00
d89ee5fff2
Adjust margin
2015-06-14 01:36:38 -05:00
831f5b89bd
Merge branch 'develop' into nthomsn-develop
2015-06-14 01:27:35 -05:00
41b1abba3a
Checkout help button changes
2015-06-13 23:16:12 -05:00
0eb8caec23
Various task ui improvements
...
* Use bootstrap form-control class for text and notes
* Can't edit start date or days of the week in challenge dailies from website
* Refactor dailies
2015-06-13 22:29:06 -05:00
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
2f1111522c
Adjust PR #5389
...
* Convert $watch to ng-change and re-wrote test
* Removed unnecessary styles
* Use .form-control instead of class='form-control'
2015-06-12 09:05:06 -05:00
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
b413e38682
Put tasks filter field to the right
2015-06-11 22:16:40 +02:00
72a3419327
Change the styling of filter box to bootstrap
2015-06-11 20:41:08 +02:00
867308975f
Merge https://github.com/HabitRPG/habitrpg into develop
2015-06-11 08:40:36 -07:00
2625b57f2d
Make sure search filter has same margin as tags
2015-06-11 15:32:01 +02:00
df7d36923c
Enable filtering for tasks and custom rewards
...
Add search input box next to the tags. When user changes the value of
the input box then it's propagated to the user service as filterQuery
string. filterQuery string is then used in the tasks template to filter
tasks by text.
2015-06-11 09:10:31 +02:00
1bf38578bf
Merge branch 'develop' into hairlessbear-show_group_leader
2015-06-10 17:51:45 -05:00
b132b3c4fa
Make advanced options a button
2015-06-04 17:48:59 -05:00
60ecdb2dca
Removed colons from JSON and 'formatting-help' class to 'slight-vertical-padding'
2015-06-04 17:48:31 -04:00
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
Sabe Jones