Keep title and buttons consistent (#897)

* consitency * some more * link and some more inconsistencies Co-authored-by: Nikhil Ranjan <niklabh811@gmail.com>
paritytech · Jun 16, 2020 · 003a528 · 003a528
1 parent 9d6e035
commit 003a528
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 44 deletions.
diff --git a/front-end/src/components/DefaultAddressInfoBox.tsx b/front-end/src/components/DefaultAddressInfoBox.tsx
@@ -12,7 +12,7 @@ const DefaultAddressInfoBox = () => {
 			className='default-address-infobox'
 			dismissable={true}
 			name='defaultAddress'
-			title='Default Address is here!'
+			title='Default address is here!'
 		>
 			<p><Link to='/settings'>Visit your settings</Link> to set a default address and let other users see your on-chain identity.</p>
 			<p>If you don&apos;t have any on-chain identity yet,&nbsp;

diff --git a/front-end/src/components/Footer/index.tsx b/front-end/src/components/Footer/index.tsx
@@ -21,17 +21,17 @@ const Footer = ({ className }:Props ): JSX.Element => {
 					&copy; {moment.utc().year()} Parity Technologies
 				</Menu.Item>
 				<Menu.Item as={Link} to="/terms-and-conditions">
-					Terms &amp; Conditions
+					Terms &amp; conditions
 				</Menu.Item>
 				<Menu.Item as={Link} to="/terms-of-website">
-					Terms of Website
+					Terms of website
 				</Menu.Item>
 				<Menu.Item as={Link} to="/privacy">
-					Privacy Policy
+					Privacy policy
 				</Menu.Item>
 				<Menu.Item>
 					<a href='https://github.com/paritytech/polkassembly/issues' target='blank'>
-						Report an Issue
+						Report an issue
 					</a>
 				</Menu.Item>
 			</Menu>

diff --git a/front-end/src/components/Login/Web2Login.tsx b/front-end/src/components/Login/Web2Login.tsx
@@ -109,7 +109,7 @@ const LoginForm = ({ className, toggleWeb2Login }:Props): JSX.Element => {
 						disabled={loading}
 						onClick={handleToggle}
 					>
-						Login With Web3 Address
+						Login with web3 address
 					</Button>
 				</div>
 			</Responsive>

diff --git a/front-end/src/components/Login/Web3Login.tsx b/front-end/src/components/Login/Web3Login.tsx
@@ -186,7 +186,7 @@ const LoginForm = ({ className, toggleWeb2Login }:Props): JSX.Element => {
 					disabled={loading}
 					onClick={handleToggle}
 				>
-					Login With Username
+					Login with username
 				</Button>
 			</div>
 		</Form>

diff --git a/front-end/src/components/MenuBar/index.tsx b/front-end/src/components/MenuBar/index.tsx
@@ -127,7 +127,7 @@ const MenuBar = ({ className } : Props): JSX.Element => {
 					<Menu.Item as={NavLink} to="/" className='logo' id='title'><img alt='Polkassembly Logo' src={logo} /></Menu.Item>
 					{contentItems.map((item, index) => <Menu.Item as={NavLink} className='desktop_items' key={index} {...item} />)}
 					<Menu.Item className='desktop_items'>
-						<Dropdown trigger={<>OnChain</>} icon={caretIcon} item={true}>
+						<Dropdown trigger={<>On-chain</>} icon={caretIcon} item={true}>
 							<Dropdown.Menu>
 								{onchainItems.map((item, index) => <Menu.Item as={NavLink} key={index} {...item}/>)}
 							</Dropdown.Menu>
@@ -173,10 +173,6 @@ export default styled(MenuBar)`
 			}
 		}
 
-		.desktop_items, #title {
-			text-transform: capitalize;
-		}
-
 		i.icon {
 			color: grey_secondary;
 		}
@@ -292,10 +288,6 @@ export default styled(MenuBar)`
 			}
 		}
 
-		.user_items {
-			text-transform: capitalize;
-
-		}
 	}
 
 	&.ui.inverted.menu a.item:hover, &.ui.inverted.menu .dropdown.item:hover {

diff --git a/front-end/src/components/Post/PostGovernanceInfo/PostMotionInfo.tsx b/front-end/src/components/Post/PostGovernanceInfo/PostMotionInfo.tsx
@@ -31,14 +31,14 @@ const PostMotionInfo = ({ onchainLink }: Props) => {
 
 	return (
 		<OnchainInfoWrapper>
-			<h4>On-Chain Info</h4>
+			<h4>On-chain info</h4>
 			<Grid>
 				<Grid.Column mobile={16} tablet={8} computer={8}>
 					<h6>Proposer</h6>
 					<AddressComponent address={proposerAddress}/>
 				</Grid.Column>
 				<Grid.Column mobile={16} tablet={8} computer={8}>
-					<h6>Member Count</h6>
+					<h6>Member count</h6>
 					{memberCount}
 				</Grid.Column>
 				<Grid.Column mobile={16} tablet={16} computer={16}>
@@ -47,7 +47,7 @@ const PostMotionInfo = ({ onchainLink }: Props) => {
 				</Grid.Column>
 				<Grid.Row>
 					<Grid.Column mobile={16} tablet={8} computer={8}>
-						<h6>Motion&apos;s Method</h6>
+						<h6>Motion&apos;s method</h6>
 						{method}
 					</Grid.Column>
 					<Grid.Column mobile={16} tablet={8} computer={8}>

diff --git a/front-end/src/components/Post/PostGovernanceInfo/PostProposalInfo.tsx b/front-end/src/components/Post/PostGovernanceInfo/PostProposalInfo.tsx
@@ -31,7 +31,7 @@ const PostProposalInfo = ({ onchainLink }: Props) => {
 
 	return (
 		<OnchainInfoWrapper>
-			<h4>On-Chain Info</h4>
+			<h4>On-chain info</h4>
 			<Grid>
 				<Grid.Column mobile={16} tablet={8} computer={8}>
 					<h6>Proposer</h6>

diff --git a/front-end/src/components/Post/PostGovernanceInfo/PostReferendumInfo.tsx b/front-end/src/components/Post/PostGovernanceInfo/PostReferendumInfo.tsx
@@ -34,7 +34,7 @@ const PostReferendumInfo = ({ onchainLink }: Props) => {
 
 	return (
 		<OnchainInfoWrapper>
-			<h4>On-Chain Info</h4>
+			<h4>On-chain info</h4>
 			<Grid>
 				<Grid.Column mobile={16} tablet={8} computer={8}>
 					<h6>Proposer</h6>
@@ -62,7 +62,7 @@ const PostReferendumInfo = ({ onchainLink }: Props) => {
 					</Grid.Column>}
 				{voteThreshold &&
 					<Grid.Column mobile={16} tablet={8} computer={8}>
-						<h6>voteThreshold</h6>
+						<h6>Vote threshold</h6>
 						{voteThreshold}
 					</Grid.Column>}
 				{method &&

diff --git a/front-end/src/components/Post/PostGovernanceInfo/PostTreasuryInfo.tsx b/front-end/src/components/Post/PostGovernanceInfo/PostTreasuryInfo.tsx
@@ -30,7 +30,7 @@ const PostTreasuryInfo = ({ onchainLink }: Props) => {
 
 	return (
 		<OnchainInfoWrapper>
-			<h4>On-Chain Info</h4>
+			<h4>On-chain info</h4>
 			<Grid>
 				<Grid.Column mobile={16} tablet={8} computer={8}>
 					<h6>Proposer</h6>

diff --git a/front-end/src/generated/graphql.tsx b/front-end/src/generated/graphql.tsx
@@ -10838,7 +10838,7 @@ export type Mutation_RootVerifyEmailArgs = {
 };
 
 /**
- * on chain proposal created automatically by chain-db-watcher
+ * on-chain proposal created automatically by chain-db-watcher
  * 
  * 
  * columns and relationships of "onchain_links"
@@ -10867,7 +10867,7 @@ export type Onchain_Links = {
 
 
 /**
- * on chain proposal created automatically by chain-db-watcher
+ * on-chain proposal created automatically by chain-db-watcher
  * 
  * 
  * columns and relationships of "onchain_links"
@@ -10884,7 +10884,7 @@ export type Onchain_LinksOnchain_MotionArgs = {
 
 
 /**
- * on chain proposal created automatically by chain-db-watcher
+ * on-chain proposal created automatically by chain-db-watcher
  * 
  * 
  * columns and relationships of "onchain_links"
@@ -10901,7 +10901,7 @@ export type Onchain_LinksOnchain_ProposalArgs = {
 
 
 /**
- * on chain proposal created automatically by chain-db-watcher
+ * on-chain proposal created automatically by chain-db-watcher
  * 
  * 
  * columns and relationships of "onchain_links"
@@ -10918,7 +10918,7 @@ export type Onchain_LinksOnchain_ReferendumArgs = {
 
 
 /**
- * on chain proposal created automatically by chain-db-watcher
+ * on-chain proposal created automatically by chain-db-watcher
  * 
  * 
  * columns and relationships of "onchain_links"

diff --git a/front-end/src/screens/CreatePost/index.tsx b/front-end/src/screens/CreatePost/index.tsx
@@ -122,7 +122,7 @@ const CreatePost = ({ className }:Props): JSX.Element => {
 		<Grid>
 			<Grid.Column mobile={16} tablet={16} computer={12} largeScreen={10} widescreen={10}>
 				<Form className={className}>
-					<h3>New Post</h3>
+					<h3>New post</h3>
 					<Controller
 						as={<TitleForm
 							errorTitle={errors.title}

diff --git a/front-end/src/screens/Discussions/index.tsx b/front-end/src/screens/Discussions/index.tsx
@@ -25,21 +25,21 @@ const Discussions = ({ className } : {className?: string}) => {
 
 	return (
 		<div className={className}>
-			<h1>Latest Discussions</h1>
+			<h1>Latest discussions</h1>
 			<Grid stackable reversed='mobile tablet'>
 				<Grid.Column mobile={16} tablet={16} computer={10}>
 					<DiscussionsContainer/>
 				</Grid.Column>
 				<Grid.Column mobile={16} tablet={16} computer={6}>
 					{currentUser.id &&
 						<div className='mainButtonContainer'>
-							<Button primary className={'newPostButton'} onClick={handleCreatePost}>New Post</Button>
+							<Button primary className={'newPostButton'} onClick={handleCreatePost}>New post</Button>
 						</div>}
 					<InfoBox
 						dismissable={true}
 						content={`This is the place to discuss all things ${NETWORK}. Anyone can start a new discussion.`}
 						name='discussionsInfo'
-						title='About Discussions'
+						title='About discussions'
 					/>
 					{currentUser.id && currentUser.addresses?.length !== 0 && !currentUser.defaultAddress &&
 						<DefaultAddressInfoBox />}

diff --git a/front-end/src/screens/Home/index.tsx b/front-end/src/screens/Home/index.tsx
@@ -29,23 +29,23 @@ const Home = ({ className }: Props) => {
 
 	return (
 		<div className={className}>
-			<h1>Latest Activity</h1>
+			<h1>Latest activity</h1>
 			<Grid stackable reversed='mobile tablet'>
 				<Grid.Column mobile={16} tablet={16} computer={10}>
-					<h3>Current Referenda</h3>
+					<h3>Current referenda</h3>
 					<ReferendaContainer className='referendumContainer' />
-					<h3>Latest Proposals</h3>
+					<h3>Latest proposals</h3>
 					<ProposalContainer className='proposalContainer' />
-					<h3>Latest Motions</h3>
+					<h3>Latest motions</h3>
 					<MotionsContainer className='motionContainer' />
-					<h3>Latest Treasury Proposals</h3>
+					<h3>Latest treasury proposals</h3>
 					<TreasuryContainer className='treasuryContainer' />
-					<h3>Latest Discussions</h3>
+					<h3>Latest discussions</h3>
 					<DiscussionContainer className='discussionContainer'/>
 				</Grid.Column>
 				<Grid.Column mobile={16} tablet={16} computer={6}>
 					{currentUser.id && <div className='mainButtonContainer'>
-						<Button primary className={'newPostButton'} onClick={handleCreatePost}>New Post</Button>
+						<Button primary className={'newPostButton'} onClick={handleCreatePost}>New post</Button>
 					</div>}
 					{currentUser.id && currentUser.addresses?.length !== 0 && !currentUser.defaultAddress &&
 						<DefaultAddressInfoBox />}

diff --git a/front-end/src/screens/OnChain/index.tsx b/front-end/src/screens/OnChain/index.tsx
@@ -17,7 +17,7 @@ const OnchainPostsContainer = ({ className } : {className?: string}) => {
 
 	return (
 		<div className={className}>
-			<h1>Latest On Chain Activity</h1>
+			<h1>Latest on-chain activity</h1>
 			<Grid stackable reversed='mobile tablet'>
 				<Grid.Column mobile={16} tablet={16} computer={10}>
 					<h3>Referenda</h3>
@@ -40,7 +40,7 @@ const OnchainPostsContainer = ({ className } : {className?: string}) => {
 						On-chain posts are automatically generated as soon as they are created on the chain.
 						Only the proposer is able to edit them.'
 						name='onchainInfo'
-						title='About On-chain Posts'
+						title='About on-chain posts'
 					/>
 				</Grid.Column>
 			</Grid>

diff --git a/front-end/src/screens/Settings/address.tsx b/front-end/src/screens/Settings/address.tsx
@@ -262,10 +262,10 @@ const Address = ({ className }: Props): JSX.Element => {
 				</Form.Group>
 				{showAccounts && <Form.Group>
 					<Form.Field width={16}>
-						<div className='text-muted'>Associate your account with an on chain address using the <a href={getExtensionUrl()}>Polkadot-js extension</a>.</div>
+						<div className='text-muted'>Associate your account with an on-chain address using the <a href={getExtensionUrl()}>Polkadot-js extension</a>.</div>
 						<div className='link-button-container'>
 							<Button primary onClick={handleDetect}>
-								Show Available Accounts
+								Show available accounts
 							</Button>
 						</div>
 					</Form.Field>

diff --git a/front-end/src/screens/Settings/setCredentials.tsx b/front-end/src/screens/Settings/setCredentials.tsx
@@ -195,7 +195,7 @@ const SetCredentials = ({ className }: {className?: string}): JSX.Element => {
 								<>
 									<Form.Group>
 										<Form.Field width={16}>
-											<label>Default Address</label>
+											<label>Default address</label>
 											<AddressComponent address={address} />
 										</Form.Field>
 									</Form.Group>