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
065238525c
Removing extra class in favor of .lead
2016-02-02 10:22:17 -08:00
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
91c6ce27c5
feat(event): Habit Birthday 2016
...
Also adds AWS Elastic Beanstalk local config file to .gitignore.
2016-01-28 17:16:01 -05:00
77cfc99b59
Adding user details to the removal modal
2016-01-25 17:37:18 -08:00
7d0ad86c43
Color code quest accepted/rejected text
2016-01-22 21:56:39 +00:00
274157d21d
Merge branch 'tylerxo/menu-error-fix' into develop
2016-01-20 14:34:55 -05:00
016b080836
Merge branch 'anowlcalledjosh/add-task-fix' into develop
2016-01-20 14:27:21 -05:00
af53285e01
Merge branch 'proarunas/fix-css-bugs' into develop
2016-01-20 14:17:39 -05:00
f3d6c62484
More closely matching coding style within the file
2016-01-19 19:57:11 -08:00
b5b3a1545b
Adding conditional to prevent undefined object error
2016-01-19 19:53:20 -08:00
77342e5790
Fix 'add task' button jumping around
2016-01-19 20:56:06 +00:00
c4acd262eb
Merge pull request #6476 from Sighne/sighne/upgrade-amount-users
...
#6460 : upgrade amount of users
2016-01-19 13:41:03 -06:00
3a300cb93e
add new emails images
2016-01-19 18:30:57 +01:00
2989057dd3
Fix for issue #5182 : Allow cancel editing group infobox
2016-01-18 22:39:06 -06:00
d44ff94acb
Merge pull request #6547 from vIiRuS/guidelinespage
...
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 15:37:58 -06:00
c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
9b008f71a0
fix(CSS): remove redundant style
2016-01-18 16:13:24 -05:00
d0de12abac
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 20:52:27 +01:00
af19d0d77b
fix: Correct stylus comment about modal height
2016-01-17 16:11:42 -06:00
0a2c833f9b
Merge branch 'tylerxo-develop' into develop
2016-01-17 16:10:59 -06:00
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
c85f994f4c
Make .img-rendering-auto apply to descendants
2016-01-16 22:39:40 +00:00
5931ddf2ba
Decrease margin for the new logo to fit in social pages
2016-01-16 11:11:48 +01:00
de3d4ae8e7
Adds Discover magazine logo
2016-01-16 11:11:48 +01:00
23720e0a43
style(subscription): more tweaks
2016-01-15 14:10:02 -05:00
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
b6b2c25358
style(modal): text and visual tweaks for Gems
2016-01-14 15:58:14 -05:00
9887fe58c4
fix(Stripe): zoom out so gryphon is visible
2016-01-12 16:12:44 -05:00
81842bbee1
fix(subscription): visual and wording tweaks
2016-01-12 15:29:10 -05:00
2db1ef0f7a
style(subscriptions): Gem layout feedback
2016-01-12 15:00:07 -05:00
8bc78af5ae
Added specificity to CSS, removed exxtra line
2016-01-12 15:00:07 -05:00
313a18971e
Add CSS changes for conditional buy-gem modal
2016-01-12 14:58:39 -05:00
8cd34e49bd
Removed extra scrollbars at medium width. Cleared floating for todo tab in medium width.
2016-01-09 18:47:04 +02:00
99a694bb10
added EU version of t-shirt
2016-01-06 23:15:36 +01:00
0362977dbd
Merge branch 'develop' into static-page-merch
2016-01-06 22:38:19 +01:00
837c27ff4c
Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars
...
Encode special characters when sending to paypal
2016-01-03 19:40:39 -06:00
430bcd2652
Encode special characters when sending to paypal
2015-12-31 02:46:56 +02:00
b3050e5a67
chore(dependency): Upgrade lodash from v2 to v3
2015-12-29 07:45:03 -06:00
ea54ec607a
Add confirmation popover for Release pets/mounts
...
Add tests for releasing pets and mounts
Refactor tests to use expect syntax from sinon-chai
tests(karma): Refine settings controller tests
refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
f6f82cafc4
Add confirmation popover for Rebirth
...
Add confirmation popover for Fortify/Reroll
Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
56a00efb19
Fix for Issue #3517 Display Current Page Name
...
Revision for Fix for issue #3517
lint: Remove extraneous white space in app.js file
fix: Correct attribute from pageTitle to title in $state interface
2015-12-28 07:53:51 -06:00
6fff7f9b93
Changed css bootstrap screen-width constants to variables.
2015-12-27 13:28:41 +02:00
7df3b333f6
feat: Refine clear local storage function
2015-12-26 19:00:45 -06:00
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
6ed9133f70
WIP(event): Winter Wonderland 2015-16 partial
2015-12-15 17:15:02 -05:00
e638661c71
Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message
...
Changed language when deleteing tasks to indicate type and text of task
2015-12-14 14:30:06 -06:00
3c7ddf8df1
Merge branch 'develop' into static-page-merch
2015-12-14 21:27:50 +01:00
5fa91713f5
fix(favicon): Add 192x192 image
2015-12-12 20:11:25 -06:00
025b302ec6
Merge branch 'develop' into anilanar-favicon192
2015-12-12 20:08:34 -06:00
Alys