From 25e7f6a6f4e6e0ebbb1128f2ec0adaa610cfe142 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Tue, 19 Aug 2014 14:57:35 +0200 Subject: [PATCH] fix #721 --- app/partials/admin-roles.jade | 6 +++--- app/styles/main.scss | 1 + app/styles/modules/admin/admin-common.scss | 13 +++++++++++++ app/styles/modules/admin/admin-roles.scss | 5 ----- 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 app/styles/modules/admin/admin-common.scss diff --git a/app/partials/admin-roles.jade b/app/partials/admin-roles.jade index 95893ef1..214d6218 100644 --- a/app/partials/admin-roles.jade +++ b/app/partials/admin-roles.jade @@ -12,10 +12,10 @@ block content include views/modules/admin-submenu-roles section.main.admin-roles - header + .admin-header include views/components/mainTitle - - a.button.button-red.delete-role(href="", title="Delete", ng-click="ctrl.delete()") Delete + div.delete-button-wrapper + a.button.button-red.delete-role(href="", title="Delete", ng-click="ctrl.delete()") Delete p.total | {{ role.name }} diff --git a/app/styles/main.scss b/app/styles/main.scss index 5461c6d1..2f9d6d68 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -107,6 +107,7 @@ $prefix-for-spec: true; @import 'modules/admin/admin-project-profile'; @import 'modules/admin/default-values'; @import 'modules/admin/project-values'; +@import 'modules/admin/admin-common'; //Modules user Settings @import 'modules/user-settings/user-profile'; diff --git a/app/styles/modules/admin/admin-common.scss b/app/styles/modules/admin/admin-common.scss new file mode 100644 index 00000000..9bc36850 --- /dev/null +++ b/app/styles/modules/admin/admin-common.scss @@ -0,0 +1,13 @@ +.admin-header { + align-items: center; + display: flex; + justify-content: space-between; + h1 { + span { + white-space: inherit; + } + } + .delete-button-wrapper { + flex-shrink: 0; + } +} diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss index c7210f3b..6a6fe5c8 100644 --- a/app/styles/modules/admin/admin-roles.scss +++ b/app/styles/modules/admin/admin-roles.scss @@ -50,9 +50,4 @@ } } } - .delete-role { - position: absolute; - right: 2rem; - top: 2rem; - } }