Skip to content

N
nexpie-grafana-theme
Commit b93cdf56 by Torkel Ödegaard
Options

Removed double page container

parent c4fa64e6
Showing with 281 additions and 297 deletions
public/app/features/teams/TeamList.tsx
......@@ -86,7 +86,7 @@ export class TeamList extends PureComponent<Props, any> {
const { teams, searchQuery } = this.props;
return (
<div className="page-container page-body">
<>
<div className="page-action-bar">
<div className="gf-form gf-form--grow">
<label className="gf-form--has-input-icon gf-form--grow">
......@@ -122,7 +122,7 @@ export class TeamList extends PureComponent<Props, any> {
<tbody>{teams.map(team => this.renderTeam(team))}</tbody>
</table>
</div>
</div>
</>
);
}
......
public/app/features/teams/TeamPages.tsx
......@@ -84,7 +84,7 @@ export class TeamPages extends PureComponent<Props, State> {
return (
<Page navModel={navModel}>
<Page.Contents isLoading={this.state.isLoading}>
{team && Object.keys(team).length !== 0 && <div className="page-container page-body">{this.renderPage()}</div>}
{team && Object.keys(team).length !== 0 && this.renderPage()}
</Page.Contents>
</Page>
);
......
public/app/features/teams/__snapshots__/TeamList.test.tsx.snap
......@@ -36,320 +36,316 @@ exports[`Render should render teams table 1`] = `
isLoading={false}
>
<div
className="page-container page-body"
className="page-action-bar"
>
<div
className="page-action-bar"
className="gf-form gf-form--grow"
>
<div
className="gf-form gf-form--grow"
<label
className="gf-form--has-input-icon gf-form--grow"
>
<label
className="gf-form--has-input-icon gf-form--grow"
>
<input
className="gf-form-input"
onChange={[Function]}
placeholder="Search teams"
type="text"
value=""
/>
<i
className="gf-form-input-icon fa fa-search"
/>
</label>
</div>
<div
className="page-action-bar__spacer"
/>
<a
className="btn btn-success"
href="org/teams/new"
>
New team
</a>
<input
className="gf-form-input"
onChange={[Function]}
placeholder="Search teams"
type="text"
value=""
/>
<i
className="gf-form-input-icon fa fa-search"
/>
</label>
</div>
<div
className="admin-list-table"
className="page-action-bar__spacer"
/>
<a
className="btn btn-success"
href="org/teams/new"
>
<table
className="filter-table filter-table--hover form-inline"
>
<thead>
<tr>
<th />
<th>
Name
</th>
<th>
Email
</th>
<th>
Members
</th>
<th
style={
Object {
"width": "1%",
}
New team
</a>
</div>
<div
className="admin-list-table"
>
<table
className="filter-table filter-table--hover form-inline"
>
<thead>
<tr>
<th />
<th>
Name
</th>
<th>
Email
</th>
<th>
Members
</th>
<th
style={
Object {
"width": "1%",
}
/>
</tr>
</thead>
<tbody>
<tr
key="1"
}
/>
</tr>
</thead>
<tbody>
<tr
key="1"
>
<td
className="width-4 text-center link-td"
>
<td
className="width-4 text-center link-td"
<a
href="org/teams/edit/1"
>
<a
href="org/teams/edit/1"
>
<img
className="filter-table__avatar"
src="some/url/"
/>
</a>
</td>
<td
className="link-td"
<img
className="filter-table__avatar"
src="some/url/"
/>
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/1"
>
<a
href="org/teams/edit/1"
>
test-1
</a>
</td>
<td
className="link-td"
test-1
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/1"
>
<a
href="org/teams/edit/1"
>
test-1@test.com
</a>
</td>
<td
className="link-td"
test-1@test.com
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/1"
>
<a
href="org/teams/edit/1"
>
1
</a>
</td>
<td
className="text-right"
1
</a>
</td>
<td
className="text-right"
>
<DeleteButton
onConfirm={[Function]}
/>
</td>
</tr>
<tr
key="2"
>
<td
className="width-4 text-center link-td"
>
<a
href="org/teams/edit/2"
>
<DeleteButton
onConfirm={[Function]}
<img
className="filter-table__avatar"
src="some/url/"
/>
</td>
</tr>
<tr
key="2"
</a>
</td>
<td
className="link-td"
>
<td
className="width-4 text-center link-td"
>
<a
href="org/teams/edit/2"
>
<img
className="filter-table__avatar"
src="some/url/"
/>
</a>
</td>
<td
className="link-td"
<a
href="org/teams/edit/2"
>
<a
href="org/teams/edit/2"
>
test-2
</a>
</td>
<td
className="link-td"
test-2
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/2"
>
<a
href="org/teams/edit/2"
>
test-2@test.com
</a>
</td>
<td
className="link-td"
test-2@test.com
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/2"
>
<a
href="org/teams/edit/2"
>
2
</a>
</td>
<td
className="text-right"
2
</a>
</td>
<td
className="text-right"
>
<DeleteButton
onConfirm={[Function]}
/>
</td>
</tr>
<tr
key="3"
>
<td
className="width-4 text-center link-td"
>
<a
href="org/teams/edit/3"
>
<DeleteButton
onConfirm={[Function]}
<img
className="filter-table__avatar"
src="some/url/"
/>
</td>
</tr>
<tr
key="3"
</a>
</td>
<td
className="link-td"
>
<td
className="width-4 text-center link-td"
>
<a
href="org/teams/edit/3"
>
<img
className="filter-table__avatar"
src="some/url/"
/>
</a>
</td>
<td
className="link-td"
<a
href="org/teams/edit/3"
>
<a
href="org/teams/edit/3"
>
test-3
</a>
</td>
<td
className="link-td"
test-3
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/3"
>
<a
href="org/teams/edit/3"
>
test-3@test.com
</a>
</td>
<td
className="link-td"
test-3@test.com
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/3"
>
<a
href="org/teams/edit/3"
>
3
</a>
</td>
<td
className="text-right"
3
</a>
</td>
<td
className="text-right"
>
<DeleteButton
onConfirm={[Function]}
/>
</td>
</tr>
<tr
key="4"
>
<td
className="width-4 text-center link-td"
>
<a
href="org/teams/edit/4"
>
<DeleteButton
onConfirm={[Function]}
<img
className="filter-table__avatar"
src="some/url/"
/>
</td>
</tr>
<tr
key="4"
</a>
</td>
<td
className="link-td"
>
<td
className="width-4 text-center link-td"
<a
href="org/teams/edit/4"
>
<a
href="org/teams/edit/4"
>
<img
className="filter-table__avatar"
src="some/url/"
/>
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/4"
>
test-4
</a>
</td>
<td
className="link-td"
test-4
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/4"
>
<a
href="org/teams/edit/4"
>
test-4@test.com
</a>
</td>
<td
className="link-td"
test-4@test.com
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/4"
>
<a
href="org/teams/edit/4"
>
4
</a>
</td>
<td
className="text-right"
4
</a>
</td>
<td
className="text-right"
>
<DeleteButton
onConfirm={[Function]}
/>
</td>
</tr>
<tr
key="5"
>
<td
className="width-4 text-center link-td"
>
<a
href="org/teams/edit/5"
>
<DeleteButton
onConfirm={[Function]}
<img
className="filter-table__avatar"
src="some/url/"
/>
</td>
</tr>
<tr
key="5"
</a>
</td>
<td
className="link-td"
>
<td
className="width-4 text-center link-td"
>
<a
href="org/teams/edit/5"
>
<img
className="filter-table__avatar"
src="some/url/"
/>
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/5"
>
test-5
</a>
</td>
<td
className="link-td"
<a
href="org/teams/edit/5"
>
<a
href="org/teams/edit/5"
>
test-5@test.com
</a>
</td>
<td
className="link-td"
test-5
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/5"
>
<a
href="org/teams/edit/5"
>
5
</a>
</td>
<td
className="text-right"
test-5@test.com
</a>
</td>
<td
className="link-td"
>
<a
href="org/teams/edit/5"
>
<DeleteButton
onConfirm={[Function]}
/>
</td>
</tr>
</tbody>
</table>
</div>
5
</a>
</td>
<td
className="text-right"
>
<DeleteButton
onConfirm={[Function]}
/>
</td>
</tr>
</tbody>
</table>
</div>
</PageContents>
</Page>
......
public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap
......@@ -17,11 +17,7 @@ exports[`Render should render group sync page 1`] = `
<PageContents
isLoading={true}
>
<div
className="page-container page-body"
>
<Connect(TeamGroupSync) />
</div>
<Connect(TeamGroupSync) />
</PageContents>
</Page>
`;
......@@ -33,13 +29,9 @@ exports[`Render should render member page if team not empty 1`] = `
<PageContents
isLoading={true}
>
<div
className="page-container page-body"
>
<Connect(TeamMembers)
syncEnabled={true}
/>
</div>
<Connect(TeamMembers)
syncEnabled={true}
/>
</PageContents>
</Page>
`;
......@@ -51,11 +43,7 @@ exports[`Render should render settings and preferences page 1`] = `
<PageContents
isLoading={true}
>
<div
className="page-container page-body"
>
<Connect(TeamSettings) />
</div>
<Connect(TeamSettings) />
</PageContents>
</Page>
`;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment