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

Client Fixes (#9003)

Browse Source 
* fix strings on login and register pages

* back to older styles for placeholder

* scope->scoped

* remove old css
This commit is contained in:
Matteo Pagliazzi
2017-08-31 15:15:17 +02:00
committed by GitHub
parent 395385f3e2
commit 19789eb7ab
16 changed files with 27 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/achievements/death.vue
View File

@@ -22,7 +22,7 @@
h4.text-center(v-html="$t('dyingOftenTips')") h4.text-center(v-html="$t('dyingOftenTips')")
</template> </template>
<style scope> <style scoped>
.info { .info {
height: 220px; height: 220px;
} }

2
website/client/components/achievements/dropsEnabled.vue
View File

@@ -13,7 +13,7 @@
button.btn.btn-primary(@click='close()') {{ $t('close') }} button.btn.btn-primary(@click='close()') {{ $t('close') }}
</template> </template>
<style scope> <style scoped>
.item-drop-icon { .item-drop-icon {
margin: 0 auto; margin: 0 auto;
} }

2
website/client/components/achievements/lowHealth.vue
View File

@@ -26,7 +26,7 @@
button.btn.btn-primary(@click='acknowledgeHealthWarning()') {{ $t('ok') }} button.btn.btn-primary(@click='acknowledgeHealthWarning()') {{ $t('ok') }}
</template> </template>
<style scope> <style scoped>
.hero-stats { .hero-stats {
position: absolute; position: absolute;
margin-left: 9em; margin-left: 9em;

6
website/client/components/achievements/questCompleted.vue
View File

@@ -9,12 +9,6 @@
button.btn.btn-primary(@click='setQuestCompleted()') {{ $t('ok') }} button.btn.btn-primary(@click='setQuestCompleted()') {{ $t('ok') }}
</template> </template>
<style scope>
.dont-despair, .death-penalty {
margin-top: 1.5em;
}
</style>
<script> <script>
import bModal from 'bootstrap-vue/lib/components/modal'; import bModal from 'bootstrap-vue/lib/components/modal';
import quests from 'common/script/content/quests'; import quests from 'common/script/content/quests';

6
website/client/components/achievements/questInvitation.vue
View File

@@ -44,12 +44,6 @@
button.btn.btn-primary(ng-click='questAccept(); $close()') {{ $t('accept') }} button.btn.btn-primary(ng-click='questAccept(); $close()') {{ $t('accept') }}
</template> </template>
<style scope>
.dont-despair, .death-penalty {
margin-top: 1.5em;
}
</style>
<script> <script>
import bModal from 'bootstrap-vue/lib/components/modal'; import bModal from 'bootstrap-vue/lib/components/modal';

6
website/client/components/achievements/rebirth.vue
View File

@@ -12,12 +12,6 @@
achievement-footer achievement-footer
</template> </template>
<style scope>
.dont-despair, .death-penalty {
margin-top: 1.5em;
}
</style>
<script> <script>
import bModal from 'bootstrap-vue/lib/components/modal'; import bModal from 'bootstrap-vue/lib/components/modal';
import achievementFooter from './achievementFooter'; import achievementFooter from './achievementFooter';

2
website/client/components/achievements/rebirthEnabled.vue
View File

@@ -10,7 +10,7 @@
button.btn.btn-primary(@click='close()') {{ $t('close') }} button.btn.btn-primary(@click='close()') {{ $t('close') }}
</template> </template>
<style scope> <style scoped>
.rebirth_orb { .rebirth_orb {
margin: 0 auto; margin: 0 auto;
} }

6
website/client/components/achievements/streak.vue
View File

@@ -15,12 +15,6 @@
achievement-footer achievement-footer
</template> </template>
<style scope>
.dont-despair, .death-penalty {
margin-top: 1.5em;
}
</style>
<script> <script>
import bModal from 'bootstrap-vue/lib/components/modal'; import bModal from 'bootstrap-vue/lib/components/modal';
import achievementFooter from './achievementFooter'; import achievementFooter from './achievementFooter';

2
website/client/components/achievements/testing.vue
View File

@@ -14,7 +14,7 @@
.btn.btn-primary(@click='takeMethere()') {{ $t('guildReminderCTA') }} .btn.btn-primary(@click='takeMethere()') {{ $t('guildReminderCTA') }}
</template> </template>
<style scope> <style scoped>
.scene_guilds { .scene_guilds {
margin: 0 auto; margin: 0 auto;
} }

2
website/client/components/achievements/testingletiant.vue
View File

@@ -15,7 +15,7 @@
.btn.btn-primary(@click='takeMethere()') {{ $t('guildReminderCTA') }} .btn.btn-primary(@click='takeMethere()') {{ $t('guildReminderCTA') }}
</template> </template>
<style scope> <style scoped>
.scene_guilds { .scene_guilds {
margin: 0 auto; margin: 0 auto;
} }

2
website/client/components/achievements/ultimateGear.vue
View File

@@ -30,7 +30,7 @@
achievement-footer achievement-footer
</template> </template>
<style scope> <style scoped>
.shop_armoire { .shop_armoire {
margin: 0 auto; margin: 0 auto;
} }

2
website/client/components/achievements/wonChallenge.vue
View File

@@ -22,7 +22,7 @@
a.tumblr-share-button(data-href='#{env.BASE_URL}/social/won-challenge', data-notes='none') a.tumblr-share-button(data-href='#{env.BASE_URL}/social/won-challenge', data-notes='none')
</template> </template>
<style scope> <style scoped>
.achievement-karaoke-2x { .achievement-karaoke-2x {
margin: 0 auto; margin: 0 auto;
margin-top: 6em; margin-top: 6em;

22
website/client/components/auth/registerLogin.vue
View File

@@ -11,26 +11,26 @@
.svg-icon.habitica-logo(v-html="icons.habiticaIcon") .svg-icon.habitica-logo(v-html="icons.habiticaIcon")
.form-group.row.text-center .form-group.row.text-center
.col-6 .col-6
.btn.btn-secondary.social-button(@click='socialAuth("facebook")', v-once) .btn.btn-secondary.social-button(@click='socialAuth("facebook")')
.svg-icon.social-icon(v-html="icons.facebookIcon") .svg-icon.social-icon(v-html="icons.facebookIcon")
.text {{this.registering ? $t('signUpWithSocial', {social: 'Facebook'}) : $t('loginWithSocial', {social: 'Facebook'})}} .text {{registering ? $t('signUpWithSocial', {social: 'Facebook'}) : $t('loginWithSocial', {social: 'Facebook'})}}
.col-6 .col-6
.btn.btn-secondary.social-button(@click='socialAuth("google")', v-once) .btn.btn-secondary.social-button(@click='socialAuth("google")')
.svg-icon.social-icon(v-html="icons.googleIcon") .svg-icon.social-icon(v-html="icons.googleIcon")
span {{this.registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'})}} span {{registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'})}}
.form-group(v-if='registering') .form-group(v-if='registering')
label(for='usernameInput', v-once) {{$t('username')}} label(for='usernameInput', v-once) {{$t('username')}}
input#usernameInput.form-control(type='text', :placeholder='$t("usernamePlaceholder")', v-model='username') input#usernameInput.form-control(type='text', :placeholder='$t("usernamePlaceholder")', v-model='username')
.form-group(v-if='!registering') .form-group(v-if='!registering')
label(for='usernameInput', v-once) {{$t('emailOrUsername')}} label(for='usernameInput', v-once) {{$t('emailOrUsername')}}
input#usernameInput.form-control(type='text', :placeholder='$t("emailPlaceholder")', v-model='username') input#usernameInput.form-control(type='text', :placeholder='$t("emailOrUsername")', v-model='username')
.form-group(v-if='registering') .form-group(v-if='registering')
label(for='emailInput', v-once) {{$t('email')}} label(for='emailInput', v-once) {{$t('email')}}
input#emailInput.form-control(type='email', :placeholder='$t("emailPlaceholder")', v-model='email') input#emailInput.form-control(type='email', :placeholder='$t("emailPlaceholder")', v-model='email')
.form-group .form-group
label(for='passwordInput', v-once) {{$t('password')}} label(for='passwordInput', v-once) {{$t('password')}}
a.float-right.forgot-password(v-once, v-if='!registering', @click='forgotPassword = true') {{$t('forgotPassword')}} a.float-right.forgot-password(v-once, v-if='!registering', @click='forgotPassword = true') {{$t('forgotPassword')}}
input#passwordInput.form-control(type='password', :placeholder='$t("passwordPlaceholder")', v-model='password') input#passwordInput.form-control(type='password', :placeholder='$t(registering ? "passwordPlaceholder" : "password")', v-model='password')
.form-group(v-if='registering') .form-group(v-if='registering')
label(for='confirmPasswordInput', v-once) {{$t('confirmPassword')}} label(for='confirmPasswordInput', v-once) {{$t('confirmPassword')}}
input#confirmPasswordInput.form-control(type='password', :placeholder='$t("confirmPasswordPlaceholder")', v-model='passwordConfirm') input#confirmPasswordInput.form-control(type='password', :placeholder='$t("confirmPasswordPlaceholder")', v-model='passwordConfirm')
@@ -40,9 +40,9 @@
.btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('login')}} .btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('login')}}
.toggle-links .toggle-links
router-link(:to="{name: 'login'}", v-if='registering', exact) router-link(:to="{name: 'login'}", v-if='registering', exact)
a.toggle-link(v-once) {{ $t('alreadyHaveAccountLogin') }} a.toggle-link(v-once, v-html="$t('alreadyHaveAccountLogin')")
router-link(:to="{name: 'register'}", v-if='!registering', exact) router-link(:to="{name: 'register'}", v-if='!registering', exact)
a.toggle-link(v-once) Don't have an account? Join Habitica! a.toggle-link(v-once, v-html="$t('dontHaveAccountSignup')")
form#forgot-form(v-on:submit.prevent='handleSubmit', @keyup.enter="handleSubmit", v-if='forgotPassword') form#forgot-form(v-on:submit.prevent='handleSubmit', @keyup.enter="handleSubmit", v-if='forgotPassword')
.text-center .text-center
@@ -82,9 +82,6 @@
.form-wrapper { .form-wrapper {
background-color: $purple-200; background-color: $purple-200;
background: $purple-200; /* For browsers that do not support gradients */ background: $purple-200; /* For browsers that do not support gradients */
background: -webkit-linear-gradient(to bottom, #4f2a93, #6133b4); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(to bottom, #4f2a93, #6133b4); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(to bottom, #4f2a93, #6133b4); /* For Firefox 3.6 to 15 */
background: linear-gradient(to bottom, #4f2a93, #6133b4); /* Standard syntax */ background: linear-gradient(to bottom, #4f2a93, #6133b4); /* Standard syntax */
min-height: 100%; min-height: 100%;
} }
@@ -101,6 +98,9 @@
:-moz-placeholder { /* Firefox 18- */ :-moz-placeholder { /* Firefox 18- */
color: $purple-400; color: $purple-400;
} }
::placeholder { // Standard browsers
color: $purple-400;
}
#login-form, #forgot-form { #login-form, #forgot-form {
margin: 0 auto; margin: 0 auto;

2
website/client/components/settings/api.vue
View File

@@ -59,7 +59,7 @@
button.btn.btn-sm.btn-primary(type='submit', @click='addWebhook(newWebhook.url)') {{ $t('add') }} button.btn.btn-sm.btn-primary(type='submit', @click='addWebhook(newWebhook.url)') {{ $t('add') }}
</template> </template>
<style scope> <style scoped>
.section { .section {
margin-top: 2em; margin-top: 2em;
} }

2
website/client/components/settings/site.vue
View File

@@ -187,7 +187,7 @@
popover-trigger='mouseenter', :popover="$t('deleteAccPop')") {{ $t('deleteAccount') }} popover-trigger='mouseenter', :popover="$t('deleteAccPop')") {{ $t('deleteAccount') }}
</template> </template>
<style scope> <style scoped>
.usersettings h5 { .usersettings h5 {
margin-top: 1em; margin-top: 1em;
} }

