From b70dbda2ab445ae6e75bb98d8479af51d56db7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Mon, 4 May 2015 13:29:48 +0200 Subject: [PATCH] Edit Styles in user profile to fit in languages --- app/partials/includes/modules/admin-menu.jade | 3 --- app/partials/includes/modules/user-settings-menu.jade | 6 ------ app/partials/user/mail-notifications.jade | 2 +- app/partials/user/user-change-password.jade | 2 +- app/partials/user/user-profile.jade | 2 +- app/styles/modules/admin/admin-menu.scss | 2 +- app/styles/modules/user-settings/user-profile.scss | 8 ++++++++ 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/partials/includes/modules/admin-menu.jade b/app/partials/includes/modules/admin-menu.jade index 56eab9f8..7c1524b2 100644 --- a/app/partials/includes/modules/admin-menu.jade +++ b/app/partials/includes/modules/admin-menu.jade @@ -1,7 +1,4 @@ section.admin-menu - header - h1(translate="ADMIN.MENU.TITLE") - nav ul li#adminmenu-project-profile diff --git a/app/partials/includes/modules/user-settings-menu.jade b/app/partials/includes/modules/user-settings-menu.jade index c3e0fe5d..8376f2b2 100644 --- a/app/partials/includes/modules/user-settings-menu.jade +++ b/app/partials/includes/modules/user-settings-menu.jade @@ -1,18 +1,12 @@ section.admin-menu - header - h1(translate="USER_SETTINGS.MENU.SECTION_TITLE") - nav ul li#usersettingsmenu-user-profile a(href="", tg-nav="user-settings-user-profile") span.title(translate="USER_SETTINGS.MENU.USER_PROFILE") - span.icon.icon-arrow-right li#usersettingsmenu-change-password a(href="" tg-nav="user-settings-user-change-password") span.title(translate="USER_SETTINGS.MENU.CHANGE_PASSWORD") - span.icon.icon-arrow-right li#usersettingsmenu-mail-notifications a(href="", tg-nav="user-settings-mail-notifications") span.title(translate="USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS") - span.icon.icon-arrow-right diff --git a/app/partials/user/mail-notifications.jade b/app/partials/user/mail-notifications.jade index c4aa3f9f..f7d6fc83 100644 --- a/app/partials/user/mail-notifications.jade +++ b/app/partials/user/mail-notifications.jade @@ -4,7 +4,7 @@ div.wrapper(tg-user-notifications, ng-controller="UserNotificationsController as ng-init="section='mail-notifications'") nav.menu.hidden(tg-project-menu) - sidebar.menu-secondary.sidebar(tg-user-settings-navigation="mail-notifications") + sidebar.menu-secondary.sidebar.user-profile-nav(tg-user-settings-navigation="mail-notifications") include ../includes/modules/user-settings-menu section.main.admin-common diff --git a/app/partials/user/user-change-password.jade b/app/partials/user/user-change-password.jade index 655b592b..7cb4828c 100644 --- a/app/partials/user/user-change-password.jade +++ b/app/partials/user/user-change-password.jade @@ -3,7 +3,7 @@ doctype html div.wrapper(tg-user-change-password, ng-controller="UserChangePasswordController as ctrl", ng-init="section='user-settings'") nav.menu.hidden(tg-project-menu) - sidebar.menu-secondary.sidebar(tg-user-settings-navigation="change-password") + sidebar.menu-secondary.sidebar.user-profile-nav(tg-user-settings-navigation="change-password") include ../includes/modules/user-settings-menu section.main.user-change-password diff --git a/app/partials/user/user-profile.jade b/app/partials/user/user-profile.jade index 6a4cc03e..4edf1049 100644 --- a/app/partials/user/user-profile.jade +++ b/app/partials/user/user-profile.jade @@ -3,7 +3,7 @@ doctype html div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl", ng-init="section='user-settings'") nav.menu.hidden(tg-project-menu) - sidebar.menu-secondary.sidebar(tg-user-settings-navigation="user-profile") + sidebar.menu-secondary.sidebar.user-profile-nav(tg-user-settings-navigation="user-profile") include ../includes/modules/user-settings-menu section.main.user-profile diff --git a/app/styles/modules/admin/admin-menu.scss b/app/styles/modules/admin/admin-menu.scss index 99b82728..ff60c1c5 100644 --- a/app/styles/modules/admin/admin-menu.scss +++ b/app/styles/modules/admin/admin-menu.scss @@ -2,7 +2,7 @@ li { @extend %larger; @extend %title; - border-bottom: 1px solid $gray-light; + border-bottom: 1px solid darken($whitish, 10%); text-transform: uppercase; &:last-child { border-bottom: 0; diff --git a/app/styles/modules/user-settings/user-profile.scss b/app/styles/modules/user-settings/user-profile.scss index 2deea46a..92334207 100644 --- a/app/styles/modules/user-settings/user-profile.scss +++ b/app/styles/modules/user-settings/user-profile.scss @@ -1,3 +1,11 @@ +.user-profile-nav { + padding: 0; + .active { + background: $white; + color: $fresh-taiga; + } +} + .user-profile { form { max-width: 700px;