Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Simplify Container title rendering #3680

Merged
merged 3 commits into from
Nov 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions js/src/views/Contract/Events/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import React, { Component, PropTypes } from 'react';

import { Container, ContainerTitle } from '../../../ui';
import { Container } from '../../../ui';

import Event from './Event';
import styles from '../contract.css';
Expand Down Expand Up @@ -48,8 +48,7 @@ export default class Events extends Component {
});

return (
<Container>
<ContainerTitle title='events' />
<Container title='events'>
<table className={ styles.events }>
<tbody>{ list }</tbody>
</table>
Expand Down
5 changes: 2 additions & 3 deletions js/src/views/Contract/Queries/queries.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
import { Card, CardTitle, CardText } from 'material-ui/Card';

import InputQuery from './inputQuery';
import { Container, ContainerTitle, Input, InputAddress } from '../../../ui';
import { Container, Input, InputAddress } from '../../../ui';

import styles from './queries.css';

Expand Down Expand Up @@ -55,8 +55,7 @@ export default class Queries extends Component {
.map((fn) => this.renderInputQuery(fn));

return (
<Container>
<ContainerTitle title='queries' />
<Container title='queries'>
<div className={ styles.methods }>
<div className={ styles.vMethods }>
{ noInputQueries }
Expand Down
5 changes: 2 additions & 3 deletions js/src/views/Settings/Background/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';

import { Button, Container, ContainerTitle, ParityBackground } from '../../../ui';
import { Button, Container, ParityBackground } from '../../../ui';

import { updateBackground } from '../actions';

Expand Down Expand Up @@ -55,8 +55,7 @@ class Background extends Component {

render () {
return (
<Container>
<ContainerTitle title='Background Pattern' />
<Container title='Background Pattern'>
<div className={ layout.layout }>
<div className={ layout.overview }>
<div>The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.</div>
Expand Down
5 changes: 2 additions & 3 deletions js/src/views/Settings/Parity/parity.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import React, { Component, PropTypes } from 'react';
import { MenuItem } from 'material-ui';

import { Select, Container, ContainerTitle } from '../../../ui';
import { Select, Container } from '../../../ui';

import layout from '../layout.css';

Expand All @@ -43,8 +43,7 @@ export default class Parity extends Component {

render () {
return (
<Container>
<ContainerTitle title='Parity' />
<Container title='Parity'>
<div className={ layout.layout }>
<div className={ layout.overview }>
<div>Control the Parity node settings and mode of operation via this interface.</div>
Expand Down
5 changes: 2 additions & 3 deletions js/src/views/Settings/Proxy/proxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import React, { Component, PropTypes } from 'react';

import { Container, ContainerTitle } from '../../../ui';
import { Container } from '../../../ui';

import layout from '../layout.css';
import styles from './proxy.css';
Expand All @@ -31,8 +31,7 @@ export default class Proxy extends Component {
const proxyurl = `${dappsUrl}/proxy/proxy.pac`;

return (
<Container>
<ContainerTitle title='Proxy' />
<Container title='Proxy'>
<div className={ layout.layout }>
<div className={ layout.overview }>
<div>The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.</div>
Expand Down
5 changes: 2 additions & 3 deletions js/src/views/Settings/Views/views.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { Checkbox } from 'material-ui';

import { Container, ContainerTitle } from '../../../ui';
import { Container } from '../../../ui';

import { toggleView } from '../actions';

Expand All @@ -34,8 +34,7 @@ class Views extends Component {

render () {
return (
<Container>
<ContainerTitle title='Views' />
<Container title='Views'>
<div className={ layout.layout }>
<div className={ layout.overview }>
<div>Manage the available application views, using only the parts of the application that is applicable to you.</div>
Expand Down
6 changes: 2 additions & 4 deletions js/src/views/Status/components/Debug/Debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import AvPlay from 'material-ui/svg-icons/av/play-arrow';
import AvReplay from 'material-ui/svg-icons/av/replay';
import ReorderIcon from 'material-ui/svg-icons/action/reorder';

import { Container, ContainerTitle } from '../../../../ui';
import { Container } from '../../../../ui';

import styles from './Debug.css';

Expand All @@ -42,9 +42,7 @@ export default class Debug extends Component {
const { devLogsLevels } = nodeStatus;

return (
<Container>
<ContainerTitle
title='Node Logs' />
<Container title='Node Logs'>
{ this.renderActions() }
<h2 className={ styles.subheader }>
{ devLogsLevels || '-' }
Expand Down