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

fix(misc): some styles & translations

Browse Source
This commit is contained in:
Matteo Pagliazzi
2014-02-14 18:35:21 +01:00
parent e241429cc3
commit 8f19f225f1
6 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gruntfile.js
View File

@@ -4,6 +4,8 @@ module.exports = function(grunt) {
// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
git_changelog: {
minimal: {
options: {
@@ -81,7 +83,11 @@ module.exports = function(grunt) {
}
},
nodemon: { dev: {} },
nodemon: {
dev: {
script: '<%= pkg.main %>'
}
},
watch: {
dev: {

3
bower.json
View File

@@ -43,5 +43,8 @@
},
"devDependencies": {
"angular-mocks": "~1.2.12"
},
"resolutions": {
"angular": ">=1.2.0"
}
}

6
views/options/profile.jade
View File

@@ -3,7 +3,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
.col-md-4
h3=env.t('bodyBody')
small
| 2 <span class="Pet_Currency_Gem1x inline-gems"/> /
| 2 <span class="Pet_Currency_Gem1x inline-gems"></span> /
= ' ' + env.t('locked')
h5=env.t('bodySize')
@@ -27,7 +27,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
.col-md-4
h3=env.t('bodyHead')
small
| 2 <span class="Pet_Currency_Gem1x inline-gems"/> /
| 2 <span class="Pet_Currency_Gem1x inline-gems"></span> /
= ' ' + env.t('locked')
menu(type='list')
// For special events code, see commit dfa27b3
@@ -86,7 +86,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
.col-md-4
h3=env.t('bodySkin')
small
| 2 <span class="Pet_Currency_Gem1x inline-gems"/> /
| 2 <span class="Pet_Currency_Gem1x inline-gems"></span> /
= ' ' + env.t('locked')
// skin
li.customize-menu

2
views/options/social/create-group.jade
View File

@@ -5,7 +5,7 @@
label.control-label(for='new-group-name')
| {{text}}&nbsp;
=env.t('name')
input.form-control#new-group-name.input-medium.option-content(required, type='text', placeholder='{{text}} Name', ng-model='newGroup.name')
input.form-control#new-group-name.input-medium.option-content(required, type='text', placeholder=('{{text}} ' + env.t('name')), ng-model='newGroup.name')
.form-group
label(for='new-group-description')=env.t('description')
textarea.form-control#new-group-description.option-content(cols='3', placeholder=env.t('description'), ng-model='newGroup.description')

1
views/shared/header/avatar.jade
View File

@@ -48,4 +48,5 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(
|&nbsp;
=env.t('lvl')
|&nbsp;{{profile.stats.lvl}}
|&nbsp;
span.glyphicon.glyphicon-plus-sign(ng-show='profile.achievements.rebirths', tooltip=env.t('reborn', {reLevel: "{{profile.achievements.rebirthLevel}}"}))

32
views/shared/header/menu.jade
View File

@@ -26,11 +26,11 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin-
span.caret
ul.dropdown-menu
li
a(ui-sref='options.profile.avatar') Avatar
a(ui-sref='options.profile.avatar')=env.t('avatar')
li
a(ui-sref='options.profile.stats') Stats
a(ui-sref='options.profile.stats')=env.t('stats')
li
a(ui-sref='options.profile.profile') Profile
a(ui-sref='options.profile.profile')=env.t('profile')
li
a(ng-click='logout()')
span.glyphicon.glyphicon-share-alt
@@ -42,41 +42,41 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin-
span.caret
ul.dropdown-menu
li
a(ui-sref='options.social.tavern') Tavern
a(ui-sref='options.social.tavern')=env.t('tavern')
li
a(ui-sref='options.social.party') Party
a(ui-sref='options.social.party')=env.t('party')
li
a(ui-sref='options.social.guilds') Guilds
a(ui-sref='options.social.guilds')=env.t('guilds')
li
a(ui-sref='options.social.challenges') Challenges
a(ui-sref='options.social.challenges')=env.t('challenges')
li
a(ui-sref='options.social.hall') Hall
a(ui-sref='options.social.hall')=env.t('hall')
li.dropdown
a.dropdown-toggle(popover='Inventory',popover-placement='right',popover-trigger='mouseenter')
span.glyphicon.glyphicon-gift.white
span.caret
ul.dropdown-menu
li
a(ui-sref='options.inventory.drops') Market
a(ui-sref='options.inventory.drops')=env.t('market')
li
a(ui-sref='options.inventory.pets') Pets
a(ui-sref='options.inventory.pets')=env.t('mounts')
li
a(ui-sref='options.inventory.mounts') Mounts
a(ui-sref='options.inventory.mounts')=env.t('mounts')
li
a(ui-sref='options.inventory.equipment') Equipment
a(ui-sref='options.inventory.equipment')=env.t('equipment')
li.dropdown
a.dropdown-toggle(popover='Settings',popover-placement='right',popover-trigger='mouseenter')
span.glyphicon.glyphicon-wrench.white
span.caret
ul.dropdown-menu
li
a(ui-sref='options.settings.settings') Site
a(ui-sref='options.settings.settings')=env.t('site')
li
a(ui-sref='options.settings.api') API
a(ui-sref='options.settings.api')=env.t('API')
li
a(ui-sref='options.settings.export') Export
a(ui-sref='options.settings.export')=env.t('export')
li
a(ui-sref='options.settings.subscription') Subscription
a(ui-sref='options.settings.subscription')=env.t('subscription')
li.dropdown
a.dropdown-toggle(popover='Help',popover-placement='right',popover-trigger='mouseenter')
span.glyphicon.glyphicon-question-sign.white