From 7456f00dc6122ad293652b7a32fb4ce671f75241 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 12 Feb 2014 22:17:26 -0700 Subject: [PATCH] feat(toolbar): try with icons instead of text, test against prod / beta & get a vote. --- views/shared/header/menu.jade | 39 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 64aed67d5a..db2bfb1c40 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -17,11 +17,12 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin- .collapse.navbar-collapse(collapse="isNavbarCollapsed") ul.nav.navbar-nav - li(ui-sref='tasks') - a=env.t('tasks') + 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 - | Profile + a.dropdown-toggle(popover='Profile',popover-placement='right',popover-trigger='mouseenter') + span.glyphicon.glyphicon-user.white span.caret ul.dropdown-menu li @@ -30,9 +31,14 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin- a(ui-sref='options.profile.stats') Stats li a(ui-sref='options.profile.profile') Profile + li + a(ng-click='logout()') + span.glyphicon.glyphicon-share-alt + |   + =env.t('logout') li.dropdown - a.dropdown-toggle - | Social + a.dropdown-toggle(popover='Social',popover-placement='right',popover-trigger='mouseenter') + span.glyphicon.glyphicon-heart.white span.caret ul.dropdown-menu li @@ -46,8 +52,8 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin- li a(ui-sref='options.social.hall') Hall li.dropdown - a.dropdown-toggle - | Market + a.dropdown-toggle(popover='Market',popover-placement='right',popover-trigger='mouseenter') + span.glyphicon.glyphicon-gift.white span.caret ul.dropdown-menu li @@ -59,8 +65,8 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin- li a(ui-sref='options.inventory.equipment') Equipment li.dropdown - a.dropdown-toggle - | Settings + a.dropdown-toggle(popover='Settings',popover-placement='right',popover-trigger='mouseenter') + span.glyphicon.glyphicon-wrench.white span.caret ul.dropdown-menu li @@ -71,14 +77,9 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin- a(ui-sref='options.settings.export') Export li a(ui-sref='options.settings.subscription') Subscription - li - a(ng-click='logout()') - span.glyphicon.glyphicon-share-alt - |   - =env.t('logout') li.dropdown - a.dropdown-toggle - | Help + a.dropdown-toggle(popover='Help',popover-placement='right',popover-trigger='mouseenter') + span.glyphicon.glyphicon-question-sign.white span.caret ul.dropdown-menu li @@ -92,7 +93,7 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin- //|   Tutorials is too long to stay in the menu if we add a space =env.t('tutorials') li - a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter') + a(ng-click='User.sync()',popover=env.t('sync'),popover-placement='right',popover-trigger='mouseenter') span.glyphicon.glyphicon-refresh.white //-|   //-=env.t('sync') @@ -114,7 +115,7 @@ nav.navbar.navbar-inverse(ng-controller='AuthCtrl',style='min-height:0px;margin- li(ng-if='user.flags.newStuff') div.toolbar-bailey-container |  - .npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='bottom', popover-placement='bottom', ng-click='openModal("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')