9
website/common/locales/en/front.json
View File

@@ -38,7 +38,7 @@
"dragonsilverQuote": "I can't tell you how many time and task tracking systems I've tried over the decades... [Habitica] is the only thing I've used that actually helps me get things done rather than just list them.", "dragonsilverQuote": "I can't tell you how many time and task tracking systems I've tried over the decades... [Habitica] is the only thing I've used that actually helps me get things done rather than just list them.",
"dreimQuote": "When I discovered [Habitica] last summer, I had just failed about half of my exams. Thanks to the Dailies... I was able to organize and discipline myself, and I actually passed all my exams with really good grades a month ago.", "dreimQuote": "When I discovered [Habitica] last summer, I had just failed about half of my exams. Thanks to the Dailies... I was able to organize and discipline myself, and I actually passed all my exams with really good grades a month ago.",
"elmiQuote": "Every morning I'm looking forward to getting up so I can earn some gold!", "elmiQuote": "Every morning I'm looking forward to getting up so I can earn some gold!",
"forgotPassword": "Forgot Password", "forgotPassword": "Forgot Password?",
"emailNewPass": "Email a Password Reset Link", "emailNewPass": "Email a Password Reset Link",
"sendLink": "Send Link", "sendLink": "Send Link",
"evagantzQuote": "My very first dentist appointment where the hygienist was actually excited about my flossing habits. Thanks [Habitica]!", "evagantzQuote": "My very first dentist appointment where the hygienist was actually excited about my flossing habits. Thanks [Habitica]!",
@@ -192,8 +192,8 @@
"unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!", "unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!",
"unlockHeadline": "As you stay productive, you unlock new content!", "unlockHeadline": "As you stay productive, you unlock new content!",
"useUUID": "Use UUID / API Token (For Facebook Users)", "useUUID": "Use UUID / API Token (For Facebook Users)",
"username": "Login Name", "username": "Username",
"emailOrUsername": "Email or Login Name", "emailOrUsername": "Email or Username",
"watchVideos": "Watch Videos", "watchVideos": "Watch Videos",
"work": "Work", "work": "Work",
"zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!", "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
@@ -281,5 +281,6 @@
"passwordPlaceholder": "e.g., ******************", "passwordPlaceholder": "e.g., ******************",
"confirmPasswordPlaceholder": "Make sure it's the same password!", "confirmPasswordPlaceholder": "Make sure it's the same password!",
"joinHabitica": "Join Habitica", "joinHabitica": "Join Habitica",
"alreadyHaveAccountLogin": "Already have a Habitica account? Log in" "alreadyHaveAccountLogin": "Already have a Habitica account? <strong>Log in.</strong>",
"dontHaveAccountSignup": "Don’t have a Habitica account? <strong>Sign up.</strong>"
} }