From def83b089a290815fc19d39476732f44373f3abe Mon Sep 17 00:00:00 2001 From: benmanley Date: Fri, 21 Feb 2014 13:28:27 +0000 Subject: [PATCH 01/15] Add custom css to prevent Flying Pig progress bar being hidden --- public/css/inventory.styl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/public/css/inventory.styl b/public/css/inventory.styl index f562e010ac..b1b29bcecf 100644 --- a/public/css/inventory.styl +++ b/public/css/inventory.styl @@ -93,15 +93,18 @@ menu.pets .customize-menu left: 20% height: 5px + //adjust position of flying pig down to leave some room between rows + button[class*="Pet-FlyingPig"] + position: relative + top: 16px + + .progress + bottom: -9px + .pet-button border: none background: none white -//adjust position of flying pig down to leave some room between rows -button[class*="Pet-FlyingPig"] - position: relative - top: 16px - .pet-not-owned width: 81px; height: 99px; From db2ff455516432af15aa367bd5a8b6da897d1431 Mon Sep 17 00:00:00 2001 From: benmanley Date: Mon, 10 Mar 2014 19:06:41 +0000 Subject: [PATCH 02/15] Add custom css to prevent Flying Pig progress bar being hidden --- public/css/inventory.styl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/css/inventory.styl b/public/css/inventory.styl index 08cceeab57..01cbde4704 100644 --- a/public/css/inventory.styl +++ b/public/css/inventory.styl @@ -94,6 +94,14 @@ menu.pets .customize-menu left: 20% height: 5px + //adjust position of flying pig down to leave some room between rows + button[class*="Pet-FlyingPig"] + position: relative + top: 16px + + .progress + bottom: -9px + .pet-button border: none background: none white From eef5e55ad9aa89f0d6c7ec45fa9e99d9e8bd4750 Mon Sep 17 00:00:00 2001 From: benmanley Date: Fri, 14 Mar 2014 23:32:32 +0000 Subject: [PATCH 03/15] Redesign navbar Restyle navigation and improve mobile layout --- public/css/header.styl | 5 +- public/css/index.styl | 14 +-- public/css/menu.styl | 128 ++++++++++++++++++++ public/css/npcs.styl | 3 +- views/shared/header/menu.jade | 222 +++++++++++++++++----------------- 5 files changed, 242 insertions(+), 130 deletions(-) create mode 100644 public/css/menu.styl diff --git a/public/css/header.styl b/public/css/header.styl index 2b1fbf6aab..0ff8d0438b 100644 --- a/public/css/header.styl +++ b/public/css/header.styl @@ -4,7 +4,7 @@ width: 100% // this is for the sticky padding: 0 z-index: 100 - background: #f5f5f5 + background: #c0d0d0 border-bottom: 1px solid rgba(0,0,0,0.2) // margin-top: -1px overflow-y: hidden @@ -110,7 +110,8 @@ display: table-cell vertical-align: middle min-width:175px - + background-color: #c6d6d6 + .meter, .bar box-shadow: none border-radius: 0 diff --git a/public/css/index.styl b/public/css/index.styl index 9fc63b124d..f59db4e621 100644 --- a/public/css/index.styl +++ b/public/css/index.styl @@ -26,6 +26,7 @@ @import "./quests.styl" @import "./shared.styl" @import "./footer.styl" +@import "./menu.styl" html,body,p,h1,ul,li,table,tr,th,td margin: 0 @@ -172,16 +173,3 @@ a.label .white, .white a color: #fff !important - -.collapse-toolbar - position:absolute - right:0px - top:0px - width:30px - height:25px - background-color:#222 - z-index:999 - .glyphicon - color:white - padding-left:7px - padding-top:5px diff --git a/public/css/menu.styl b/public/css/menu.styl new file mode 100644 index 0000000000..9c2cd9b91f --- /dev/null +++ b/public/css/menu.styl @@ -0,0 +1,128 @@ +// Custom styles for the menu aka toolbar aka navbar +.navbar + color: #222 + background-color: #f8f8f8 + border: none; + border-bottom: 1px solid rgba(0,0,0,0.2) + border-radius:0px + margin-bottom:0px + min-height:50px + > div + padding-left:8px + .glyphicon + color:#5d5d5d + .caret + color:#9d9d9d + .task-action-btn + outline: 1px solid red; + font-size:16px + .gem-wallet + padding-top:4px + padding-bottom:8px + height:50px + .Pet_Currency_Gem2x.Gems + position:relative + top:8px + color:#222 !important + .currency + min-height:50px + padding-top:16px + padding-right:16px +// Mobile menu button +.navbar-header + position:absolute + top:0 + right:45px + button + margin-right:0 +.navbar-toggle + &:hover + background-color:#eee + span.icon-bar + background-color:#5d5d5d +// Top level menu items: Tasks – Options +.navbar-menu + float:left; + li + display:inline-block + height:50px + a + display:block + height:100% + margin-left:8px + padding-top:16px + padding-left:8px + padding-right:8px + font-size:16px + line-height:1 + text-decoration:none + &:link,&:visited + color: #222 + &:hover + background-color:#eee + &:active + color:#000 + .toolbar-toggle + .glyphicon + color:#9d9d9d +// Information bar: Bailey – notifs – currency – subscribe button +.navbar-info + float:right + min-height:50px + padding-right:25px + li + display:inline-block +@media screen and (max-device-width:768px), screen and (max-width:768px) + .navbar-menu + float:none + .navbar-submenu + margin-left:0 + > li + display:inline-block + .dropdown-menu + position:absolute + .navbar-info + width:100% +// Button for toggling toolbar visibility +.collapse-toolbar + &.expanded + position:absolute + &.collapsed + position:fixed + right:0px + top:0px + width:45px + height:50px + padding-left:15px + padding-top:15px + z-index:999 + .glyphicon-chevron-up + color:#5d5d5d + .glyphicon-chevron-down + color:#fff +.toolbar-submenu + background-color:#eee + border-top: 1px solid rgba(0,0,0,0.2) + > li + display:inline-block + vertical-align:top + margin-top:16px + margin-left:16px + margin-bottom:8px + line-height:1.618 + ul + list-style:none + li + padding-left:22px + .glyphicon + margin-right:8px + color:#9d9d9d +.toolbar-sync + position:relative + top:-8px + .glyphicon-refresh + color: #222 !important +.glyphicon-chevron-up + transition: all 0.32s linear +.glyphicon-chevron-up.active + transform: rotate(180deg) \ No newline at end of file diff --git a/public/css/npcs.styl b/public/css/npcs.styl index 4f55489d5c..f4b7be0718 100644 --- a/public/css/npcs.styl +++ b/public/css/npcs.styl @@ -6,12 +6,13 @@ .toolbar-bailey-container width:55px + margin-right:8px position:relative .npc_bailey float:left .npc_bailey_head position: absolute - top: 4px + top: -24px height:45px !important cursor: pointer diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 82a00e9d44..90c20ca443 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -1,128 +1,122 @@ -a.collapse-toolbar(popover=env.t('expandToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":false})') +a.collapse-toolbar.collapsed(popover=env.t('expandToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":false})') span.glyphicon.glyphicon-chevron-down - -nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin-bottom:0px;border:0;border-radius:0px',ng-if='!user.preferences.toolbarCollapsed') - - ul.nav.navbar-nav.pull-right +a.collapse-toolbar.expanded(popover=env.t('collapseToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='!user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":true})') + span.glyphicon.glyphicon-chevron-up +nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') + ul.navbar-menu li - a(popover=env.t('collapseToolbar'),popover-placement='left',popover-trigger='mouseenter',,ng-if='!user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":true})') - span.glyphicon.glyphicon-chevron-up.white - - .navbar-header - button.navbar-toggle(type='button', ng-click='isNavbarCollapsed = !isNavbarCollapsed', ng-init='isNavbarCollapsed = true') - span.sr-only Toggle navigation - span.icon-bar - span.icon-bar - span.icon-bar + a(ui-sref='tasks') + span Tasks + li + a(ui-sref='options.profile.avatar') + span Options + li + a.toolbar-toggle(ng-click='isMenuCollapsed = !isMenuCollapsed') + span.glyphicon.glyphicon-chevron-up(ng-class='{active: isMenuCollapsed}') .collapse.navbar-collapse(collapse="isNavbarCollapsed") - ul.nav.navbar-nav - li - a(ui-sref='tasks',popover=env.t('tasks'),popover-placement='right',popover-trigger='mouseenter') - span.glyphicon.glyphicon-check.white - li.dropdown - a.dropdown-toggle(popover=env.t('user'),popover-placement='right',popover-trigger='mouseenter') - span.glyphicon.glyphicon-user.white - span.caret - ul.dropdown-menu - li - a(ui-sref='options.profile.avatar')=env.t('avatar') - li - a(ui-sref='options.profile.stats')=env.t('stats') - li - a(ui-sref='options.profile.profile')=env.t('profile') - li - a(ng-click='logout()') - span.glyphicon.glyphicon-share-alt - |   - =env.t('logout') - li.dropdown - a.dropdown-toggle(popover=env.t('social'),popover-placement='right',popover-trigger='mouseenter') - span.glyphicon.glyphicon-heart.white - span.caret - ul.dropdown-menu - li - a(ui-sref='options.social.tavern')=env.t('tavern') - li - a(ui-sref='options.social.party')=env.t('party') - li - a(ui-sref='options.social.guilds')=env.t('guilds') - li - a(ui-sref='options.social.challenges')=env.t('challenges') - li - a(ui-sref='options.social.hall')=env.t('hall') - li.dropdown - a.dropdown-toggle(popover=env.t('inventory'), popover-placement='right',popover-trigger='mouseenter') - span.glyphicon.glyphicon-gift.white - span.caret - ul.dropdown-menu - li - a(ui-sref='options.inventory.drops')=env.t('market') - li - a(ui-sref='options.inventory.pets')=env.t('pets') - li - a(ui-sref='options.inventory.mounts')=env.t('mounts') - li - a(ui-sref='options.inventory.equipment')=env.t('equipment') - li.dropdown - a.dropdown-toggle(popover=env.t('settings'),popover-placement='right',popover-trigger='mouseenter') - span.glyphicon.glyphicon-wrench.white - span.caret - ul.dropdown-menu - li - a(ui-sref='options.settings.settings')=env.t('site') - li - a(ui-sref='options.settings.api')=env.t('API') - li - a(ui-sref='options.settings.export')=env.t('export') - li - a(ui-sref='options.settings.subscription')=env.t('subscription') - li.dropdown - a.dropdown-toggle(popover=env.t('help'),popover-placement='right',popover-trigger='mouseenter') - span.glyphicon.glyphicon-question-sign.white - span.caret - ul.dropdown-menu - li - a(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank') - span.glyphicon.glyphicon-book - |  - =env.t('FAQ') - li - a(href="https://vimeo.com/57654086", target='_blank') - span.glyphicon.glyphicon-film - |  - =env.t('tutorials') - li - a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='right',popover-trigger='mouseenter') - span.glyphicon.glyphicon-refresh.white - li - a.pull-right.gem-wallet(style='padding-top:8px;padding-bottom:0px;',ng-click='openModal("buyGems",{track:"Gems > Toolbar"})', popover-trigger='mouseenter', popover-title=env.t('gems'), popover=env.t('gemsWhatFor'), popover-placement='bottom',popover-append-to-body='true') - //span.task-action-btn.tile.flush.bright.add-gems-btn ＋ - span.task-action-btn.tile.flush.neutral - .Pet_Currency_Gem2x.Gems - | {{user.balance * 4 | number:0}} - li - button.btn.btn-primary.navbar-btn(ng-if='!user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover-title=env.t('subscriptions'),popover=env.t('subDescription'),popover-append-to-body='true')=env.t('subscribe') - button.btn.btn-default.navbar-btn(ng-if='user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover=env.t('manageSub'),popover-append-to-body='true')=env.t('subscribed') - - li(ng-if='user.flags.newStuff') - div.toolbar-bailey-container - |  - .npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")') - + ul.nav.navbar-info + li.toolbar-bailey-container(ng-if='user.flags.newStuff') + .npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")') // Invitations li(ng-if='user.invitations.party.id') a(ui-sref='options.social.party') - span.glyphicon.glyphicon-user.white(popover=env.t('invitedTo', {name: '{{user.invitations.party.name}}'}),popover-placement='bottom',popover-trigger='mouseenter',popover-append-to-body='true') + span.glyphicon.glyphicon-user(popover=env.t('invitedTo', {name: '{{user.invitations.party.name}}'}),popover-placement='bottom',popover-trigger='mouseenter',popover-append-to-body='true') li(ng-repeat='guild in user.invitations.guilds') a(ui-sref='options.social.guilds') - span.glyphicon.glyphicon-user.white(popover=env.t('invitedTo', {name: '{{guild.name}}'}),popover-placement='bottom',popover-trigger='mouseenter',popover-append-to-body='true') + span.glyphicon.glyphicon-user(popover=env.t('invitedTo', {name: '{{guild.name}}'}),popover-placement='bottom',popover-trigger='mouseenter',popover-append-to-body='true') // Chat notifs li(ng-repeat='(k,v) in user.newMessages', ng-if='v.value') a(ng-click='k==party._id ? $state.go("options.social.party") : $state.go("options.social.guilds.detail",{gid:k})') - span.glyphicon.glyphicon-comment.white(popover=env.t('newMsg', {name: '{{v.name}}'}),popover-placement='bottom',popover-trigger='mouseenter',popover-append-to-body='true') + span.glyphicon.glyphicon-comment(popover=env.t('newMsg', {name: '{{v.name}}'}),popover-placement='bottom',popover-trigger='mouseenter',popover-append-to-body='true') // Mystery Item li(ng-if='user.purchased.plan.mysteryItems.length') a(ng-click='$state.go("options.inventory.drops")') - span.glyphicon.glyphicon-gift.white(popover=env.t('newSubscriberItem'),popover-placement='bottom',popover-trigger='mouseenter',popover-append-to-body='true') - - + span.glyphicon.glyphicon-gift(popover=env.t('newSubscriberItem'),popover-placement='bottom',popover-trigger='mouseenter',popover-append-to-body='true') + li + a.gem-wallet(ng-click='openModal("buyGems",{track:"Gems > Toolbar"})', popover-trigger='mouseenter', popover-title=env.t('gems'), popover=env.t('gemsWhatFor'), popover-placement='bottom',popover-append-to-body='true') + //-span.task-action-btn.tile.flush.bright.add-gems-btn ＋ + span + .Pet_Currency_Gem2x.Gems + | {{user.balance * 4 | number:0}} + li.currency(popover=env.t('gold'), popover-placement='bottom',popover-trigger='mouseenter') + span + .shop_gold + | {{Shared.gold(user.stats.gp)}} + li.currency(popover=env.t('silver'), popover-placement='bottom',popover-trigger='mouseenter') + span + .shop_silver + | {{Shared.silver(user.stats.gp)}} + li + button.btn.btn-primary.navbar-btn(ng-if='!user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover-title=env.t('subscriptions'),popover=env.t('subDescription'),popover-append-to-body='true')=env.t('subscribe') + button.btn.btn-default.navbar-btn(ng-if='user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover=env.t('manageSub'),popover-append-to-body='true')=env.t('subscribed') + ul.nav.toolbar-submenu(ng-if='!isMenuCollapsed') + li + span.glyphicon.glyphicon-user + span=env.t('user') + ul + li + a(ui-sref='options.profile.avatar')=env.t('avatar') + li + a(ui-sref='options.profile.stats')=env.t('stats') + li + a(ui-sref='options.profile.profile')=env.t('profile') + li + a(ng-click='logout()') + //-span.glyphicon.glyphicon-share-alt + //-|   + span=env.t('logout') + li + span.glyphicon.glyphicon-heart + span=env.t('social') + ul + li + a(ui-sref='options.social.tavern')=env.t('tavern') + li + a(ui-sref='options.social.party')=env.t('party') + li + a(ui-sref='options.social.guilds')=env.t('guilds') + li + a(ui-sref='options.social.challenges')=env.t('challenges') + li + a(ui-sref='options.social.hall')=env.t('hall') + li + span.glyphicon.glyphicon-gift + span=env.t('inventory') + ul + li + a(ui-sref='options.inventory.drops')=env.t('market') + li + a(ui-sref='options.inventory.pets')=env.t('pets') + li + a(ui-sref='options.inventory.mounts')=env.t('mounts') + li + a(ui-sref='options.inventory.equipment')=env.t('equipment') + li + span.glyphicon.glyphicon-wrench + span=env.t('settings') + ul + li + a(ui-sref='options.settings.settings')=env.t('site') + li + a(ui-sref='options.settings.api')=env.t('API') + li + a(ui-sref='options.settings.export')=env.t('export') + li + a(ui-sref='options.settings.subscription')=env.t('subscription') + li + span.glyphicon.glyphicon-question-sign + span=env.t('help') + ul + li + a(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank') + //-span.glyphicon.glyphicon-book + //-|  + span=env.t('FAQ') + li + a(href="https://vimeo.com/57654086", target='_blank') + //-span.glyphicon.glyphicon-film + //-|  + span=env.t('tutorials') + li.toolbar-sync + a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='right',popover-trigger='mouseenter') + span.glyphicon.glyphicon-refresh \ No newline at end of file From 0ec5ca48f5bc5780b709f3c5c42bc7bf54dbbd93 Mon Sep 17 00:00:00 2001 From: benmanley Date: Fri, 14 Mar 2014 23:43:18 +0000 Subject: [PATCH 04/15] Remove flying pig custom styles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove styles that haven’t been pulled into habitrpg --- public/css/inventory.styl | 9 --------- 1 file changed, 9 deletions(-) diff --git a/public/css/inventory.styl b/public/css/inventory.styl index 8f83670013..08cceeab57 100644 --- a/public/css/inventory.styl +++ b/public/css/inventory.styl @@ -94,18 +94,9 @@ menu.pets .customize-menu left: 20% height: 5px - //adjust position of flying pig down to leave some room between rows - button[class*="Pet-FlyingPig"] - position: relative - top: 16px - - .progress - bottom: -9px - .pet-button border: none background: none white - .pet-not-owned width: 81px; height: 99px; From c63f4b7c4cdb1a9c89493b399cb4fd89b07c2988 Mon Sep 17 00:00:00 2001 From: benmanley Date: Sat, 15 Mar 2014 08:26:25 +0000 Subject: [PATCH 05/15] Change navbar background-color Correct navbar background-color and remove some redundant styles --- public/css/menu.styl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/public/css/menu.styl b/public/css/menu.styl index 9c2cd9b91f..72ea16c1bd 100644 --- a/public/css/menu.styl +++ b/public/css/menu.styl @@ -1,7 +1,7 @@ // Custom styles for the menu aka toolbar aka navbar .navbar color: #222 - background-color: #f8f8f8 + background-color: #f5f5f5 border: none; border-bottom: 1px solid rgba(0,0,0,0.2) border-radius:0px @@ -75,12 +75,6 @@ @media screen and (max-device-width:768px), screen and (max-width:768px) .navbar-menu float:none - .navbar-submenu - margin-left:0 - > li - display:inline-block - .dropdown-menu - position:absolute .navbar-info width:100% // Button for toggling toolbar visibility From 495e0fe60f355baad857c807c669ec85dc335ec5 Mon Sep 17 00:00:00 2001 From: benmanley Date: Sat, 15 Mar 2014 13:05:31 +0000 Subject: [PATCH 06/15] Change hardcoded text to variable --- views/shared/header/menu.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 90c20ca443..15f725c9da 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -6,10 +6,10 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') ul.navbar-menu li a(ui-sref='tasks') - span Tasks + span=env.t('tasks') li a(ui-sref='options.profile.avatar') - span Options + span=env.t('options') li a.toolbar-toggle(ng-click='isMenuCollapsed = !isMenuCollapsed') span.glyphicon.glyphicon-chevron-up(ng-class='{active: isMenuCollapsed}') From 6ca6bbedecf8182ff5e6b4700b9396f1688d2308 Mon Sep 17 00:00:00 2001 From: benmanley Date: Sat, 15 Mar 2014 18:21:11 +0000 Subject: [PATCH 07/15] Move sync button from submenu into navbar --- public/css/menu.styl | 9 +-------- views/shared/header/menu.jade | 8 ++++---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/public/css/menu.styl b/public/css/menu.styl index 72ea16c1bd..6b013e7328 100644 --- a/public/css/menu.styl +++ b/public/css/menu.styl @@ -90,10 +90,8 @@ padding-left:15px padding-top:15px z-index:999 - .glyphicon-chevron-up + .glyphicon color:#5d5d5d - .glyphicon-chevron-down - color:#fff .toolbar-submenu background-color:#eee border-top: 1px solid rgba(0,0,0,0.2) @@ -111,11 +109,6 @@ .glyphicon margin-right:8px color:#9d9d9d -.toolbar-sync - position:relative - top:-8px - .glyphicon-refresh - color: #222 !important .glyphicon-chevron-up transition: all 0.32s linear .glyphicon-chevron-up.active diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 15f725c9da..3aa6a01916 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -49,6 +49,9 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') li button.btn.btn-primary.navbar-btn(ng-if='!user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover-title=env.t('subscriptions'),popover=env.t('subDescription'),popover-append-to-body='true')=env.t('subscribe') button.btn.btn-default.navbar-btn(ng-if='user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover=env.t('manageSub'),popover-append-to-body='true')=env.t('subscribed') + li.toolbar-sync + a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter') + span.glyphicon.glyphicon-refresh ul.nav.toolbar-submenu(ng-if='!isMenuCollapsed') li span.glyphicon.glyphicon-user @@ -116,7 +119,4 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') a(href="https://vimeo.com/57654086", target='_blank') //-span.glyphicon.glyphicon-film //-|  - span=env.t('tutorials') - li.toolbar-sync - a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='right',popover-trigger='mouseenter') - span.glyphicon.glyphicon-refresh \ No newline at end of file + span=env.t('tutorials') \ No newline at end of file From 543e3695c2b881bc933e17e9e56f9b55611ee8e4 Mon Sep 17 00:00:00 2001 From: benmanley Date: Sun, 16 Mar 2014 23:53:15 +0000 Subject: [PATCH 08/15] Improve navbar layout Make navbar fixed for desktop and static for mobile. --- public/css/header.styl | 9 ++++++--- public/css/menu.styl | 37 ++++++++++++++++++++++++----------- views/shared/header/menu.jade | 10 +++++----- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/public/css/header.styl b/public/css/header.styl index 0ff8d0438b..ae439b6558 100644 --- a/public/css/header.styl +++ b/public/css/header.styl @@ -2,9 +2,11 @@ -------------------- */ .header-wrap width: 100% // this is for the sticky - padding: 0 + padding: 54px 0 0 0 // add padding-top when navbar is fixed + @media screen and (max-width:768px) // remove padding-top when navbar is static + padding: 0 z-index: 100 - background: #c0d0d0 + background-color: darken($color-herobox, 8%) border-bottom: 1px solid rgba(0,0,0,0.2) // margin-top: -1px overflow-y: hidden @@ -110,7 +112,8 @@ display: table-cell vertical-align: middle min-width:175px - background-color: #c6d6d6 + background-color: darken($color-herobox, 4%) + border-right: 1px solid darken($color-herobox, 12%) .meter, .bar box-shadow: none diff --git a/public/css/menu.styl b/public/css/menu.styl index 6b013e7328..d0fa487413 100644 --- a/public/css/menu.styl +++ b/public/css/menu.styl @@ -1,5 +1,9 @@ // Custom styles for the menu aka toolbar aka navbar .navbar + width:100%; + top:0 + left:0 + z-index:998 color: #222 background-color: #f5f5f5 border: none; @@ -65,33 +69,42 @@ .toolbar-toggle .glyphicon color:#9d9d9d + .glyphicon-chevron-up + transition: all 0.32s linear + .glyphicon-chevron-up.active + transform: rotate(180deg) // Information bar: Bailey – notifs – currency – subscribe button .navbar-info float:right min-height:50px - padding-right:25px + // padding-right:25px li display:inline-block -@media screen and (max-device-width:768px), screen and (max-width:768px) +@media screen and (max-width:768px) .navbar-menu float:none .navbar-info width:100% -// Button for toggling toolbar visibility +.toolbar-sync + margin-left:4px + a + padding:8px !important + // Button for toggling toolbar visibility .collapse-toolbar - &.expanded - position:absolute &.collapsed - position:fixed + background-color:#c0d0d0 + position: absolute right:0px top:0px width:45px height:50px padding-left:15px - padding-top:15px + padding-top:16px + background-color: #f5f5f5 z-index:999 .glyphicon color:#5d5d5d +// Navigation submenu .toolbar-submenu background-color:#eee border-top: 1px solid rgba(0,0,0,0.2) @@ -109,7 +122,9 @@ .glyphicon margin-right:8px color:#9d9d9d -.glyphicon-chevron-up - transition: all 0.32s linear -.glyphicon-chevron-up.active - transform: rotate(180deg) \ No newline at end of file +@media screen and (min-width:768px) + .navbar, .collapse-toolbar + position:fixed +@media screen and (max-width:768px) + .navbar-info.inactive + display:none; diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 3aa6a01916..3569cd2053 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -1,7 +1,7 @@ -a.collapse-toolbar.collapsed(popover=env.t('expandToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":false})') - span.glyphicon.glyphicon-chevron-down -a.collapse-toolbar.expanded(popover=env.t('collapseToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='!user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":true})') - span.glyphicon.glyphicon-chevron-up +//-a.collapse-toolbar.collapsed(popover=env.t('expandToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":false})') + //-span.glyphicon.glyphicon-chevron-down +//-a.collapse-toolbar.expanded(popover=env.t('collapseToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='!user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":true})') + //-span.glyphicon.glyphicon-remove nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') ul.navbar-menu li @@ -14,7 +14,7 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') a.toolbar-toggle(ng-click='isMenuCollapsed = !isMenuCollapsed') span.glyphicon.glyphicon-chevron-up(ng-class='{active: isMenuCollapsed}') .collapse.navbar-collapse(collapse="isNavbarCollapsed") - ul.nav.navbar-info + ul.nav.navbar-info(ng-class='{inactive: isMenuCollapsed}') li.toolbar-bailey-container(ng-if='user.flags.newStuff') .npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")') // Invitations From 1fc549e6c156dcb2aec6fc710934ad1bc60c0253 Mon Sep 17 00:00:00 2001 From: benmanley Date: Sun, 16 Mar 2014 23:53:51 +0000 Subject: [PATCH 09/15] Add herobox background colour variables --- public/css/avatar.styl | 9 +++++---- public/css/color-vars.styl | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/public/css/avatar.styl b/public/css/avatar.styl index 5afe496a29..2f08387d30 100644 --- a/public/css/avatar.styl +++ b/public/css/avatar.styl @@ -27,7 +27,7 @@ future re: pets and whatnot, this is just temporary. margin: 0 // need this b/c of bootstrap, remove or reset later position: relative cursor: pointer - background: #f5f5f5 + background: $color-herobox transition: border 0.25s ease-out, background 0.25s ease-out//, padding 0.13s ease-out outline: 1px solid rgba(0,0,0,0.1) // padding: 0 // push down the sprite @@ -53,7 +53,7 @@ future re: pets and whatnot, this is just temporary. .herobox.isUser:not(.hasMount):after opacity: 1 // make it a bit special - background darken($better, 15%) + background darken($color-herobox, 15%) .character-sprites span position: absolute @@ -65,6 +65,7 @@ future re: pets and whatnot, this is just temporary. // if not user's avatar, remove lines for party unity .herobox:not(.isUser) outline: 0 + background-color: darken($color-herobox, 8%) // vertically center avatar sprite depending on if they have a pet .herobox.hasPet @@ -77,7 +78,7 @@ future re: pets and whatnot, this is just temporary. // expose hero info on hover, taking // into account the extra pet space .herobox:hover, .herobox:focus - background: desaturate(lighten($better, 30%), 10%) + background: lighten($color-herobox, 30%) &:after opacity: 1 @@ -92,4 +93,4 @@ future re: pets and whatnot, this is just temporary. position: absolute .herobox.isLeader - background: $better \ No newline at end of file + background: lighten($color-herobox, 10%) \ No newline at end of file diff --git a/public/css/color-vars.styl b/public/css/color-vars.styl index 2b2250be6f..fe84027b98 100644 --- a/public/css/color-vars.styl +++ b/public/css/color-vars.styl @@ -6,4 +6,6 @@ $neutral = rgb(255, 242, 204) $good = rgb(217, 234, 211) $better = rgb(208, 224, 227) $best = rgb(201, 218, 248) -$completed = rgb(217, 217, 217) \ No newline at end of file +$completed = rgb(217, 217, 217) +// avatar background color variables +$color-herobox = desaturate(lighten($better, 16%),32%) From bd792345701a1c3fdc3904f8c3eaa620e7aca59c Mon Sep 17 00:00:00 2001 From: benmanley Date: Mon, 17 Mar 2014 23:42:04 +0000 Subject: [PATCH 10/15] Hide toolbar-submenu until toggled --- public/css/menu.styl | 7 +++++-- views/shared/header/menu.jade | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/public/css/menu.styl b/public/css/menu.styl index d0fa487413..eea4478cdf 100644 --- a/public/css/menu.styl +++ b/public/css/menu.styl @@ -69,9 +69,12 @@ .toolbar-toggle .glyphicon color:#9d9d9d - .glyphicon-chevron-up + .glyphicon-chevron-down + position:relative + top:3px transition: all 0.32s linear - .glyphicon-chevron-up.active + .glyphicon-chevron-down.active + top:0px transform: rotate(180deg) // Information bar: Bailey – notifs – currency – subscribe button .navbar-info diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 3569cd2053..680e08f071 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -11,10 +11,10 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') a(ui-sref='options.profile.avatar') span=env.t('options') li - a.toolbar-toggle(ng-click='isMenuCollapsed = !isMenuCollapsed') - span.glyphicon.glyphicon-chevron-up(ng-class='{active: isMenuCollapsed}') + a.toolbar-toggle(ng-click='isMenuExpanded = !isMenuExpanded') + span.glyphicon.glyphicon-chevron-down(ng-class='{active: isMenuExpanded}') .collapse.navbar-collapse(collapse="isNavbarCollapsed") - ul.nav.navbar-info(ng-class='{inactive: isMenuCollapsed}') + ul.nav.navbar-info(ng-class='{inactive: isMenuExpanded}') li.toolbar-bailey-container(ng-if='user.flags.newStuff') .npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")') // Invitations @@ -52,7 +52,7 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') li.toolbar-sync a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter') span.glyphicon.glyphicon-refresh - ul.nav.toolbar-submenu(ng-if='!isMenuCollapsed') + ul.nav.toolbar-submenu(ng-if='isMenuExpanded') li span.glyphicon.glyphicon-user span=env.t('user') From addb05686b1807685499be80c4e9c56acabafd92 Mon Sep 17 00:00:00 2001 From: benmanley Date: Mon, 17 Mar 2014 23:47:43 +0000 Subject: [PATCH 11/15] Hide .navbar-info on mobile until toggled --- views/shared/header/menu.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 680e08f071..509936d01b 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -14,7 +14,7 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') a.toolbar-toggle(ng-click='isMenuExpanded = !isMenuExpanded') span.glyphicon.glyphicon-chevron-down(ng-class='{active: isMenuExpanded}') .collapse.navbar-collapse(collapse="isNavbarCollapsed") - ul.nav.navbar-info(ng-class='{inactive: isMenuExpanded}') + ul.nav.navbar-info(ng-class='{inactive: !isMenuExpanded}') li.toolbar-bailey-container(ng-if='user.flags.newStuff') .npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")') // Invitations From 055c25fac3c79cb7add9c6f8a8d4ee8b276759e5 Mon Sep 17 00:00:00 2001 From: benmanley Date: Tue, 18 Mar 2014 17:30:57 +0000 Subject: [PATCH 12/15] Remove gold and silver totals from Reward list --- views/shared/tasks/lists.jade | 9 --------- 1 file changed, 9 deletions(-) diff --git a/views/shared/tasks/lists.jade b/views/shared/tasks/lists.jade index ce41f56ea6..c2007e8a5b 100644 --- a/views/shared/tasks/lists.jade +++ b/views/shared/tasks/lists.jade @@ -16,15 +16,6 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template") span.glyphicon.glyphicon-calendar // - // Gold & Gems - span.option-box.pull-right.wallet(bo-if='main && list.type=="reward"') - .money - | {{Shared.gold(user.stats.gp)}} - span.shop_gold(tooltip=env.t('gold')) - .money - | {{Shared.silver(user.stats.gp)}} - span.shop_silver(tooltip=env.t('silver')) - // Header h2.task-column_title {{list.header}} From a5bce9e8b6cba78f2b299585e95e62d0d866d60c Mon Sep 17 00:00:00 2001 From: benmanley Date: Tue, 18 Mar 2014 17:33:14 +0000 Subject: [PATCH 13/15] Close submenu when a navigation link is clicked --- views/shared/header/menu.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 509936d01b..8906bf0dd2 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -11,10 +11,10 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') a(ui-sref='options.profile.avatar') span=env.t('options') li - a.toolbar-toggle(ng-click='isMenuExpanded = !isMenuExpanded') - span.glyphicon.glyphicon-chevron-down(ng-class='{active: isMenuExpanded}') + a.toolbar-toggle(ng-click='user.preferences.menuExpanded = !user.preferences.menuExpanded') + span.glyphicon.glyphicon-chevron-down(ng-class='{active: user.preferences.menuExpanded}') .collapse.navbar-collapse(collapse="isNavbarCollapsed") - ul.nav.navbar-info(ng-class='{inactive: !isMenuExpanded}') + ul.nav.navbar-info(ng-class='{inactive: !user.preferences.menuExpanded}') li.toolbar-bailey-container(ng-if='user.flags.newStuff') .npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")') // Invitations @@ -52,7 +52,7 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') li.toolbar-sync a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter') span.glyphicon.glyphicon-refresh - ul.nav.toolbar-submenu(ng-if='isMenuExpanded') + ul.nav.toolbar-submenu(ng-if='user.preferences.menuExpanded', ng-click='set({"preferences.menuExpanded":false})') li span.glyphicon.glyphicon-user span=env.t('user') From ea650c8acf05bf0d9c7897a11cc275adad1f26ff Mon Sep 17 00:00:00 2001 From: benmanley Date: Tue, 18 Mar 2014 20:14:29 +0000 Subject: [PATCH 14/15] Fix gap at bottom of toolbar and remove unused code --- public/css/menu.styl | 39 ++++++++--------------------------- views/shared/header/menu.jade | 16 +++----------- 2 files changed, 12 insertions(+), 43 deletions(-) diff --git a/public/css/menu.styl b/public/css/menu.styl index eea4478cdf..7076ea4c1b 100644 --- a/public/css/menu.styl +++ b/public/css/menu.styl @@ -10,26 +10,22 @@ border-bottom: 1px solid rgba(0,0,0,0.2) border-radius:0px margin-bottom:0px - min-height:50px + min-height:52px > div padding-left:8px .glyphicon color:#5d5d5d .caret color:#9d9d9d - .task-action-btn - outline: 1px solid red; - font-size:16px .gem-wallet padding-top:4px padding-bottom:8px - height:50px + height:52px .Pet_Currency_Gem2x.Gems position:relative top:8px - color:#222 !important .currency - min-height:50px + min-height:52px padding-top:16px padding-right:16px // Mobile menu button @@ -39,17 +35,12 @@ right:45px button margin-right:0 -.navbar-toggle - &:hover - background-color:#eee - span.icon-bar - background-color:#5d5d5d // Top level menu items: Tasks – Options .navbar-menu float:left; li display:inline-block - height:50px + height:52px a display:block height:100% @@ -79,10 +70,13 @@ // Information bar: Bailey – notifs – currency – subscribe button .navbar-info float:right - min-height:50px + min-height:52px // padding-right:25px li display:inline-block + button + margin-top: 8px + margin-bottom: 8px @media screen and (max-width:768px) .navbar-menu float:none @@ -92,21 +86,6 @@ margin-left:4px a padding:8px !important - // Button for toggling toolbar visibility -.collapse-toolbar - &.collapsed - background-color:#c0d0d0 - position: absolute - right:0px - top:0px - width:45px - height:50px - padding-left:15px - padding-top:16px - background-color: #f5f5f5 - z-index:999 - .glyphicon - color:#5d5d5d // Navigation submenu .toolbar-submenu background-color:#eee @@ -126,7 +105,7 @@ margin-right:8px color:#9d9d9d @media screen and (min-width:768px) - .navbar, .collapse-toolbar + .navbar position:fixed @media screen and (max-width:768px) .navbar-info.inactive diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 8906bf0dd2..389136188c 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -1,8 +1,4 @@ -//-a.collapse-toolbar.collapsed(popover=env.t('expandToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":false})') - //-span.glyphicon.glyphicon-chevron-down -//-a.collapse-toolbar.expanded(popover=env.t('collapseToolbar'),popover-placement='left',popover-trigger='mouseenter',ng-if='!user.preferences.toolbarCollapsed',ng-click='set({"preferences.toolbarCollapsed":true})') - //-span.glyphicon.glyphicon-remove -nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') +nav.navbar(ng-controller='AuthCtrl') ul.navbar-menu li a(ui-sref='tasks') @@ -47,8 +43,8 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') .shop_silver | {{Shared.silver(user.stats.gp)}} li - button.btn.btn-primary.navbar-btn(ng-if='!user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover-title=env.t('subscriptions'),popover=env.t('subDescription'),popover-append-to-body='true')=env.t('subscribe') - button.btn.btn-default.navbar-btn(ng-if='user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover=env.t('manageSub'),popover-append-to-body='true')=env.t('subscribed') + button.btn.btn-primary(ng-if='!user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover-title=env.t('subscriptions'),popover=env.t('subDescription'),popover-append-to-body='true')=env.t('subscribe') + button.btn.btn-default(ng-if='user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover=env.t('manageSub'),popover-append-to-body='true')=env.t('subscribed') li.toolbar-sync a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter') span.glyphicon.glyphicon-refresh @@ -65,8 +61,6 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') a(ui-sref='options.profile.profile')=env.t('profile') li a(ng-click='logout()') - //-span.glyphicon.glyphicon-share-alt - //-|   span=env.t('logout') li span.glyphicon.glyphicon-heart @@ -112,11 +106,7 @@ nav.navbar(ng-controller='AuthCtrl',ng-if='!user.preferences.toolbarCollapsed') ul li a(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank') - //-span.glyphicon.glyphicon-book - //-|  span=env.t('FAQ') li a(href="https://vimeo.com/57654086", target='_blank') - //-span.glyphicon.glyphicon-film - //-|  span=env.t('tutorials') \ No newline at end of file From 3a899cf3a449f934417c080e309917006da88ac1 Mon Sep 17 00:00:00 2001 From: benmanley Date: Wed, 19 Mar 2014 14:31:25 +0000 Subject: [PATCH 15/15] Fix broken logout link in submenu --- views/shared/header/menu.jade | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 389136188c..9b984553cd 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -48,17 +48,17 @@ nav.navbar(ng-controller='AuthCtrl') li.toolbar-sync a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter') span.glyphicon.glyphicon-refresh - ul.nav.toolbar-submenu(ng-if='user.preferences.menuExpanded', ng-click='set({"preferences.menuExpanded":false})') + ul.nav.toolbar-submenu(ng-if='user.preferences.menuExpanded') li span.glyphicon.glyphicon-user span=env.t('user') ul li - a(ui-sref='options.profile.avatar')=env.t('avatar') + a(ui-sref='options.profile.avatar', ng-click='set({"preferences.menuExpanded":false})')=env.t('avatar') li - a(ui-sref='options.profile.stats')=env.t('stats') + a(ui-sref='options.profile.stats', ng-click='set({"preferences.menuExpanded":false})')=env.t('stats') li - a(ui-sref='options.profile.profile')=env.t('profile') + a(ui-sref='options.profile.profile', ng-click='set({"preferences.menuExpanded":false})')=env.t('profile') li a(ng-click='logout()') span=env.t('logout') @@ -67,46 +67,46 @@ nav.navbar(ng-controller='AuthCtrl') span=env.t('social') ul li - a(ui-sref='options.social.tavern')=env.t('tavern') + a(ui-sref='options.social.tavern', ng-click='set({"preferences.menuExpanded":false})')=env.t('tavern') li - a(ui-sref='options.social.party')=env.t('party') + a(ui-sref='options.social.party', ng-click='set({"preferences.menuExpanded":false})')=env.t('party') li - a(ui-sref='options.social.guilds')=env.t('guilds') + a(ui-sref='options.social.guilds', ng-click='set({"preferences.menuExpanded":false})')=env.t('guilds') li - a(ui-sref='options.social.challenges')=env.t('challenges') + a(ui-sref='options.social.challenges', ng-click='set({"preferences.menuExpanded":false})')=env.t('challenges') li - a(ui-sref='options.social.hall')=env.t('hall') + a(ui-sref='options.social.hall', ng-click='set({"preferences.menuExpanded":false})')=env.t('hall') li span.glyphicon.glyphicon-gift span=env.t('inventory') ul li - a(ui-sref='options.inventory.drops')=env.t('market') + a(ui-sref='options.inventory.drops', ng-click='set({"preferences.menuExpanded":false})')=env.t('market') li - a(ui-sref='options.inventory.pets')=env.t('pets') + a(ui-sref='options.inventory.pets', ng-click='set({"preferences.menuExpanded":false})')=env.t('pets') li - a(ui-sref='options.inventory.mounts')=env.t('mounts') + a(ui-sref='options.inventory.mounts', ng-click='set({"preferences.menuExpanded":false})')=env.t('mounts') li - a(ui-sref='options.inventory.equipment')=env.t('equipment') + a(ui-sref='options.inventory.equipment', ng-click='set({"preferences.menuExpanded":false})')=env.t('equipment') li span.glyphicon.glyphicon-wrench span=env.t('settings') ul li - a(ui-sref='options.settings.settings')=env.t('site') + a(ui-sref='options.settings.settings', ng-click='set({"preferences.menuExpanded":false})')=env.t('site') li - a(ui-sref='options.settings.api')=env.t('API') + a(ui-sref='options.settings.api', ng-click='set({"preferences.menuExpanded":false})')=env.t('API') li - a(ui-sref='options.settings.export')=env.t('export') + a(ui-sref='options.settings.export', ng-click='set({"preferences.menuExpanded":false})')=env.t('export') li - a(ui-sref='options.settings.subscription')=env.t('subscription') + a(ui-sref='options.settings.subscription', ng-click='set({"preferences.menuExpanded":false})')=env.t('subscription') li span.glyphicon.glyphicon-question-sign span=env.t('help') ul li - a(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank') + a(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank', ng-click='set({"preferences.menuExpanded":false})') span=env.t('FAQ') li - a(href="https://vimeo.com/57654086", target='_blank') + a(href="https://vimeo.com/57654086", target='_blank', ng-click='set({"preferences.menuExpanded":false})') span=env.t('tutorials') \ No newline at end of file