From 776c1fe01906d337d3ec132c4ae93a59c5f2b280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 5 May 2015 08:38:01 +0200 Subject: [PATCH] Fix admin and user profile navigation menu --- .../includes/modules/user-settings-menu.jade | 6 +++--- app/partials/project/project-menu.jade | 14 +++++++------- app/styles/components/settings-nav.scss | 1 + app/styles/core/base.scss | 2 +- app/styles/modules/admin/admin-menu.scss | 2 +- app/styles/modules/admin/admin-submenu.scss | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/partials/includes/modules/user-settings-menu.jade b/app/partials/includes/modules/user-settings-menu.jade index 8376f2b2..68afaab3 100644 --- a/app/partials/includes/modules/user-settings-menu.jade +++ b/app/partials/includes/modules/user-settings-menu.jade @@ -2,11 +2,11 @@ section.admin-menu nav ul li#usersettingsmenu-user-profile - a(href="", tg-nav="user-settings-user-profile") + a(href="", tg-nav="user-settings-user-profile", title="{{ 'USER_SETTINGS.MENU.USER_PROFILE' | translate }}") span.title(translate="USER_SETTINGS.MENU.USER_PROFILE") li#usersettingsmenu-change-password - a(href="" tg-nav="user-settings-user-change-password") + a(href="" tg-nav="user-settings-user-change-password", title="{{ 'USER_SETTINGS.MENU.CHANGE_PASSWORD' | translate }}") span.title(translate="USER_SETTINGS.MENU.CHANGE_PASSWORD") li#usersettingsmenu-mail-notifications - a(href="", tg-nav="user-settings-mail-notifications") + a(href="", tg-nav="user-settings-mail-notifications", title="{{ 'USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS' | translate }}") span.title(translate="USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS") diff --git a/app/partials/project/project-menu.jade b/app/partials/project/project-menu.jade index 0c2d2663..d9f341da 100644 --- a/app/partials/project/project-menu.jade +++ b/app/partials/project/project-menu.jade @@ -6,41 +6,41 @@ div(class="menu-container") span.helper(translate="PROJECT.SECTION.SEARCH") <% if (project.is_backlog_activated && project.my_permissions.indexOf("view_us") != -1) { %> li(id="nav-backlog") - a(href="" title="{{'PROJECT.SECTION.BACKLOG' | translate}}" tg-nav="project-backlog:project=project.slug", tabindex="2") + a(href="" title="{{'PROJECT.SECTION.BACKLOG' | translate}}" tg-nav="project-backlog:project=project.slug", tabindex="1") span(class="icon icon-backlog") span.helper(translate="PROJECT.SECTION.BACKLOG") <% } %> <% if (project.is_kanban_activated && project.my_permissions.indexOf("view_us") != -1) { %> li(id="nav-kanban") - a(href="" title="{{'PROJECT.SECTION.KANBAN' | translate}}" tg-nav="project-kanban:project=project.slug", tabindex="3") + a(href="" title="{{'PROJECT.SECTION.KANBAN' | translate}}" tg-nav="project-kanban:project=project.slug", tabindex="1") span(class="icon icon-kanban") span.helper(translate="PROJECT.SECTION.KANBAN") <% } %> <% if (project.is_issues_activated && project.my_permissions.indexOf("view_issues") != -1) { %> li(id="nav-issues") - a(href="" title="{{'PROJECT.SECTION.ISSUES' | translate}}" tg-nav="project-issues:project=project.slug", tabindex="4") + a(href="" title="{{'PROJECT.SECTION.ISSUES' | translate}}" tg-nav="project-issues:project=project.slug", tabindex="1") span(class="icon icon-issues") span.helper(translate="PROJECT.SECTION.ISSUES") <% } %> <% if (project.is_wiki_activated && project.my_permissions.indexOf("view_wiki_pages") != -1) { %> li(id="nav-wiki") - a(href="" title="{{'PROJECT.SECTION.WIKI' | translate}}" tg-nav="project-wiki:project=project.slug", tabindex="5") + a(href="" title="{{'PROJECT.SECTION.WIKI' | translate}}" tg-nav="project-wiki:project=project.slug", tabindex="1") span(class="icon icon-wiki") span.helper(translate="PROJECT.SECTION.WIKI") <% } %> li(id="nav-team") - a(href="" title="{{'PROJECT.SECTION.TEAM' | translate}}" tg-nav="project-team:project=project.slug", tabindex="6") + a(href="" title="{{'PROJECT.SECTION.TEAM' | translate}}" tg-nav="project-team:project=project.slug", tabindex="1") span(class="icon icon-team") span.helper(translate="PROJECT.SECTION.TEAM") <% if (project.videoconferences) { %> li(id="nav-video") - a(href!="<%- project.videoconferenceUrl %>" target="_blank" title="{{'PROJECT.SECTION.MEETUP' | translate}}", tabindex="7") + a(href!="<%- project.videoconferenceUrl %>" target="_blank" title="{{'PROJECT.SECTION.MEETUP' | translate}}", tabindex="1") span(class="icon icon-video") span(translate="PROJECT.SECTION.MEETUP") <% } %> <% if (project.i_am_owner) { %> li(id="nav-admin") - a(href="" tg-nav="project-admin-home:project=project.slug" title="{{'PROJECT.SECTION.ADMIN' | translate}}", tabindex="8") + a(href="" tg-nav="project-admin-home:project=project.slug" title="{{'PROJECT.SECTION.ADMIN' | translate}}", tabindex="1") span(class="icon icon-settings") span.helper(translate="PROJECT.SECTION.ADMIN") <% } %> diff --git a/app/styles/components/settings-nav.scss b/app/styles/components/settings-nav.scss index b7f4767a..afd07554 100644 --- a/app/styles/components/settings-nav.scss +++ b/app/styles/components/settings-nav.scss @@ -1,5 +1,6 @@ .settings-nav { padding: 0; + width: 250px; .active { background: $white; } diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index 5e6758ff..87c80586 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -83,7 +83,7 @@ body { background-color: $dark-taiga; flex: 0 0 auto; min-height: 100vh; - width: 255px; + width: 250px; } .extrabar { diff --git a/app/styles/modules/admin/admin-menu.scss b/app/styles/modules/admin/admin-menu.scss index 98e89234..38e52885 100644 --- a/app/styles/modules/admin/admin-menu.scss +++ b/app/styles/modules/admin/admin-menu.scss @@ -1,6 +1,6 @@ .admin-menu { li { - @extend %larger; + @extend %large; @extend %title; border-bottom: 1px solid darken($whitish, 10%); text-transform: uppercase; diff --git a/app/styles/modules/admin/admin-submenu.scss b/app/styles/modules/admin/admin-submenu.scss index 1a1c5347..d8710a55 100644 --- a/app/styles/modules/admin/admin-submenu.scss +++ b/app/styles/modules/admin/admin-submenu.scss @@ -1,6 +1,6 @@ .admin-submenu { li { - @extend %larger; + @extend %large; @extend %title; border-bottom: 1px solid $gray-light; text-transform: uppercase;