Skip to content

Commit

Permalink
fix(ZNTA-2143) WIP: covert frontend css to SUITCSS where it won't cau…
Browse files Browse the repository at this point in the history
…se overrides with react-bootstrap components
  • Loading branch information
kgough committed Sep 7, 2017
1 parent 565bc74 commit 8b4c880
Show file tree
Hide file tree
Showing 62 changed files with 1,161 additions and 1,192 deletions.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ describe('DraggableVersionPanels', () => {
const expected = ReactDOMServer.renderToStaticMarkup( const expected = ReactDOMServer.renderToStaticMarkup(
<ListGroupItem className='v' > <ListGroupItem className='v' >
<DragHandle /> <DragHandle />
{'ver1'} <span className='text-muted'> {'meikai1'} {'ver1'} <span className='u-textMuted'> {'meikai1'}
</span> <LockIcon status={'ACTIVE'} /> </span> <LockIcon status={'ACTIVE'} />
{" "} {" "}
<Button bsSize='xsmall' className='close rm-version-btn' <Button bsSize='xsmall' className='close rm-version-btn'
onClick={callback}> onClick={callback}>
<Icon name='cross' className='n2 crossicon' title='remove version' /> <Icon name='cross' className='n2 iconCross' title='remove version' />
</Button> </Button>
</ListGroupItem> </ListGroupItem>
) )
Expand Down Expand Up @@ -63,7 +63,7 @@ describe('DraggableVersionPanels', () => {
<span className="vmerge-adjtitle vmerge-title"> <span className="vmerge-adjtitle vmerge-title">
Adjust priority of selected versions Adjust priority of selected versions
</span><br /> </span><br />
<span className="text-muted vmerge-adjsub">(best first)</span> <span className="u-textMuted vmerge-adjsub">(best first)</span>
<OverlayTrigger placement='top' overlay={tooltipSort}> <OverlayTrigger placement='top' overlay={tooltipSort}>
<Icon name='info' className='s0 info-icon' /> <Icon name='info' className='s0 info-icon' />
</OverlayTrigger> </OverlayTrigger>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ export class Item extends Component {
const { value: { version, projectSlug } } = this.props const { value: { version, projectSlug } } = this.props
return <ListGroupItem className='v' > return <ListGroupItem className='v' >
<DragHandle /> <DragHandle />
{version.id} <span className='text-muted'> {projectSlug} {version.id} <span className='u-textMuted'> {projectSlug}
</span> <LockIcon status={version.status} /> </span> <LockIcon status={version.status} />
{" "} {" "}
<Button bsSize='xsmall' className='close rm-version-btn' <Button bsSize='xsmall' className='close rm-version-btn'
onClick={this.removeVersion}> onClick={this.removeVersion}>
<Icon name='cross' className='n2 crossicon' title='remove version' /> <Icon name='cross' className='n2 iconCross' title='remove version' />
</Button> </Button>
</ListGroupItem> </ListGroupItem>
} }
Expand All @@ -67,7 +67,7 @@ class Items extends Component {
<span className='vmerge-adjtitle vmerge-title'> <span className='vmerge-adjtitle vmerge-title'>
Adjust priority of selected versions Adjust priority of selected versions
</span><br /> </span><br />
<span className='text-muted vmerge-adjsub'> <span className='u-textMuted vmerge-adjsub'>
(best first) (best first)
</span> </span>
<OverlayTrigger placement='top' overlay={tooltipSort}> <OverlayTrigger placement='top' overlay={tooltipSort}>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { EditableText } from '../'
storiesOf('EditableText', module) storiesOf('EditableText', module)
.add('editing', () => ( .add('editing', () => (
<EditableText <EditableText
className='editable textInput text-state-classes' className='editable textInput textState'
maxLength={255} maxLength={255}
editable={true} editable={true}
editing={true} editing={true}
Expand All @@ -16,7 +16,7 @@ storiesOf('EditableText', module)
)) ))
.add('not editing', () => ( .add('not editing', () => (
<EditableText <EditableText
className='editable textInput text-state-classes' className='editable textInput textState'
maxLength={255} maxLength={255}
editable={true} editable={true}
editing={false} editing={false}
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ class EditableText extends Component {
} }
const emptyText = editable ? placeholder : emptyReadOnlyText const emptyText = editable ? placeholder : emptyReadOnlyText
const content = children || const content = children ||
<span className='text-muted'>{emptyText}</span> <span className='u-textMuted'>{emptyText}</span>
return ( return (
<Row className='text-input text-state-classes text' <Row className='textInput textState text'
onClick={this.handleClick} title={title}> onClick={this.handleClick} title={title}>
{content} {content}
</Row> </Row>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const LoaderText = ({
...props ...props
}) => { }) => {
return ( return (
<span className='loader-text' {...props}> <span className='loaderText' {...props}>
{loading {loading
? <span>{loadingText}<Loader /></span> ? <span>{loadingText}<Loader /></span>
: children : children
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ class LogoLoader extends React.Component {
/* eslint-disable max-len */ /* eslint-disable max-len */
return ( return (
<span className={className} title='Zanata'> <span className={className} title='Zanata'>
<span className='LogoLoader-logo'> <span className='logoLoader-logo'>
<svg className='LogoLoader-svg LogoLoader-circle' viewBox='0 0 512 512'> <svg className='logoLoader-svg LogoLoader-circle' viewBox='0 0 512 512'>
<g><path d='M256.040517,26.9020538 C129.377614,26.9020538 26.4050036,130.259367 26.4050036,257.280952 C26.4050036,384.302988 129.377614,487.660302 256.040517,487.660302 C382.703464,487.660302 485.676029,384.302988 485.676075,257.280952 C485.676029,130.259367 382.703464,26.9020538 256.040517,26.9020538 Z M256.040517,66.3898734 C361.786714,66.3898734 447.229385,152.099354 447.229431,258.282844 C447.229385,364.466785 361.786714,450.176266 256.040517,450.176266 C150.294319,450.176266 64.8516476,364.466785 64.8516476,258.282844 C64.8516476,152.099354 150.294319,66.3898734 256.040517,66.3898734 Z' id='Circle'></path></g> <g><path d='M256.040517,26.9020538 C129.377614,26.9020538 26.4050036,130.259367 26.4050036,257.280952 C26.4050036,384.302988 129.377614,487.660302 256.040517,487.660302 C382.703464,487.660302 485.676029,384.302988 485.676075,257.280952 C485.676029,130.259367 382.703464,26.9020538 256.040517,26.9020538 Z M256.040517,66.3898734 C361.786714,66.3898734 447.229385,152.099354 447.229431,258.282844 C447.229385,364.466785 361.786714,450.176266 256.040517,450.176266 C150.294319,450.176266 64.8516476,364.466785 64.8516476,258.282844 C64.8516476,152.099354 150.294319,66.3898734 256.040517,66.3898734 Z' id='Circle'></path></g>
</svg> </svg>
<svg className='LogoLoader-svg LogoLoader-circlePulse' viewBox='0 0 512 512'> <svg className='logoLoader-svg LogoLoader-circlePulse' viewBox='0 0 512 512'>
<g><path d='M256.040517,26.9020538 C129.377614,26.9020538 26.4050036,130.259367 26.4050036,257.280952 C26.4050036,384.302988 129.377614,487.660302 256.040517,487.660302 C382.703464,487.660302 485.676029,384.302988 485.676075,257.280952 C485.676029,130.259367 382.703464,26.9020538 256.040517,26.9020538 Z M256.040517,66.3898734 C361.786714,66.3898734 447.229385,152.099354 447.229431,258.282844 C447.229385,364.466785 361.786714,450.176266 256.040517,450.176266 C150.294319,450.176266 64.8516476,364.466785 64.8516476,258.282844 C64.8516476,152.099354 150.294319,66.3898734 256.040517,66.3898734 Z' id='Circle'></path></g> <g><path d='M256.040517,26.9020538 C129.377614,26.9020538 26.4050036,130.259367 26.4050036,257.280952 C26.4050036,384.302988 129.377614,487.660302 256.040517,487.660302 C382.703464,487.660302 485.676029,384.302988 485.676075,257.280952 C485.676029,130.259367 382.703464,26.9020538 256.040517,26.9020538 Z M256.040517,66.3898734 C361.786714,66.3898734 447.229385,152.099354 447.229431,258.282844 C447.229385,364.466785 361.786714,450.176266 256.040517,450.176266 C150.294319,450.176266 64.8516476,364.466785 64.8516476,258.282844 C64.8516476,152.099354 150.294319,66.3898734 256.040517,66.3898734 Z' id='Circle'></path></g>
</svg> </svg>
<svg className='LogoLoader-svg LogoLoader-z' viewBox='0 0 512 512'> <svg className='logoLoader-svg logoLoader-z' viewBox='0 0 512 512'>
<g> <g>
<g id='Shadow' transform='translate(26.377192, 25.222456)'> <g id='Shadow' transform='translate(26.377192, 25.222456)'>
<mask id='mask-2' fill='white'> <mask id='mask-2' fill='white'>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ storiesOf('Modal', module)
</Button> </Button>
</OverlayTrigger> </OverlayTrigger>
</p> </p>
<p className='text-warning'>* All translations of documents for <p className='u-textWarning'>* All translations of documents for
the selected source language will be included. the selected source language will be included.
</p> </p>
</span> </span>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const NavItem = ({
cssClass += (small ? ' small' : '') cssClass += (small ? ' small' : '')
cssClass += (isSearchLink ? ' search' : '') cssClass += (isSearchLink ? ' search' : '')


const text = isLogo ? (<span className='nav-logo'>{title}</span>) : title const text = isLogo ? (<span className='navBar-navLogo'>{title}</span>) : title
const inverted = false const inverted = false


const child = isLogo const child = isLogo
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const Nav = ({
{...props} {...props}
id='nav' id='nav'
name={username} name={username}
className='nav-bar'> className='navBar'>
{items.map((item, itemId) => { {items.map((item, itemId) => {
if (((item.auth === 'public') || (item.auth === auth) || if (((item.auth === 'public') || (item.auth === auth) ||
(item.auth === 'loggedin' && admin))) { (item.auth === 'loggedin' && admin))) {
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class Notification extends Component {
<Modal.Title> <Modal.Title>
<Row <Row
bsStyle={severityClass} bsStyle={severityClass}
className='notify-row'> className='rowNotify'>
<Icon name={icon} className='s2 list-inline' /> <Icon name={icon} className='s2 listInline' />
<span>Notification</span> <span>Notification</span>
</Row> </Row>
</Modal.Title> </Modal.Title>
Expand All @@ -69,7 +69,7 @@ class Notification extends Component {
{message} {message}
</div> </div>
{!isEmpty(details) && {!isEmpty(details) &&
(<div className='notification-modal-content'> (<div className='modalNotification-content'>
{details} {details}
</div>)} </div>)}
</Modal.Body> </Modal.Body>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class RejectionsForm extends Component {
<span className={this.props.textState}>{this.props.priority}</span> <span className={this.props.textState}>{this.props.priority}</span>
) )
return ( return (
<Form className='rejections' inline> <Form className='rejectionsForm' inline>
<FormGroup className='flex-grow1' controlId='formInlineCriteria'> <FormGroup className='flex-grow1' controlId='formInlineCriteria'>
<ControlLabel>Criteria</ControlLabel><br/> <ControlLabel>Criteria</ControlLabel><br/>
<TextInput multiline={true} editable={this.props.editable} <TextInput multiline={true} editable={this.props.editable}
Expand All @@ -43,18 +43,18 @@ class RejectionsForm extends Component {
<ControlLabel>Priority</ControlLabel><br/> <ControlLabel>Priority</ControlLabel><br/>
<DropdownButton bsStyle='default' title={title} <DropdownButton bsStyle='default' title={title}
id='dropdown-basic'> id='dropdown-basic'>
<MenuItem><span className='text-info'>Minor</span></MenuItem> <MenuItem><span className='u-textInfo'>Minor</span></MenuItem>
<MenuItem><span className='text-warning'>Major</span></MenuItem> <MenuItem><span className='u-textWarning'>Major</span></MenuItem>
<MenuItem><span className='text-danger'>Critical</span></MenuItem> <MenuItem><span className='u-textDanger'>Critical</span></MenuItem>
</DropdownButton> </DropdownButton>
</FormGroup> </FormGroup>
<FormGroup controlId='formInlineButtonEdit'> <FormGroup controlId='formInlineButtonEdit'>
<ControlLabel>&nbsp;</ControlLabel><br/> <ControlLabel>&nbsp;</ControlLabel><br/>
<Button bsStyle='primary' className={this.props.className}> <Button bsStyle='primary' className={this.props.className}>
<Icon name='edit' className='s0 editicon'/> <Icon name='edit' className='s0 iconEdit'/>
</Button> </Button>
<Button bsStyle='danger' className={this.props.className}> <Button bsStyle='danger' className={this.props.className}>
<Icon name='trash' className='s0 editicon'/> <Icon name='trash' className='s0 iconEdit'/>
</Button> </Button>
</FormGroup> </FormGroup>
</Form> </Form>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ storiesOf('Sidebar', module)
.add('default', () => ( .add('default', () => (
<div> <div>
<Sidebar /> <Sidebar />
<div className='flextab'> <div className='flexTab'>
<p>This sidebar example has the active tag applied to both the People <p>This sidebar example has the active tag applied to both the People
and Languages pages to provide examples of how this design handles and Languages pages to provide examples of how this design handles
sidebar links.</p> sidebar links.</p>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ class Sidebar extends Component {
<p><span className='percent'>10%</span> translated</p> <p><span className='percent'>10%</span> translated</p>
</div> </div>
<ProgressBar> <ProgressBar>
<ProgressBar className='progress-bar-translated' <ProgressBar className='progressBar-translated'
now={10} key={1} /> now={10} key={1} />
<ProgressBar className='progress-bar-fuzzy' <ProgressBar className='progressBar-fuzzy'
now={7} key={2} /> now={7} key={2} />
<ProgressBar className='progress-bar-rejected' <ProgressBar className='progressBar-rejected'
now={3} key={3} /> now={3} key={3} />
<ProgressBar className='progress-bar-approved' <ProgressBar className='progressBar-approved'
now={10} key={4} /> now={10} key={4} />
</ProgressBar> </ProgressBar>
<Nav className='v-links' <Nav className='v-links'
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class TMXExportModal extends Component {
{srcLangRows} {srcLangRows}
</tbody> </tbody>
</Table> </Table>
<p className='text-warning'> <p className='u-textWarning'>
{warningText} {warningText}
</p> </p>
</span> </span>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ storiesOf('VersionTMMergeModal', module)
show={true} show={true}
onHide={action('onHide')}> onHide={action('onHide')}>
<Modal.Header> <Modal.Header>
<Modal.Title><span className="text-new-blue">Version TM Merge</span></Modal.Title> <Modal.Title><span className="u-textNewBlue">Version TM Merge</span></Modal.Title>
</Modal.Header> </Modal.Header>
<Modal.Body> <Modal.Body>
<p className="intro"> <p className="intro">
Expand Down Expand Up @@ -103,7 +103,7 @@ storiesOf('VersionTMMergeModal', module)
</Col> </Col>
<Col xs={12} className='vmerge-row'> <Col xs={12} className='vmerge-row'>
<p className="lead">For every potential translation:</p> <p className="lead">For every potential translation:</p>
<span className="text-new-blue">If text is less than </span> <span className="u-textNewBlue">If text is less than </span>
<DropdownButton bsStyle='default' title='80%' <DropdownButton bsStyle='default' title='80%'
id='language-dropdown-basic' id='language-dropdown-basic'
className='vmerge-ddown'> className='vmerge-ddown'>
Expand All @@ -113,7 +113,7 @@ storiesOf('VersionTMMergeModal', module)
eventKey='1'>90%</MenuItem> eventKey='1'>90%</MenuItem>
<MenuItem onClick={action('onClick')} <MenuItem onClick={action('onClick')}
eventKey='1'>80%</MenuItem> eventKey='1'>80%</MenuItem>
</DropdownButton><span className="text-new-blue"> &nbsp;similar, don't use it. </DropdownButton><span className="u-textNewBlue"> &nbsp;similar, don't use it.
</span> </span>
</Col> </Col>
<Col xs={12} className='vmerge-boxes'> <Col xs={12} className='vmerge-boxes'>
Expand Down Expand Up @@ -203,7 +203,7 @@ storiesOf('VersionTMMergeModal', module)
<span className="vmerge-adjtitle vmerge-title"> <span className="vmerge-adjtitle vmerge-title">
Adjust priority of selected versions Adjust priority of selected versions
</span><br/> </span><br/>
<span className="text-muted vmerge-adjsub">(best first) <span className="u-textMuted vmerge-adjsub">(best first)
<OverlayTrigger placement='right' overlay={tooltip2}> <OverlayTrigger placement='right' overlay={tooltip2}>
<Button bsStyle="link" className="tooltip-btn"> <Button bsStyle="link" className="tooltip-btn">
<Icon name="info" className="s0 info-icon"/> <Icon name="info" className="s0 info-icon"/>
Expand All @@ -214,22 +214,22 @@ storiesOf('VersionTMMergeModal', module)
<ListGroupItem className='v'> <ListGroupItem className='v'>
<Icon name='menu' className='n1 drag-handle'/> <Icon name='menu' className='n1 drag-handle'/>
Version 1 <Icon name='locked' className='s0 icon-locked'/> Version 1 <Icon name='locked' className='s0 icon-locked'/>
<br/><span className='text-muted'> Project A <br/><span className='u-textMuted'> Project A
</span> </span>
{" "} {" "}
<Button bsSize='xsmall' className='close rm-version-btn'> <Button bsSize='xsmall' className='close rm-version-btn'>
<Icon name='cross' className='n2 crossicon' <Icon name='cross' className='n2 iconCross'
title='remove version'/> title='remove version'/>
</Button> </Button>
</ListGroupItem> </ListGroupItem>
<ListGroupItem className='v'> <ListGroupItem className='v'>
<Icon name='menu' className='n1 drag-handle'/> <Icon name='menu' className='n1 drag-handle'/>
Version 2 <Icon name='locked' className='s0 icon-locked'/> Version 2 <Icon name='locked' className='s0 icon-locked'/>
<br/><span className='text-muted'> Project A <br/><span className='u-textMuted'> Project A
</span> </span>
{" "} {" "}
<Button bsSize='xsmall' className='close rm-version-btn'> <Button bsSize='xsmall' className='close rm-version-btn'>
<Icon name='cross' className='n2 crossicon' <Icon name='cross' className='n2 iconCross'
title='remove version'/> title='remove version'/>
</Button> </Button>
</ListGroupItem> </ListGroupItem>
Expand Down Expand Up @@ -294,7 +294,7 @@ storiesOf('VersionTMMergeModal', module)
<Col xs={12}> <Col xs={12}>
<Well> <Well>
<p>Translations which satisfy all conditions will copy as <p>Translations which satisfy all conditions will copy as
<span className="text-bold text-success"> translated</span>. <span className="text-bold u-textSuccess"> translated</span>.
</p> </p>
</Well> </Well>
</Col> </Col>
Expand Down Expand Up @@ -357,7 +357,7 @@ storiesOf('VersionTMMergeModal', module)
show={true} show={true}
onHide={action('onHide')}> onHide={action('onHide')}>
<Modal.Header> <Modal.Header>
<Modal.Title><span className="text-new-blue">Version TM Merge</span></Modal.Title> <Modal.Title><span className="u-textNewBlue">Version TM Merge</span></Modal.Title>
</Modal.Header> </Modal.Header>
<Modal.Body> <Modal.Body>
<p className="intro"> <p className="intro">
Expand Down Expand Up @@ -406,7 +406,7 @@ storiesOf('VersionTMMergeModal', module)
</Col> </Col>
<Col xs={12} className='vmerge-row'> <Col xs={12} className='vmerge-row'>
<p className="lead">For every potential translation:</p> <p className="lead">For every potential translation:</p>
<span className="text-new-blue">If text is less than </span> <span className="u-textNewBlue">If text is less than </span>
<DropdownButton bsStyle='default' title='80%' <DropdownButton bsStyle='default' title='80%'
id='language-dropdown-basic' id='language-dropdown-basic'
className='vmerge-ddown'> className='vmerge-ddown'>
Expand All @@ -416,7 +416,7 @@ storiesOf('VersionTMMergeModal', module)
eventKey='1'>90%</MenuItem> eventKey='1'>90%</MenuItem>
<MenuItem onClick={action('onClick')} <MenuItem onClick={action('onClick')}
eventKey='1'>80%</MenuItem> eventKey='1'>80%</MenuItem>
</DropdownButton><span className="text-new-blue"> &nbsp;similar, don't use it. </DropdownButton><span className="u-textNewBlue"> &nbsp;similar, don't use it.
</span> </span>
</Col> </Col>
<Col xs={12} className='vmerge-boxes'> <Col xs={12} className='vmerge-boxes'>
Expand Down Expand Up @@ -503,7 +503,7 @@ storiesOf('VersionTMMergeModal', module)
</div> </div>
</Col> </Col>
<Col xs={6}> <Col xs={6}>
<span className="no-v text-muted">Please select versions to sort<br/> <span className="no-v u-textMuted">Please select versions to sort<br/>
<Icon name="version" className="s8"/></span> <Icon name="version" className="s8"/></span>
</Col> </Col>
<Col xs={12} className="validations"> <Col xs={12} className="validations">
Expand Down Expand Up @@ -565,7 +565,7 @@ storiesOf('VersionTMMergeModal', module)
<Col xs={12}> <Col xs={12}>
<Well> <Well>
<p>Translations which satisfy all conditions will copy as <p>Translations which satisfy all conditions will copy as
<span className="text-bold text-success"> translated</span>. <span className="text-bold u-textSuccess"> translated</span>.
</p> </p>
</Well> </Well>
</Col> </Col>
Expand Down Expand Up @@ -628,7 +628,7 @@ storiesOf('VersionTMMergeModal', module)
show={true} show={true}
onHide={action('onHide')}> onHide={action('onHide')}>
<Modal.Header> <Modal.Header>
<Modal.Title><span className="text-new-blue">Version TM Merge</span></Modal.Title> <Modal.Title><span className="u-textNewBlue">Version TM Merge</span></Modal.Title>
</Modal.Header> </Modal.Header>
<Modal.Body> <Modal.Body>
<p className="intro"> <p className="intro">
Expand Down Expand Up @@ -677,7 +677,7 @@ storiesOf('VersionTMMergeModal', module)
</Col> </Col>
<Col xs={12} className='vmerge-row'> <Col xs={12} className='vmerge-row'>
<p className="lead">For every potential translation:</p> <p className="lead">For every potential translation:</p>
<span className="text-new-blue">If text is less than </span> <span className="u-textNewBlue">If text is less than </span>
<DropdownButton bsStyle='default' title='80%' <DropdownButton bsStyle='default' title='80%'
id='language-dropdown-basic' id='language-dropdown-basic'
className='vmerge-ddown'> className='vmerge-ddown'>
Expand All @@ -687,7 +687,7 @@ storiesOf('VersionTMMergeModal', module)
eventKey='1'>90%</MenuItem> eventKey='1'>90%</MenuItem>
<MenuItem onClick={action('onClick')} <MenuItem onClick={action('onClick')}
eventKey='1'>80%</MenuItem> eventKey='1'>80%</MenuItem>
</DropdownButton><span className="text-new-blue"> &nbsp;similar, don't use it. </DropdownButton><span className="u-textNewBlue"> &nbsp;similar, don't use it.
</span> </span>
</Col> </Col>
<Col xs={12} className='vmerge-boxes'> <Col xs={12} className='vmerge-boxes'>
Expand Down Expand Up @@ -774,7 +774,7 @@ storiesOf('VersionTMMergeModal', module)
</div> </div>
</Col> </Col>
<Col xs={6}> <Col xs={6}>
<span className="no-v text-muted">Please select versions to sort<br/> <span className="no-v u-textMuted">Please select versions to sort<br/>
<Icon name="version" className="s8"/></span> <Icon name="version" className="s8"/></span>
</Col> </Col>
<Col xs={12} className="validations"> <Col xs={12} className="validations">
Expand Down Expand Up @@ -836,7 +836,7 @@ storiesOf('VersionTMMergeModal', module)
<Col xs={12}> <Col xs={12}>
<Well> <Well>
<p>Translations which satisfy all conditions will copy as <p>Translations which satisfy all conditions will copy as
<span className="text-bold text-success"> translated</span>. <span className="text-bold u-textSuccess"> translated</span>.
</p> </p>
</Well> </Well>
</Col> </Col>
Expand Down
Loading

0 comments on commit 8b4c880

Please sign in to comment.