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

New Client: english translations and misc fixes (#8410)

Browse Source 
* misc fixes and add english translations

* add tests
This commit is contained in:
Matteo Pagliazzi
2017-01-14 21:12:11 +01:00
committed by GitHub
parent f888e80b01
commit d8128cc3db
7 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
website/client/components/appMenu.vue
View File

@@ -3,29 +3,29 @@
#app-menu.ui.top.fixed.menu
.header.item
img(src="~assets/header/png/logo@3x.png")
router-link.item(to="/", exact) Tasks
router-link.item(to="/", exact) {{ $t('tasks') }}
// .simple makes it possible to have a dropdown without JS
.ui.simple.dropdown
router-link.item(to="/inventory", :class="{'router-link-active': $route.path.startsWith('/inventory')}") Inventory
router-link.item(to="/inventory", :class="{'active': $route.path.startsWith('/inventory')}") {{ $t('inventory') }}
.menu
router-link.item(to="/inventory") Inventory
router-link.item(to="/inventory/stable") Stable
router-link.item(to="/inventory/equipment") Equipment
router-link.item(to="/market") Market
router-link.item(to="/inventory") {{ $t('inventory') }}
router-link.item(to="/inventory/stable") {{ $t('stable') }}
router-link.item(to="/inventory/equipment") {{ $t('equipment') }}
router-link.item(to="/market") {{ $t('market') }}
.ui.simple.dropdown
router-link.item(to="/social/tavern", :class="{'router-link-active': $route.path.startsWith('/social')}") Social
router-link.item(to="/social/tavern", :class="{'active': $route.path.startsWith('/social')}") {{ $t('social') }}
.menu
router-link.item(to="/social/tavern") Tavern
router-link.item(to="/social/inbox") Inbox
router-link.item(to="/social/challenges") Challenges
router-link.item(to="/social/party") Party
router-link.item(to="/social/guilds") Guilds
router-link.item(to="/social/tavern") {{ $t('tavern') }}
router-link.item(to="/social/inbox") {{ $t('inbox') }}
router-link.item(to="/social/challenges") {{ $t('challenges') }}
router-link.item(to="/social/party") {{ $t('party') }}
router-link.item(to="/social/guilds") {{ $t('guilds') }}
.ui.simple.dropdown
router-link.item(to="/help", :class="{'router-link-active': $route.path.startsWith('/help')}") Help
router-link.item(to="/help", :class="{'active': $route.path.startsWith('/help')}") {{ $t('help') }}
.menu
router-link.item(to="/help/faq") Faq
router-link.item(to="/help/report-bug") Report a bug
router-link.item(to="/help/request-feature") Request a feature
router-link.item(to="/help/faq") {{ $t('faq') }}
router-link.item(to="/help/report-bug") {{ $t('reportBug') }}
router-link.item(to="/help/request-feature") {{ $t('requestAF') }}
.right.menu
.item.with-img
img(src="~assets/header/png/gem@3x.png")
@@ -106,7 +106,7 @@
margin-left: 10px;
}
.ui.menu .right.menu .ui.simple.dropdown > .item::before {
#app-menu .ui.menu .right.menu .ui.simple.dropdown > .item::before {
right: auto;
left: 0;
}
@@ -127,13 +127,17 @@
background-color: #6133b4;
}
#app-menu > .item.router-link-active, #app-menu > .dropdown > .item.router-link-active {
#app-menu > .item.active, #app-menu > .dropdown > .item.active {
box-shadow: 0px -4px 0px #6133b4 inset;
}
#app-menu > .dropdown > .item.active {
// font-weight: normal;
}
#app-menu > .dropdown > .menu {
border: none;
background-color:rgba(0, 0, 0, 0.5); // transparent
background-color: rgba(0, 0, 0, 0.5); // transparent
}
#app-menu > .dropdown > .menu > .item:last-child {
@@ -148,6 +152,10 @@
padding: 6px 0px 6px 20px !important;
}
#app-menu > .dropdown .menu > .item.active {
font-weight: normal !important;
}
#app-menu > .dropdown .menu > .item:hover {
background: #4f2a93 !important; /* to override Semantic UI's !important */
}