Sabe Jones
73a1c7c596
fix(style): Remove extra class
2015-07-16 11:29:04 -05:00
Sabe Jones
32a74471db
Merge branch 'sabrecat/quests-page' into develop
2015-07-14 18:56:32 -05:00
Blade Barringer
7ad2839f05
Adjust look of page blurbs
2015-07-14 08:18:02 -05:00
unknown
7e60864d41
Fixing color on blurbs
2015-07-14 07:46:57 -05:00
unknown
65b7465081
adding blurbs to pages
2015-07-14 07:44:51 -05:00
Blade Barringer
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
GihHubSphinx
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
Sabe Jones
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
Sabe Jones
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
Sabe Jones
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
Sabe Jones
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
Alys
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
Alys
11396d4756
make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204
2015-06-28 19:40:39 +10:00
Blade Barringer
d89ee5fff2
Adjust margin
2015-06-14 01:36:38 -05:00
Blade Barringer
831f5b89bd
Merge branch 'develop' into nthomsn-develop
2015-06-14 01:27:35 -05:00
Blade Barringer
41b1abba3a
Checkout help button changes
2015-06-13 23:16:12 -05:00
Blade Barringer
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
Blade Barringer
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
Blade Barringer
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
Blade Barringer
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
Jiri Chara
b413e38682
Put tasks filter field to the right
2015-06-11 22:16:40 +02:00
Jiri Chara
72a3419327
Change the styling of filter box to bootstrap
2015-06-11 20:41:08 +02:00
Nicholas Thomson
867308975f
Merge https://github.com/HabitRPG/habitrpg into develop
2015-06-11 08:40:36 -07:00
Jiri Chara
2625b57f2d
Make sure search filter has same margin as tags
2015-06-11 15:32:01 +02:00
Jiri Chara
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
Blade Barringer
1bf38578bf
Merge branch 'develop' into hairlessbear-show_group_leader
2015-06-10 17:51:45 -05:00
Blade Barringer
b132b3c4fa
Make advanced options a button
2015-06-04 17:48:59 -05:00
hairlessbear
60ecdb2dca
Removed colons from JSON and 'formatting-help' class to 'slight-vertical-padding'
2015-06-04 17:48:31 -04:00
Blade Barringer
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
TheHollidayInn
2234c7219e
Moved invite friends button to under the subscribe button
2015-06-03 20:33:39 -05:00
Blade Barringer
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
TheHollidayInn
e3f5c22fe8
Added start party option, locales, and plus button
2015-06-01 21:07:53 -05:00
Blade Barringer
5d93f364c1
Merge branch 'blade-hairlessbear_markdown_help_table' into develop
2015-05-24 22:47:02 -05:00
Blade Barringer
165dd3a4a6
Fixes for minor visual inconsistencies with popovers and toolbars
...
Closes #5274 , closes #5272 , closes #5271
2015-05-24 15:34:12 -05:00
Blade Barringer
681668f131
Tweak @hairlessbear's pr
...
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
2015-05-24 09:20:12 -05:00
hairlessbear
337a727390
Added hidable markdown help menu and adding to private messages
2015-05-23 22:51:40 -04:00
Allen Pan
a763a3a3da
Cleaned up task.jade file:
...
- moved ugly html newlines into the stylesheet
- renamed temporary var for datePicker’s ngmodel from _dateString to _tempDateForPicker
- renamed open -> openDatePicker, and have the function track datePicker’s open/closed state on a per task instead of global basis
2015-05-15 20:24:47 -07:00
Alys
2ac763cc50
add message about Resting in the Inn to top of Dailies column when preferences.sleep is true
2015-05-13 16:56:52 +10:00
Blade Barringer
109ca1b67c
Correct bullet list position; fixes #5181
2015-05-10 14:16:11 -05:00
Alys
5123bdb4c4
Merge pull request #5080 from joyclark/develop
...
Fixing the grid view for mounts so that the animals are aligned correctly.
2015-05-10 19:01:56 +10:00
Negue
b2bad4d77f
Update todo preview in dialog
2015-05-03 17:12:08 +02:00
Blade Barringer
e4b21ac325
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
2015-04-29 17:19:24 -05:00
Negue
189423b0db
markdown preview - code "inherit white-space" / hide links for 'system'
2015-04-27 19:47:42 +02:00
Blade Barringer
7494cb1438
Make gem popover consistent with gold and silver. Closes #5088
2015-04-25 21:53:00 -05:00
Joy Clark
0aff0b0f22
mounts are wider than pets and the empty paw prints in the mount view are smaller than the mounts that have been found. This makes the grid view uneven. Adjusted the css so that the mounts and paw prints are aligned.
2015-04-24 19:57:15 +02:00
Blade Barringer
523582f870
Add clear:both after task-column to fix floating issue
2015-04-23 17:58:33 -05:00
Blade Barringer
8cec2da905
Added button for jumping to inbox
2015-04-22 19:29:24 -05:00
Kevin Gisi
d455666650
Join/Leave buttons on guild detail page. Addresses #4427
2015-04-15 06:15:11 -04:00
Kevin Gisi
3e653c9282
Reimplemented single challenge view code from #3319
2015-04-06 02:18:29 -04:00
Alys
7d579ea08a
Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM
...
Conflicts:
website/views/shared/modals/members.jade
2015-04-05 23:24:46 +10:00
