diff --git a/app/partials/admin-roles.jade b/app/partials/admin-roles.jade index 214d6218..494200d8 100644 --- a/app/partials/admin-roles.jade +++ b/app/partials/admin-roles.jade @@ -12,9 +12,9 @@ block content include views/modules/admin-submenu-roles section.main.admin-roles - .admin-header + .header-with-actions include views/components/mainTitle - div.delete-button-wrapper + .action-buttons a.button.button-red.delete-role(href="", title="Delete", ng-click="ctrl.delete()") Delete p.total diff --git a/app/partials/wiki.jade b/app/partials/wiki.jade index 99d21270..83a7f39e 100644 --- a/app/partials/wiki.jade +++ b/app/partials/wiki.jade @@ -9,17 +9,17 @@ block content sidebar.menu-secondary.extrabar(tg-check-permission, permission="view_wiki_links") section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks") section.main.wiki - header + .header-with-actions h1 span(tg-bo-bind="project.name") span.green Wiki span.wiki-title(tg-bo-bind='wiki.slug|unslugify') - .action-buttons - a.button.button-red.delete-wiki(tg-check-permission, permission="delete_wiki_page", - href="", title="Delete", ng-click="ctrl.delete()") Delete + .action-buttons + a.button.button-red.delete-wiki(tg-check-permission, permission="delete_wiki_page", + href="", title="Delete", ng-click="ctrl.delete()") Delete - a.button.button-green.edit-wiki(tg-check-permission, permission="modify_wiki_page", - href="", title="Edit", ng-click="ctrl.edit()") Edit + a.button.button-green.edit-wiki(tg-check-permission, permission="modify_wiki_page", + href="", title="Edit", ng-click="ctrl.edit()") Edit include views/modules/wiki-summary diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 5572f090..f0f8ea47 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -108,3 +108,19 @@ body { .hidden { display: none; } + +.header-with-actions { + align-items: center; + display: flex; + justify-content: space-between; + h1 { + span { + white-space: inherit; + } + } + .action-buttons { + flex-shrink: 0; + margin-right: 2rem; + padding-left: 1rem; + } +} diff --git a/app/styles/layout/wiki.scss b/app/styles/layout/wiki.scss index 36409edd..743f82da 100644 --- a/app/styles/layout/wiki.scss +++ b/app/styles/layout/wiki.scss @@ -2,9 +2,6 @@ margin-bottom: 2rem; } .action-buttons { - position: absolute; - right: 2rem; - top: 2rem; .button { color: $white; float: right; diff --git a/app/styles/main.scss b/app/styles/main.scss index 2f9d6d68..5461c6d1 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -107,7 +107,6 @@ $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 deleted file mode 100644 index 9bc36850..00000000 --- a/app/styles/modules/admin/admin-common.scss +++ /dev/null @@ -1,13 +0,0 @@ -.admin-header { - align-items: center; - display: flex; - justify-content: space-between; - h1 { - span { - white-space: inherit; - } - } - .delete-button-wrapper { - flex-shrink: 0; - } -}