Merge 19b9be2 into f9ca691

HabitRPG · Apr 6, 2017 · a757252 · a757252
2 parents f9ca691 + 19b9be2
commit a757252
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 32 deletions.
diff --git a/website/client-old/css/global-modules.styl b/website/client-old/css/global-modules.styl
@@ -220,6 +220,8 @@ $hrpg-modal-dropdown
   > div
     position: absolute
     top: 2.9em
+    left: auto
+    padding: 0
     min-width:110px
     border-radius:4px
     background-color:#fff

diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade
@@ -1,10 +1,10 @@
 nav.toolbar(ng-controller='MenuCtrl')
   .toolbar-container
     ul.toolbar-mobile-nav
-      li.toolbar-mobile
-        a(data-expand-menu, menu='mobile', ng-class='{active: _expandedMenu.menu === "mobile"}')
+      li.toolbar-mobile(dropdown)
+        a(dropdown-toggle, menu='mobile')
           span.glyphicon.glyphicon-align-justify
-        div(ng-show='_expandedMenu.menu === "mobile"', data-close-menu)
+        div.dropdown-menu
           h4=env.t('menu')
           div
             ul.toolbar-submenu
@@ -80,14 +80,14 @@ nav.toolbar(ng-controller='MenuCtrl')
               a(data-close-menu)=env.t('close')
     ul.toolbar-nav
       li.toolbar-button
-        a(ui-sref='tasks', data-close-menu)
+        a(ui-sref='tasks')
           span=env.t('tasks')
-      li.toolbar-button-dropdown
-        a(ui-sref='options.profile.avatar', data-close-menu)
+      li.toolbar-button-dropdown(dropdown)
+        a(ui-sref='options.profile.avatar')
           span=env.t('user')
-        a(ng-class='{active: _expandedMenu.menu === "avatar"}', data-expand-menu, menu='avatar')
+        a(dropdown-toggle)
           span &#9776;
-        div(ng-show='_expandedMenu.menu === "avatar"', data-close-menu)
+        div.dropdown-menu
           ul.toolbar-submenu
             li
               a(ui-sref='options.profile.avatar')=env.t('avatar')
@@ -99,14 +99,14 @@ nav.toolbar(ng-controller='MenuCtrl')
               a(ui-sref='options.profile.achievements')=env.t('achievs')
             li
               a(ui-sref='options.profile.profile')=env.t('profile')
-      li.toolbar-button-dropdown
+      li.toolbar-button-dropdown(dropdown)
         a(ui-sref='options.social.inbox', ng-if='user.inbox.newMessages')
           span.badge.badge-danger {{user.inbox.newMessages}}
-        a(ui-sref='options.social.tavern', data-close-menu)
+        a(ui-sref='options.social.tavern')
           span=env.t('social')
-        a(ng-class='{active: _expandedMenu.menu === "social"}', data-expand-menu, menu='social')
+        a(dropdown-toggle)
           span &#9776;
-        div(ng-show='_expandedMenu.menu === "social"', data-close-menu)
+        div.dropdown-menu
           ul.toolbar-submenu
             li
               a(ui-sref='options.social.inbox')
@@ -124,12 +124,12 @@ nav.toolbar(ng-controller='MenuCtrl')
               a(ui-sref='options.social.hall.heroes')=env.t('hall')
             li
               a(ui-sref='options.social.groupPlans')=env.t('groupPlansTitle')
-      li.toolbar-button-dropdown
-        a(ui-sref='options.inventory.drops', data-close-menu)
+      li.toolbar-button-dropdown(dropdown)
+        a(ui-sref='options.inventory.drops')
           span=env.t('inventory')
-        a(ng-class='{active: _expandedMenu.menu === "inventory"}' data-expand-menu, menu='inventory')
+        a(dropdown-toggle)
           span  &#9776;
-        div(ng-show='_expandedMenu.menu === "inventory"', data-close-menu)
+        div.dropdown-menu
           ul.toolbar-submenu
             li
               a(ui-sref='options.inventory.drops')=env.t('market')
