taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix #731

stable
Juanfran 2014-08-20 09:49:00 +02:00
parent 517c012c32
commit a4c4ee8b89
6 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/partials/admin-roles.jade
View File

@ -12,9 +12,9 @@ block content
include views/modules/admin-submenu-roles include views/modules/admin-submenu-roles
section.main.admin-roles section.main.admin-roles
.admin-header .header-with-actions
include views/components/mainTitle include views/components/mainTitle
div.delete-button-wrapper .action-buttons
a.button.button-red.delete-role(href="", title="Delete", ng-click="ctrl.delete()") Delete a.button.button-red.delete-role(href="", title="Delete", ng-click="ctrl.delete()") Delete
p.total p.total

2
app/partials/wiki.jade
View File

@ -9,7 +9,7 @@ block content
sidebar.menu-secondary.extrabar(tg-check-permission, permission="view_wiki_links") sidebar.menu-secondary.extrabar(tg-check-permission, permission="view_wiki_links")
section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks") section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks")
section.main.wiki section.main.wiki
header .header-with-actions
h1 h1
span(tg-bo-bind="project.name") span(tg-bo-bind="project.name")
span.green Wiki span.green Wiki

16
app/styles/layout/base.scss
View File

@ -108,3 +108,19 @@ body {
.hidden { .hidden {
display: none; 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;
}
}

3
app/styles/layout/wiki.scss
View File

@ -2,9 +2,6 @@
margin-bottom: 2rem; margin-bottom: 2rem;
} }
.action-buttons { .action-buttons {
position: absolute;
right: 2rem;
top: 2rem;
.button { .button {
color: $white; color: $white;
float: right; float: right;

1
app/styles/main.scss
View File

@ -107,7 +107,6 @@ $prefix-for-spec: true;
@import 'modules/admin/admin-project-profile'; @import 'modules/admin/admin-project-profile';
@import 'modules/admin/default-values'; @import 'modules/admin/default-values';
@import 'modules/admin/project-values'; @import 'modules/admin/project-values';
@import 'modules/admin/admin-common';
//Modules user Settings //Modules user Settings
@import 'modules/user-settings/user-profile'; @import 'modules/user-settings/user-profile';

13
app/styles/modules/admin/admin-common.scss
View File

@ -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;
}
}