(fix) PR Feedback:
@vbaranov - Footer logo should be clickable -> Fixed. - Should be bolder... -> Fixed. - New / "New Ballot" title -> Fixed. - Only first letter should be capitalized -> Fixed. - First letters should be capitalized -> Fixed. - Wrong icon order. -> Fixed.
This commit is contained in:
Gabriel Rodriguez Alsina
parent
591f192050
commit
4da6144ddc
|
|
@ -135,7 +135,7 @@ class App extends Component {
|
|||
<Route exact path={`${commonStore.rootPath}/tofinalize`} render={this.onToFinalizeBallotsRender} />
|
||||
<Route path={`${commonStore.rootPath}/new`} render={this.onNewBallotRender} />
|
||||
</section>
|
||||
<Footer networkBranch={networkBranch} />
|
||||
<Footer baseRootPath={commonStore.rootPath} networkBranch={networkBranch} />
|
||||
</div>
|
||||
) : (
|
||||
<BaseLoader />
|
||||
|
|
|
|||
|
|
@ -80,4 +80,12 @@ $cell-right-padding: 12px;
|
|||
line-height: 28px;
|
||||
margin: 0;
|
||||
text-align: left;
|
||||
|
||||
&#{ & }-action {
|
||||
text-transform: capitalize;
|
||||
}
|
||||
|
||||
&#{ & }-type {
|
||||
text-transform: capitalize;
|
||||
}
|
||||
}
|
||||
|
|
@ -46,4 +46,8 @@
|
|||
margin-left: auto;
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.bc-BallotFooter_voteID {
|
||||
font-weight: 700;
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
outline: none;
|
||||
padding: 0 15px;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
text-transform: capitalize;
|
||||
transition: 0.15s background-color linear;
|
||||
|
||||
&#{ & }-sm {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -6,7 +6,7 @@ export const BallotDataPair = ({ dataType = '', title = '', value = [] }) => {
|
|||
<h2 className="blc-BallotDataPair_Title">{title}</h2>
|
||||
{value.map((item, index) => {
|
||||
return (
|
||||
<p className="blc-BallotDataPair_Value" key={index}>
|
||||
<p className={`blc-BallotDataPair_Value blc-BallotDataPair_Value-${dataType}`} key={index}>
|
||||
{item}
|
||||
</p>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ export const BallotFooter = ({
|
|||
{description ? <p className="bc-BallotFooter_Description">{description}</p> : null}
|
||||
{voted ? <div className="bc-BallotFooter_Voted">You already voted</div> : null}
|
||||
<div className="bc-BallotFooter_ID">
|
||||
{voteType} Ballot ID: {voteId}
|
||||
{voteType} Ballot ID: <span className="bc-BallotFooter_voteID">{voteId}</span>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@ import React from 'react'
|
|||
import moment from 'moment'
|
||||
import { Logo } from '../Logo'
|
||||
import { SocialIcons } from '../SocialIcons'
|
||||
import { constants } from '../../utils/constants'
|
||||
|
||||
export const Footer = ({ extraClassName = '', networkBranch = false }) => {
|
||||
export const Footer = ({ baseRootPath = '', extraClassName = '', networkBranch = false }) => {
|
||||
return (
|
||||
<footer className={`sw-Footer ${extraClassName} sw-Footer-${networkBranch}`}>
|
||||
<div className="sw-Footer_Content">
|
||||
<Logo networkBranch={networkBranch} href={constants.baseURL} />
|
||||
<Logo networkBranch={networkBranch} href={baseRootPath} />
|
||||
<p className="sw-Footer_Text">{moment().format('YYYY')} POA Network. All rights reserved.</p>
|
||||
<SocialIcons networkBranch={networkBranch} />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import { Logo } from '../Logo'
|
|||
import { MobileMenuLinks } from '../MobileMenuLinks'
|
||||
import { NavigationLinks } from '../NavigationLinks'
|
||||
|
||||
export const Header = ({ baseRootPath, networkBranch = undefined, onMenuToggle, showMobileMenu = false }) => {
|
||||
export const Header = ({ baseRootPath = '', networkBranch = undefined, onMenuToggle, showMobileMenu = false }) => {
|
||||
return (
|
||||
<header className={`sw-Header sw-Header-${networkBranch} ${showMobileMenu ? 'sw-Header-menu-open' : ''}`}>
|
||||
{showMobileMenu ? <MobileMenuLinks networkBranch={networkBranch} onClick={onMenuToggle} /> : null}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@ import React from 'react'
|
|||
|
||||
export const IconAll = ({ networkBranch }) => {
|
||||
return (
|
||||
<svg className={`nl-IconAll`} xmlns="http://www.w3.org/2000/svg" width="16" height="18">
|
||||
<svg className={`nl-IconAll`} xmlns="http://www.w3.org/2000/svg" width="18" height="17">
|
||||
<path
|
||||
className={`nl-IconAll_Path nl-IconAll_Path-${networkBranch}`}
|
||||
d="M15 15h-5a1 1 0 0 1-1-1v-3H2v6a1 1 0 0 1-2 0V1a1 1 0 0 1 1-1h9a1 1 0 0 1 1 1v3h4a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1zM9 2H2v7h7V2zm2 11h3V6h-3v7z"
|
||||
d="M16 10.95V11H2v-.05a2.502 2.502 0 0 1 0-4.9V6h14v.05a2.502 2.502 0 0 1 0 4.9zM16 8H2v1h14V8zm0-3.05V5H2v-.05a2.502 2.502 0 0 1 0-4.9V0h14v.05a2.502 2.502 0 0 1 0 4.9zM16 2H2v1h14V2zM2 12.05V12h14v.05a2.502 2.502 0 0 1 0 4.9V17H2v-.05a2.502 2.502 0 0 1 0-4.9zM2 15h14v-1H2v1z"
|
||||
fillRule="evenodd"
|
||||
/>
|
||||
</svg>
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ import React from 'react'
|
|||
|
||||
export const IconToFinalize = ({ networkBranch }) => {
|
||||
return (
|
||||
<svg className={`nl-IconToFinalize`} xmlns="http://www.w3.org/2000/svg" width="18" height="17">
|
||||
<svg className={`nl-IconToFinalize`} xmlns="http://www.w3.org/2000/svg" width="16" height="18">
|
||||
<path
|
||||
className={`nl-IconToFinalize_Path nl-IconToFinalize_Path-${networkBranch}`}
|
||||
d="M15 15h-5a1 1 0 0 1-1-1v-3H2v6a1 1 0 0 1-2 0V1a1 1 0 0 1 1-1h9a1 1 0 0 1 1 1v3h4a1 1 0 0 1 1 1v9a1 1 0 0 1-1 1zM9 2H2v7h7V2zm2 11h3V6h-3v7z"
|
||||
fillRule="evenodd"
|
||||
d="M16 10.95V11H2v-.05a2.502 2.502 0 0 1 0-4.9V6h14v.05a2.502 2.502 0 0 1 0 4.9zM16 8H2v1h14V8zm0-3.05V5H2v-.05a2.502 2.502 0 0 1 0-4.9V0h14v.05a2.502 2.502 0 0 1 0 4.9zM16 2H2v1h14V2zM2 12.05V12h14v.05a2.502 2.502 0 0 1 0 4.9V17H2v-.05a2.502 2.502 0 0 1 0-4.9zM2 15h14v-1H2v1z"
|
||||
/>
|
||||
</svg>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ constants.navigationData = [
|
|||
},
|
||||
{
|
||||
disabled: true,
|
||||
title: 'New',
|
||||
title: 'New Ballot',
|
||||
url: `${constants.rootPath}/new`
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in New Issue