@@ -145,24 +145,24 @@ nav.toolbar(ng-controller='MenuCtrl')
               a(ui-sref='options.inventory.timetravelers')=env.t('timeTravelers')
             li
               a(ui-sref='options.inventory.seasonalshop')=env.t('seasonalShop')
-      li.toolbar-button-dropdown
-        a(target='_blank' ng-href='http://data.habitrpg.com?uuid={{user._id}}', data-close-menu)
+      li.toolbar-button-dropdown(dropdown)
+        a(target='_blank' ng-href='http://data.habitrpg.com?uuid={{user._id}}')
           span=env.t('data')
-        a(ng-class='{active: _expandedMenu.menu === "data"}', data-expand-menu, menu='data')
+        a(dropdown-toggle)
           span  &#9776;
-        div(ng-show='_expandedMenu.menu === "data"', data-close-menu)
+        div.dropdown-menu
           ul.toolbar-submenu
             li
               a(target='_blank' ng-href='http://data.habitrpg.com?uuid={{user._id}}')=env.t('dataTool')
             li
               a(ui-sref='options.settings.export')=env.t('exportData')
-      li.toolbar-button-dropdown.highlight
+      li.toolbar-button-dropdown.highlight(dropdown)
         a(target='_blank' href='https://habitica.com/static/faq/')
           span.glyphicon.glyphicon-question-sign
           span=env.t('help')
-        a(ng-class='{active: _expandedMenu.menu === "help"}',  data-expand-menu, menu='help')
+        a(dropdown-toggle)
           span  &#9776;
-        div(ng-show='_expandedMenu.menu === "help"', data-close-menu)
+        div.dropdown-menu
           ul.toolbar-submenu
             li
               a(target='_blank' href='https://habitica.com/static/faq/')=env.t('FAQ')
@@ -185,11 +185,11 @@ nav.toolbar(ng-controller='MenuCtrl')
       li.toolbar-quest-detail(ng-if='hasQuestProgress()')
         a(ng-click='$state.go("options.social.party");', popover-placement='bottom',popover-trigger='mouseenter',popover-title='{{getQuestInfo().title}}', popover='{{getQuestInfo().body}}',popover-append-to-body='true')
           span.glyphicon.glyphicon-screenshot
-      li.toolbar-notifs
-        a(data-expand-menu, menu='notifs')
+      li.toolbar-notifs(dropdown)
+        a(dropdown-toggle)
           span.glyphicon(ng-class='iconClasses()')
           span.notification-counter(ng-if='getNotificationsCount()') {{getNotificationsCount()}}
-        div(ng-show='_expandedMenu.menu === "notifs"')
+        div.dropdown-menu
           h4=env.t('notifications')
           div
             ul.toolbar-notifs-notifs
@@ -231,10 +231,10 @@ nav.toolbar(ng-controller='MenuCtrl')
           ul.toolbar-controls
             li.toolbar-controls-button
               a(data-close-menu)=env.t('close')
-      li.toolbar-audio
-        a(data-expand-menu, menu='audio')
+      li.toolbar-audio(dropdown)
+        a(dropdown-toggle)
           span.glyphicon(ng-class="{'glyphicon-volume-off':user.preferences.sound === 'off', 'glyphicon-volume-up':user.preferences.sound!='off'}")
-        div(ng-show='_expandedMenu.menu === "audio"',style='min-width:150px', data-close-menu)
+        div.dropdown-menu(style='min-width:150px')
           h4=env.t('audioTheme')
           div
             ul.toolbar-submenu
@@ -249,10 +249,10 @@ nav.toolbar(ng-controller='MenuCtrl')
       li.toolbar-sync
         a(ng-click='User.sync()', popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter')
           span.glyphicon.glyphicon-refresh
-      li.toolbar-settings
-        a(data-expand-menu, menu='settings')
+      li.toolbar-settings(dropdown)
+        a(dropdown-toggle)
           span.glyphicon.glyphicon-cog
-        div(ng-show='_expandedMenu.menu === "settings"', data-close-menu)
+        div.dropdown-menu
           h4=env.t('settings')
           div
             ul.toolbar-submenu