krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format files to adhere to editorconfig (#7977)

Browse Source
This commit is contained in:
Blade Barringer
2016-09-07 12:58:26 -05:00
committed by GitHub
parent da8f0373ba
commit ee409174f1
40 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/locales/en/gear.json
View File

@@ -148,7 +148,7 @@
"weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.", "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
"weaponSpecialSummer2015HealerText": "Wand of the Waves", "weaponSpecialSummer2015HealerText": "Wand of the Waves",
"weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.", "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
"weaponSpecialFall2015RogueText": "Bat-tle Ax", "weaponSpecialFall2015RogueText": "Bat-tle Ax",
"weaponSpecialFall2015RogueNotes": "Fearsome To-Dos cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.", "weaponSpecialFall2015RogueNotes": "Fearsome To-Dos cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.",
"weaponSpecialFall2015WarriorText": "Wooden Plank", "weaponSpecialFall2015WarriorText": "Wooden Plank",
@@ -184,7 +184,7 @@
"weaponSpecialSummer2016MageNotes": "All the power of the seas filters through this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2016 Summer Gear.", "weaponSpecialSummer2016MageNotes": "All the power of the seas filters through this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2016 Summer Gear.",
"weaponSpecialSummer2016HealerText": "Healing Trident", "weaponSpecialSummer2016HealerText": "Healing Trident",
"weaponSpecialSummer2016HealerNotes": "One spike harms, the other heals. Increases Intelligence by <%= int %>. Limited Edition 2016 Summer Gear.", "weaponSpecialSummer2016HealerNotes": "One spike harms, the other heals. Increases Intelligence by <%= int %>. Limited Edition 2016 Summer Gear.",
"weaponMystery201411Text": "Pitchfork of Feasting", "weaponMystery201411Text": "Pitchfork of Feasting",
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.", "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
"weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth", "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -365,7 +365,7 @@
"armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.", "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
"armorSpecialSummer2015HealerText": "Sailor's Armor", "armorSpecialSummer2015HealerText": "Sailor's Armor",
"armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.", "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
"armorSpecialFall2015RogueText": "Bat-tle Armor", "armorSpecialFall2015RogueText": "Bat-tle Armor",
"armorSpecialFall2015RogueNotes": "Fly into bat-tle! Increases Perception by <%= per %>. Limited Edition 2015 Autumn Gear.", "armorSpecialFall2015RogueNotes": "Fly into bat-tle! Increases Perception by <%= per %>. Limited Edition 2015 Autumn Gear.",
"armorSpecialFall2015WarriorText": "Scarecrow Armor", "armorSpecialFall2015WarriorText": "Scarecrow Armor",
@@ -374,7 +374,7 @@
"armorSpecialFall2015MageNotes": "Every stitch in this armor shimmers with enchantment. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", "armorSpecialFall2015MageNotes": "Every stitch in this armor shimmers with enchantment. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.",
"armorSpecialFall2015HealerText": "Potioner Robes", "armorSpecialFall2015HealerText": "Potioner Robes",
"armorSpecialFall2015HealerNotes": "What? Of course that was a potion of constitution. No, you are definitely not turning into a frog! Don't be ribbiticulous. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", "armorSpecialFall2015HealerNotes": "What? Of course that was a potion of constitution. No, you are definitely not turning into a frog! Don't be ribbiticulous. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.",
"armorSpecialWinter2016RogueText": "Cocoa Armor", "armorSpecialWinter2016RogueText": "Cocoa Armor",
"armorSpecialWinter2016RogueNotes": "This leather armor keeps you nice and toasty. Is it actually made from cocoa? You'll never tell. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", "armorSpecialWinter2016RogueNotes": "This leather armor keeps you nice and toasty. Is it actually made from cocoa? You'll never tell. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.",
"armorSpecialWinter2016WarriorText": "Snowman Suit", "armorSpecialWinter2016WarriorText": "Snowman Suit",
@@ -401,7 +401,7 @@
"armorSpecialSummer2016MageNotes": "This slippery garment transforms its wearer into a real Dolphin Mage! Increases Intelligence by <%= int %>. Limited Edition 2016 Summer Gear.", "armorSpecialSummer2016MageNotes": "This slippery garment transforms its wearer into a real Dolphin Mage! Increases Intelligence by <%= int %>. Limited Edition 2016 Summer Gear.",
"armorSpecialSummer2016HealerText": "Seahorse Tail", "armorSpecialSummer2016HealerText": "Seahorse Tail",
"armorSpecialSummer2016HealerNotes": "This spiky garment transforms its wearer into a real Seahorse Healer! Increases Constitution by <%= con %>. Limited Edition 2016 Summer Gear.", "armorSpecialSummer2016HealerNotes": "This spiky garment transforms its wearer into a real Seahorse Healer! Increases Constitution by <%= con %>. Limited Edition 2016 Summer Gear.",
"armorMystery201402Text": "Messenger Robes", "armorMystery201402Text": "Messenger Robes",
"armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.", "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
"armorMystery201403Text": "Forest Walker Armor", "armorMystery201403Text": "Forest Walker Armor",
@@ -845,14 +845,14 @@
"shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.", "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
"shieldSpecialSummer2015HealerText": "Strapping Shield", "shieldSpecialSummer2015HealerText": "Strapping Shield",
"shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.", "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
"shieldSpecialFall2015RogueText": "Bat-tle Ax", "shieldSpecialFall2015RogueText": "Bat-tle Ax",
"shieldSpecialFall2015RogueNotes": "Fearsome To-Dos cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.", "shieldSpecialFall2015RogueNotes": "Fearsome To-Dos cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.",
"shieldSpecialFall2015WarriorText": "Birdseed Bag", "shieldSpecialFall2015WarriorText": "Birdseed Bag",
"shieldSpecialFall2015WarriorNotes": "It's true that you're supposed to be SCARING the crows, but there's nothing wrong with making friends! Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", "shieldSpecialFall2015WarriorNotes": "It's true that you're supposed to be SCARING the crows, but there's nothing wrong with making friends! Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.",
"shieldSpecialFall2015HealerText": "Stirring Stick", "shieldSpecialFall2015HealerText": "Stirring Stick",
"shieldSpecialFall2015HealerNotes": "This stick can stir anything without melting, dissolving, or bursting into flame! It can also be used to fiercely poke enemy tasks. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", "shieldSpecialFall2015HealerNotes": "This stick can stir anything without melting, dissolving, or bursting into flame! It can also be used to fiercely poke enemy tasks. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.",
"shieldSpecialWinter2016RogueText": "Cocoa Mug", "shieldSpecialWinter2016RogueText": "Cocoa Mug",
"shieldSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", "shieldSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.",
"shieldSpecialWinter2016WarriorText": "Sled Shield", "shieldSpecialWinter2016WarriorText": "Sled Shield",
@@ -873,7 +873,7 @@
"shieldSpecialSummer2016WarriorNotes": "Bite those tough tasks with this toothy shield! Increases Constitution by <%= con %>. Limited Edition 2016 Summer Gear.", "shieldSpecialSummer2016WarriorNotes": "Bite those tough tasks with this toothy shield! Increases Constitution by <%= con %>. Limited Edition 2016 Summer Gear.",
"shieldSpecialSummer2016HealerText": "Sea Star Shield", "shieldSpecialSummer2016HealerText": "Sea Star Shield",
"shieldSpecialSummer2016HealerNotes": "Sometimes mistakenly called a Starfish Shield. Increases Constitution by <%= con %>. Limited Edition 2016 Summer Gear.", "shieldSpecialSummer2016HealerNotes": "Sometimes mistakenly called a Starfish Shield. Increases Constitution by <%= con %>. Limited Edition 2016 Summer Gear.",
"shieldMystery201601Text": "Resolution Slayer", "shieldMystery201601Text": "Resolution Slayer",
"shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.", "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
"shieldMystery301405Text": "Clock Shield", "shieldMystery301405Text": "Clock Shield",

14
tasks/gulp-tests.js
View File

@@ -90,7 +90,7 @@ gulp.task('test:sanity', (cb) => {
let runner = exec( let runner = exec(
testBin(SANITY_TEST_COMMAND), testBin(SANITY_TEST_COMMAND),
(err, stdout, stderr) => { (err, stdout, stderr) => {
cb(err); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -100,7 +100,7 @@ gulp.task('test:common', ['test:prepare:build'], (cb) => {
let runner = exec( let runner = exec(
testBin(COMMON_TEST_COMMAND), testBin(COMMON_TEST_COMMAND),
(err, stdout, stderr) => { (err, stdout, stderr) => {
cb(err); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -135,7 +135,7 @@ gulp.task('test:content', ['test:prepare:build'], (cb) => {
testBin(CONTENT_TEST_COMMAND), testBin(CONTENT_TEST_COMMAND),
CONTENT_OPTIONS, CONTENT_OPTIONS,
(err, stdout, stderr) => { (err, stdout, stderr) => {
cb(err); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -170,7 +170,7 @@ gulp.task('test:server_side', ['test:prepare:build'], (cb) => {
let runner = exec( let runner = exec(
testBin(SERVER_SIDE_TEST_COMMAND), testBin(SERVER_SIDE_TEST_COMMAND),
(err, stdout, stderr) => { (err, stdout, stderr) => {
cb(err); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -196,7 +196,7 @@ gulp.task('test:karma', ['test:prepare:build'], (cb) => {
let runner = exec( let runner = exec(
testBin(KARMA_TEST_COMMAND), testBin(KARMA_TEST_COMMAND),
(err, stdout) => { (err, stdout) => {
cb(err); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -206,7 +206,7 @@ gulp.task('test:karma:watch', ['test:prepare:build'], (cb) => {
let runner = exec( let runner = exec(
testBin(`${KARMA_TEST_COMMAND}:watch`), testBin(`${KARMA_TEST_COMMAND}:watch`),
(err, stdout) => { (err, stdout) => {
cb(err); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -334,4 +334,4 @@ gulp.task('test:api-v3', (done) => {
'test:api-v3:integration', 'test:api-v3:integration',
done done
); );
}); });

14
website/client/css/avatar.styl
View File

@@ -36,7 +36,7 @@ future re: pets and whatnot, this is just temporary.
margin: 0 // need this b/c of bootstrap, remove or reset later margin: 0 // need this b/c of bootstrap, remove or reset later
position: relative position: relative
cursor: pointer cursor: pointer
// Username and Level // Username and Level
.avatar-level, .avatar-name .avatar-level, .avatar-name
position: absolute position: absolute
@@ -56,17 +56,17 @@ future re: pets and whatnot, this is just temporary.
left: 4px left: 4px
opacity: 0 // Hide username by default opacity: 0 // Hide username by default
transition: opacity 0.2s ease-out transition: opacity 0.2s ease-out
// Show username if not using mount or background // Show username if not using mount or background
&.isUser.noBackgroundImage:not(.hasMount) &.isUser.noBackgroundImage:not(.hasMount)
.avatar-name .avatar-name
opacity: 1 opacity: 1
// Show username on hover and focus // Show username on hover and focus
&:hover, &:focus &:hover, &:focus
.avatar-name .avatar-name
opacity: 1 opacity: 1
// Sprite positioning – Base styles // Sprite positioning – Base styles
.character-sprites .character-sprites
width: 6.428571429em // 90px width: 6.428571429em // 90px
@@ -75,13 +75,13 @@ future re: pets and whatnot, this is just temporary.
span span
position: absolute position: absolute
padding-top: 2em padding-top: 2em
// Sprite positioning – Position avatar sprite differently if they have a pet or a mount // Sprite positioning – Position avatar sprite differently if they have a pet or a mount
&.hasPet &.hasPet
padding-top: 1.75em padding-top: 1.75em
&.hasMount &.hasMount
padding-top:0em padding-top:0em
// Backgrounds – Set a background color when no background image is set // Backgrounds – Set a background color when no background image is set
&.noBackgroundImage &.noBackgroundImage
background: darken($color-herobox, 8%) background: darken($color-herobox, 8%)

4
website/client/css/challenges.styl
View File

@@ -14,7 +14,7 @@ ul.challenge-accordion-header-specs
margin-right: 5px; margin-right: 5px;
#back-to-challenges, #create-challenge-btn #back-to-challenges, #create-challenge-btn
margin-bottom: 10px margin-bottom: 10px
#challenges-filters h3 #challenges-filters h3
margin-top: 0px; margin-top: 0px;

2
website/client/css/classes.styl
View File

@@ -14,4 +14,4 @@ html.applying-action, html.applying-action *
.cast-target:hover .cast-target:hover
border: 5px solid green !important border: 5px solid green !important
.selected-class .selected-class
background-color: green background-color: green

10
website/client/css/customizer.styl
View File

@@ -2,7 +2,7 @@
.avatar-window .avatar-window
float: right; float: right;
margin: 0 1em 0 0 margin: 0 1em 0 0
menu menu
padding: 0; padding: 0;
@@ -13,7 +13,7 @@ menu
width: 100%; width: 100%;
list-style: none; list-style: none;
padding-bottom: 10px padding-bottom: 10px
menu:before menu:before
content: attr(label); content: attr(label);
display: block; display: block;
@@ -33,7 +33,7 @@ menu
border: 0px solid grey border: 0px solid grey
background-color: hsl(0, 0%, 93%) background-color: hsl(0, 0%, 93%)
margin-bottom: 10px margin-bottom: 10px
-webkit-transition: background-color 0.5s ease-out -webkit-transition: background-color 0.5s ease-out
-moz-transition: background-color 0.5s ease-out -moz-transition: background-color 0.5s ease-out
transition: background-color 0.5s ease-out transition: background-color 0.5s ease-out
@@ -43,10 +43,10 @@ menu
-webkit-transition: none -webkit-transition: none
-moz-transition: none -moz-transition: none
transition: none transition: none
.customize-option:not(:last-of-type) .customize-option:not(:last-of-type)
margin-right: 10px margin-right: 10px
@media (max-width: 480px) { @media (max-width: 480px) {
.avatar-window { .avatar-window {

4
website/client/css/filters.styl
View File

@@ -6,7 +6,7 @@
ul ul
float: left float: left
list-style: none list-style: none
margin-right: 1em margin-right: 1em
.filters-controls .filters-controls
@extend $hrpg-button-bar-with-heading @extend $hrpg-button-bar-with-heading
hrpg-button-bar-mixin($color-options-menu) hrpg-button-bar-mixin($color-options-menu)
@@ -32,7 +32,7 @@
margin-top: -.5em margin-top: -.5em
markdown markdown
display: inline-block display: inline-block
.hrpg-input-group .hrpg-input-group
display: inline-block display: inline-block
margin-right: 0.618em margin-right: 0.618em
@extend $hrpg-button-with-input @extend $hrpg-button-with-input

2
website/client/css/footer.styl
View File

@@ -6,4 +6,4 @@
margin-top: 40px margin-top: 40px
padding-bottom: 20px padding-bottom: 20px
border-top: 1px solid #e5e5e5 border-top: 1px solid #e5e5e5
background-color: #f5f5f5 background-color: #f5f5f5

30
website/client/css/game-pane.styl
View File

@@ -38,10 +38,10 @@
.long-title .tooltip .long-title .tooltip
white-space: normal white-space: normal
span.time span.time
white-space: nowrap white-space: nowrap
.chat-plus-one .chat-plus-one
opacity: 0 opacity: 0
background-color: #eee background-color: #eee
@@ -62,18 +62,18 @@
&.highlight &.highlight
background: #EEE background: #EEE
label label
margin-right:5px margin-right:5px
.float-label .float-label
float:left float:left
position:absolute position:absolute
top:17px; top:17px;
.hidden-label .hidden-label
visibility:hidden visibility:hidden
.scrollable-message .scrollable-message
max-height: 6.472em max-height: 6.472em
overflow-y:auto overflow-y:auto
@@ -82,7 +82,7 @@
// 20px normally // 20px normally
margin-top:5px margin-top:5px
margin-bottom:5px margin-bottom:5px
.expander .expander
float: right float: right
position: absolute position: absolute
@@ -98,11 +98,11 @@
.own-message .own-message
border-left: 4px solid #333 border-left: 4px solid #333
padding-left: 2px padding-left: 2px
markdown markdown
p:first-child p:first-child
display:inline display:inline
img img
max-height:50px max-height:50px
vertical-align:top vertical-align:top
@@ -168,12 +168,12 @@ hrpg-contributor-label-mixin($hrpg-contributor-color)
.buttonList li .buttonList li
margin: 5px margin: 5px
.option-group .option-time .option-group .option-time
padding: 0px 5px padding: 0px 5px
// Autocomplete [TODO] make this nicer // Autocomplete [TODO] make this nicer
.list-at-user .list-at-user
width: 100% width: 100%
max-width: 120px max-width: 120px
position: absolute position: absolute
@@ -182,24 +182,24 @@ hrpg-contributor-label-mixin($hrpg-contributor-color)
z-index: 10 z-index: 10
.list-at-user li .list-at-user li
line-height:14px line-height:14px
border-bottom: 1px solid #a4a4a4 border-bottom: 1px solid #a4a4a4
list-style-type: none list-style-type: none
.list-at-user li:hover .list-at-user li:hover
cursor: pointer cursor: pointer
background: #b9dff4 background: #b9dff4
.list-at-user li span .list-at-user li span
margin: 2px margin: 2px
font-size: 11.844px font-size: 11.844px
margin-left: 5px margin-left: 5px
display: inline-block display: inline-block
.list-cur .list-cur
background: #b9dff4 background: #b9dff4

12
website/client/css/index.styl
View File

@@ -49,7 +49,7 @@ hr
/* Customizations to make footer sticky */ /* Customizations to make footer sticky */
html, body html, body
height: 100% height: 100%
#wrap #wrap
@@ -59,7 +59,7 @@ html, body
height: auto !important height: auto !important
@media (max-width: 600px) @media (max-width: 600px)
#wrap #wrap
margin-top: 0 margin-top: 0
padding: 0 4px; padding: 0 4px;
overflow-x: hidden; overflow-x: hidden;
@@ -67,7 +67,7 @@ html, body
/* Gems /* Gems
-------------------------------------------------- */ -------------------------------------------------- */
/* Adaptation of GH's social-count for Gems */ /* Adaptation of GH's social-count for Gems */
.gem-cost .gem-cost
border: 1px solid #D4D4D4; border: 1px solid #D4D4D4;
font-size: 11px; font-size: 11px;
@@ -79,7 +79,7 @@ html, body
color: #333; color: #333;
background-color: #FAFAFA; background-color: #FAFAFA;
position: relative; position: relative;
.gem-cost::before .gem-cost::before
content: "" content: ""
display: block display: block
@@ -151,9 +151,9 @@ a.label
.muted .muted
color: #999 color: #999
.btn .btn
margin-right: 5px margin-right: 5px
.panel-heading .btn // Fixing improper vertical alignment of buttons in panel headers .panel-heading .btn // Fixing improper vertical alignment of buttons in panel headers
margin-top: -8px margin-top: -8px
.vertical-align .vertical-align

2
website/client/css/inventory.styl
View File

@@ -39,7 +39,7 @@
.stable .static-popover .stable .static-popover
max-width: 550px max-width: 550px
menu.pets div menu.pets div
display: inline-block display: inline-block
vertical-align: top vertical-align: top

4
website/client/css/loading-screen.styl
View File

@@ -61,10 +61,10 @@
animation-delay: -0.20s animation-delay: -0.20s
@keyframes sk-bouncedelay @keyframes sk-bouncedelay
0%, 80%, 100% { 0%, 80%, 100% {
transform: scale(0) transform: scale(0)
opacity: 0 opacity: 0
} 40% { } 40% {
transform: scale(1.0) transform: scale(1.0)
opacity: 1 opacity: 1
} }

2
website/client/css/scrollbars.styl
View File

@@ -79,4 +79,4 @@
} }
.task-column::-webkit-scrollbar-corner { .task-column::-webkit-scrollbar-corner {
background: transparent background: transparent
} }

4
website/client/css/static.styl
View File

@@ -25,7 +25,7 @@ body
.marketing .marketing
text-align: center text-align: center
.static-old-news .static-old-news
h2 h2
font-weight: 700 font-weight: 700
@@ -38,7 +38,7 @@ body
margin-top: 20px margin-top: 20px
.pull-right .pull-right
margin-left: 5px margin-left: 5px
#frontpage-play-button #frontpage-play-button
//box-shadow: 0 0 40px #494141; //box-shadow: 0 0 40px #494141;
display: inline display: inline

4
website/client/js/config.js
View File

@@ -27,12 +27,12 @@ angular.module('habitrpg')
function verifyNewNotifications (response) { function verifyNewNotifications (response) {
// Ignore CRON notifications for manual syncs // Ignore CRON notifications for manual syncs
var isUserLoaded = $rootScope.appLoaded === true; var isUserLoaded = $rootScope.appLoaded === true;
if (response && response.data && response.data.notifications && response.data.notifications.length > 0) { if (response && response.data && response.data.notifications && response.data.notifications.length > 0) {
$rootScope.userNotifications = response.data.notifications.filter(function (notification) { $rootScope.userNotifications = response.data.notifications.filter(function (notification) {
if (isUserLoaded && notification.type === 'CRON') { if (isUserLoaded && notification.type === 'CRON') {
// If the user is already loaded, do not show the notification, syncing will show it // If the user is already loaded, do not show the notification, syncing will show it
// (the user will be synced automatically) // (the user will be synced automatically)
$rootScope.User.readNotification(notification.id); $rootScope.User.readNotification(notification.id);
return false; return false;

2
website/client/js/controllers/authCtrl.js
View File

@@ -30,7 +30,7 @@ angular.module('habitrpg')
} else if (status === 400 && data.errors && _.isArray(data.errors)) { // bad requests } else if (status === 400 && data.errors && _.isArray(data.errors)) { // bad requests
data.errors.forEach(function (err) { data.errors.forEach(function (err) {
$window.alert(err.message); $window.alert(err.message);
}); });
} else if (!!data && !!data.error) { } else if (!!data && !!data.error) {
$window.alert(data.message); $window.alert(data.message);
} else { } else {

2
website/client/js/controllers/headerCtrl.js
View File

@@ -58,7 +58,7 @@ habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User',
} }
) )
if (User.user.party.orderAscending == "descending") { if (User.user.party.orderAscending == "descending") {
result = result.reverse() result = result.reverse()
} }
return result; return result;

2
website/client/js/controllers/sortableInventoryCtrl.js
View File

@@ -18,7 +18,7 @@ habitrpg.controller('SortableInventoryController', ['$scope',
$scope.setGrouping = function (grouping) { $scope.setGrouping = function (grouping) {
$scope.groupingChoice = grouping; $scope.groupingChoice = grouping;
}; };
$scope.orderChoice = 'set'; $scope.orderChoice = 'set';
$scope.setOrder($scope.orderChoice); $scope.setOrder($scope.orderChoice);
}]); }]);

4
website/client/js/env.js
View File

@@ -2,7 +2,7 @@
window.env = window.env || {}; //FIX tests window.env = window.env || {}; //FIX tests
// If Moment.js is loaded, // If Moment.js is loaded,
if(window.moment && window.env.language && window.env.language.momentLang && window.env.language.momentLangCode){ if(window.moment && window.env.language && window.env.language.momentLang && window.env.language.momentLangCode){
var head = document.getElementsByTagName('head')[0]; var head = document.getElementsByTagName('head')[0];
var script = document.createElement('script'); var script = document.createElement('script');
@@ -13,4 +13,4 @@ if(window.moment && window.env.language && window.env.language.momentLang && win
} }
window.habitrpgShared.i18n.strings = window.env.translations; window.habitrpgShared.i18n.strings = window.env.translations;
window.env.t = window.habitrpgShared.i18n.t; window.env.t = window.habitrpgShared.i18n.t;

4
website/client/js/services/pusherService.js
View File

@@ -145,7 +145,7 @@ angular.module('habitrpg')
// when a tab is closed, connect the next one // when a tab is closed, connect the next one
// wait between 100 and 500ms to avoid two tabs connecting at the same time // wait between 100 and 500ms to avoid two tabs connecting at the same time
// window.addEventListener('storage', function(e) { // window.addEventListener('storage', function(e) {
// if (e.key === tabIdKey && e.newValue === null) { // if (e.key === tabIdKey && e.newValue === null) {
// setTimeout(function () { // setTimeout(function () {
// if (!localStorage.getItem(tabIdKey)) { // if (!localStorage.getItem(tabIdKey)) {
@@ -153,7 +153,7 @@ angular.module('habitrpg')
// } // }
// }, Math.floor(Math.random() * 501) + 100); // }, Math.floor(Math.random() * 501) + 100);
// } // }
// }); // });
}); });
return api; return api;

2
website/server/controllers/api-v3/iap.js
View File

@@ -1,4 +1,4 @@
// NOTE: this file is only used because the mobile apps expect IAP routes // NOTE: this file is only used because the mobile apps expect IAP routes
// to be found at /api/v3/iap instead of /iap. // to be found at /api/v3/iap instead of /iap.
module.exports = require('../top-level/payments/iap'); module.exports = require('../top-level/payments/iap');

2
website/server/controllers/top-level/qrcodes.js
View File

@@ -14,4 +14,4 @@ api.redirectProfileQRCode = {
}, },
}; };
module.exports = api; module.exports = api;

2
website/server/libs/inAppPurchases.js
View File

@@ -19,4 +19,4 @@ module.exports = {
getPurchaseData: iap.getPurchaseData, getPurchaseData: iap.getPurchaseData,
GOOGLE: iap.GOOGLE, GOOGLE: iap.GOOGLE,
APPLE: iap.APPLE, APPLE: iap.APPLE,
}; };

2
website/server/libs/password.js
View File

@@ -15,4 +15,4 @@ export function makeSalt (len = 10) {
.randomBytes(Math.ceil(len / 2)) .randomBytes(Math.ceil(len / 2))
.toString('hex') .toString('hex')
.substring(0, len); .substring(0, len);
} }

2
website/server/libs/pusher.js
View File

@@ -39,4 +39,4 @@ let api = {
}, },
}; };
module.exports = api; module.exports = api;

2
website/server/libs/setupMongoose.js
View File

@@ -25,4 +25,4 @@ if (MAINTENANCE_MODE !== 'true') {
}); });
autoinc.init(db); autoinc.init(db);
} }

2
website/server/models/user/methods.js
View File

@@ -51,4 +51,4 @@ schema.methods.addComputedStatsToJSONObj = function addComputedStatsToUserJSONOb
obj.stats.toNextLevel = common.tnl(this.stats.lvl); obj.stats.toNextLevel = common.tnl(this.stats.lvl);
obj.stats.maxHealth = common.maxHealth; obj.stats.maxHealth = common.maxHealth;
obj.stats.maxMP = common.statsComputed(this).maxMP; obj.stats.maxMP = common.statsComputed(this).maxMP;
}; };

4
website/views/avatar-static.jade
View File

@@ -8,13 +8,13 @@ html(ng-app="habitrpg")
meta(name='viewport', content='width=device-width, initial-scale=1.0') meta(name='viewport', content='width=device-width, initial-scale=1.0')
meta(name='apple-mobile-web-app-capable', content='yes') meta(name='apple-mobile-web-app-capable', content='yes')
// .slice(0).push('user') is to clone the array, // .slice(0).push('user') is to clone the array,
// to be surethat `user` is never available to other requests' env // to be surethat `user` is never available to other requests' env
// TODO does it need only `user` in clientVars, not the others? // TODO does it need only `user` in clientVars, not the others?
- -
clientVars = env.clientVars.slice(0); clientVars = env.clientVars.slice(0);
clientVars.push('user'); clientVars.push('user');
script(type='text/javascript'). script(type='text/javascript').
window.env = !{JSON.stringify(env._.pick(env, clientVars))}; window.env = !{JSON.stringify(env._.pick(env, clientVars))};

4
website/views/options/social/quests/bossStats.jade
View File

@@ -10,7 +10,7 @@ else
.meter.health .meter.health
.bar(ng-style='{width: Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp) + "%"}') .bar(ng-style='{width: Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp) + "%"}')
span.meter-text.value span.meter-text.value
| {{Math.ceil(group.quest.progress.hp) | roundLargeNumbers}} | {{Math.ceil(group.quest.progress.hp) | roundLargeNumbers}}
| &nbsp;/ {{::Content.quests[group.quest.key].boss.hp | roundLargeNumbers}} | &nbsp;/ {{::Content.quests[group.quest.key].boss.hp | roundLargeNumbers}}
div(ng-if='Content.quests[group.quest.key].boss.rage') div(ng-if='Content.quests[group.quest.key].boss.rage')
.meter-label(tooltip=env.t('rage')) .meter-label(tooltip=env.t('rage'))
@@ -20,5 +20,5 @@ else
popover-trigger='mouseenter', popover-placement='bottom') popover-trigger='mouseenter', popover-placement='bottom')
.bar(ng-style='{width: Shared.percent(group.quest.progress.rage, Content.quests[group.quest.key].boss.rage.value) + "%"}') .bar(ng-style='{width: Shared.percent(group.quest.progress.rage, Content.quests[group.quest.key].boss.rage.value) + "%"}')
span.meter-text.value span.meter-text.value
| {{Math.ceil(group.quest.progress.rage) | roundLargeNumbers}} | {{Math.ceil(group.quest.progress.rage) | roundLargeNumbers}}
| &nbsp;/ {{::Content.quests[group.quest.key].boss.rage.value | roundLargeNumbers}} | &nbsp;/ {{::Content.quests[group.quest.key].boss.rage.value | roundLargeNumbers}}

2
website/views/options/social/quests/collectionStats.jade
View File

@@ -1,7 +1,7 @@
div(class="quest_{{::group.quest.key}}") div(class="quest_{{::group.quest.key}}")
h4=env.t('collected') + ':' h4=env.t('collected') + ':'
table.table.table-striped table.table.table-striped
tr(ng-repeat='(item,number) in group.quest.progress.collect', tr(ng-repeat='(item,number) in group.quest.progress.collect',
class='quest_collected_{{number >= Content.quests[group.quest.key].collect[item].count}}') class='quest_collected_{{number >= Content.quests[group.quest.key].collect[item].count}}')
td td
.pull-left(class='quest_{{::group.quest.key}}_{{::item}}') .pull-left(class='quest_{{::group.quest.key}}_{{::item}}')

2
website/views/shared/formatting-help.jade
View File

@@ -1,4 +1,4 @@
small.btn-link(ng-init='showHelp = false', ng-click='showHelp = !showHelp') small.btn-link(ng-init='showHelp = false', ng-click='showHelp = !showHelp')
| {{showHelp ? env.t('hideFormattingHelp') : env.t('showFormattingHelp')}} | {{showHelp ? env.t('hideFormattingHelp') : env.t('showFormattingHelp')}}
.slight-vertical-padding(ng-if='showHelp') .slight-vertical-padding(ng-if='showHelp')

2
website/views/shared/modals/amazon-payments.jade
View File

@@ -12,4 +12,4 @@ script(id='modals/amazonPayments.html', type='text/ng-template')
.modal-footer .modal-footer
.btn.btn-default(ng-click='Payments.amazonPayments.reset()')=env.t('cancel') .btn.btn-default(ng-click='Payments.amazonPayments.reset()')=env.t('cancel')
.btn.btn-primary(ng-disabled="!Payments.amazonPayments.canCheckout()", ng-click="Payments.amazonPayments.checkout()")=env.t('checkout') .btn.btn-primary(ng-disabled="!Payments.amazonPayments.canCheckout()", ng-click="Payments.amazonPayments.checkout()")=env.t('checkout')

2
website/views/shared/modals/buy-gems.jade
View File

@@ -45,7 +45,7 @@ script(id='modals/buyGems.html', type='text/ng-template')
.arrow .arrow
.popover-content .popover-content
p=env.t('buyGemsAllow1') p=env.t('buyGemsAllow1')
| &nbsp;{{Shared.planGemLimits.convCap + User.user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}}&nbsp; | &nbsp;{{Shared.planGemLimits.convCap + User.user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}}&nbsp;
=env.t('buyGemsAllow2') =env.t('buyGemsAllow2')
p!=env.t('seeSubscriptionDetails') p!=env.t('seeSubscriptionDetails')
div(ng-if='user.purchased.plan.customerId') div(ng-if='user.purchased.plan.customerId')

4
website/views/shared/modals/quest-rewards.jade
View File

@@ -5,10 +5,10 @@ script(id='partials/options.social.party.quest-rewards.html', type='text/ng-temp
tr(ng-repeat='drop in quest.drop.items') tr(ng-repeat='drop in quest.drop.items')
td {{::drop.text()}} td {{::drop.text()}}
tr(ng-if='::quest.drop.exp > 0') tr(ng-if='::quest.drop.exp > 0')
td {{::quest.drop.exp}} td {{::quest.drop.exp}}
=env.t('experience') =env.t('experience')
tr(ng-if='::quest.drop.gp > 0') tr(ng-if='::quest.drop.gp > 0')
td {{::quest.drop.gp}} td {{::quest.drop.gp}}
=env.t('gold') =env.t('gold')
tr(ng-if='::quest.drop.unlock()') tr(ng-if='::quest.drop.unlock()')
td {{::quest.drop.unlock()}} td {{::quest.drop.unlock()}}

4
website/views/shared/modals/rebirth.jade
View File

@@ -1,6 +1,6 @@
// Created by Sabe on 12/22/13. // Created by Sabe on 12/22/13.
script(type='text/ng-template', id='modals/rebirthEnabled.html') script(type='text/ng-template', id='modals/rebirthEnabled.html')
.modal-header .modal-header
h4=env.t('rebirthNew') h4=env.t('rebirthNew')
.modal-body .modal-body
@@ -39,7 +39,7 @@ script(type='text/ng-template', id='modals/rebirth.html')
p p
span.vertical-align.inline-block.achievement-sun span.vertical-align.inline-block.achievement-sun
|&nbsp; |&nbsp;
=env.t('rebirthEarnAchievement') =env.t('rebirthEarnAchievement')
.modal-footer .modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('neverMind') button.btn.btn-default(ng-click='$close()')=env.t('neverMind')
span(ng-if='user.balance < 2 && user.stats.lvl < 100') span(ng-if='user.balance < 2 && user.stats.lvl < 100')

2
website/views/shared/modals/reroll.jade
View File

@@ -1,5 +1,5 @@
// Re-Roll modal // Re-Roll modal
script(type='text/ng-template', id='modals/reroll.html') script(type='text/ng-template', id='modals/reroll.html')
.modal-header .modal-header
h4=env.t('fortify') h4=env.t('fortify')
.modal-body .modal-body

4
website/views/shared/modals/settings.jade
View File

@@ -1,4 +1,4 @@
script(type='text/ng-template', id='modals/reset.html') script(type='text/ng-template', id='modals/reset.html')
.modal-header .modal-header
h4=env.t('resetAccount') h4=env.t('resetAccount')
.modal-body .modal-body
@@ -57,7 +57,7 @@ script(type='text/ng-template', id='modals/restore.html')
button.btn.btn-default(ng-click='$close()')=env.t('discardChanges') button.btn.btn-default(ng-click='$close()')=env.t('discardChanges')
button.btn.btn-primary(ng-click='restore(); $close();')=env.t('saveAndClose') button.btn.btn-primary(ng-click='restore(); $close();')=env.t('saveAndClose')
script(type='text/ng-template', id='modals/delete.html') script(type='text/ng-template', id='modals/delete.html')
.modal-header .modal-header
h4=env.t('deleteAccount') h4=env.t('deleteAccount')
.modal-body .modal-body

6
website/views/shared/new-stuff.jade
View File

@@ -420,7 +420,7 @@ mixin oldNews
tr tr
td td
h3 Partnership with FocusMe h3 Partnership with FocusMe
p Because the Habitica staff members are big fans of distraction-blocker <a href='http://focusme.com' target='_blank'>FocusMe</a> (and their staff members are big fans of Habitica), we’ve decided to offer <a href='http://focusme.com/habitica-special/' target='_blank'>a joint promotion</a> until Sunday June 19th, where anyone who purchases FocusMe will also be offered a 20% discount on a six-month Habitica subscription! <a href='https://habitica.wordpress.com/2016/06/09/habitica-and-focusme-partnership/' target='_blank'>Learn more here.</a> p Because the Habitica staff members are big fans of distraction-blocker <a href='http://focusme.com' target='_blank'>FocusMe</a> (and their staff members are big fans of Habitica), we’ve decided to offer <a href='http://focusme.com/habitica-special/' target='_blank'>a joint promotion</a> until Sunday June 19th, where anyone who purchases FocusMe will also be offered a 20% discount on a six-month Habitica subscription! <a href='https://habitica.wordpress.com/2016/06/09/habitica-and-focusme-partnership/' target='_blank'>Learn more here.</a>
tr tr
td td
h3 Important Info for Developers h3 Important Info for Developers
@@ -496,7 +496,7 @@ mixin oldNews
tr tr
td td
h3 Important Mobile App Updates h3 Important Mobile App Updates
p We’ve released an <a href='https://geo.itunes.apple.com/us/app/habitica/id994882113?mt=8' target='_blank'>iOS update</a> and an <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica' target='_blank'>Android update</a> that contain the new code. It’s very important to download these updates immediately, or you may encounter significant bugs! p We’ve released an <a href='https://geo.itunes.apple.com/us/app/habitica/id994882113?mt=8' target='_blank'>iOS update</a> and an <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica' target='_blank'>Android update</a> that contain the new code. It’s very important to download these updates immediately, or you may encounter significant bugs!
tr tr
td td
.Pet-Wolf-Veteran.pull-right .Pet-Wolf-Veteran.pull-right
@@ -514,7 +514,7 @@ mixin oldNews
br br
p.strong We expect that on Saturday, May 21st, Habitica will be unavailable between <a href='http://www.worldtimebuddy.com/?pl=1&lid=5368361,100&h=5368361' target='_blank'>1 PM and 10 PM Pacific Time (8 pm - 5 am UTC)</a>. p.strong We expect that on Saturday, May 21st, Habitica will be unavailable between <a href='http://www.worldtimebuddy.com/?pl=1&lid=5368361,100&h=5368361' target='_blank'>1 PM and 10 PM Pacific Time (8 pm - 5 am UTC)</a>.
ul ul
li Don't worry, <strong>you will NOT lose any streaks or take any damage during this weekend, not even from Bosses!</strong> This maintenance will not harm your accounts. li Don't worry, <strong>you will NOT lose any streaks or take any damage during this weekend, not even from Bosses!</strong> This maintenance will not harm your accounts.
li If you will need to see your task list on Saturday, <strong>we recommend taking a screenshot of your tasks before the maintenance begins</strong> so that you can use them as a reference during downtime. li If you will need to see your task list on Saturday, <strong>we recommend taking a screenshot of your tasks before the maintenance begins</strong> so that you can use them as a reference during downtime.
li At the end of the maintenance, to thank people for their patience, <strong>everyone will receive a rare Veteran pet!</strong> li At the end of the maintenance, to thank people for their patience, <strong>everyone will receive a rare Veteran pet!</strong>
li This maintenance should not result in any major visible differences to the site; it's all behind-the-scenes work. However, <strong>at the end of it, we will release new updates to the mobile apps, which will be required in order for the apps to work properly with the new changes!</strong> Be sure to download those updates on Saturday as soon as they are released. li This maintenance should not result in any major visible differences to the site; it's all behind-the-scenes work. However, <strong>at the end of it, we will release new updates to the mobile apps, which will be required in order for the apps to work properly with the new changes!</strong> Be sure to download those updates on Saturday as soon as they are released.

2
website/views/shared/tasks/edit/checklist.jade
View File

@@ -17,7 +17,7 @@
//input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)') //input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)')
//-,ng-blur='saveTask(task,true)') //-,ng-blur='saveTask(task,true)')
span.checklist-icon.glyphicon.glyphicon-resize-vertical span.checklist-icon.glyphicon.glyphicon-resize-vertical
input(type='text', ng-model='item.text', input(type='text', ng-model='item.text',
ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}") ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}")
a(ng-click='removeChecklistItem(task,$event,$index,true)') a(ng-click='removeChecklistItem(task,$event,$index,true)')
span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))

2
website/views/shared/tasks/meta_controls.jade
View File

@@ -53,7 +53,7 @@
| &nbsp; | &nbsp;
// notes // notes
// Make this icon available regardless of task ownership // Make this icon available regardless of task ownership
a.task-notes(ng-show='task.notes && !task._editing', ng-click='task.popoverOpen = !task.popoverOpen', popover-trigger='click', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}') a.task-notes(ng-show='task.notes && !task._editing', ng-click='task.popoverOpen = !task.popoverOpen', popover-trigger='click', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}')
span.glyphicon.glyphicon-comment span.glyphicon.glyphicon-comment
| &nbsp; | &nbsp;