Skip to content

Commit

Permalink
fix(night-mode): Update indenting and change border color
Browse files Browse the repository at this point in the history
  • Loading branch information
raisedadead committed Jan 24, 2017
1 parent e126152 commit f262bfd
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion client/less/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ code {
}
.btn-primary {
background-color: @brand-primary;
border-color: #292929;
border-color: #777;
color:#CCC;
transition: color 0.2s, background-color 0.2s;
&:hover {
Expand Down
18 changes: 9 additions & 9 deletions common/app/routes/settings/components/Email-Setting.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ export default function EmailSettings({
bsStyle='primary'
className={
classnames(
'positive-20',
{ active: sendMonthlyEmail },
'btn-toggle'
'positive-20',
{ active: sendMonthlyEmail },
'btn-toggle'
)
}
onClick={ toggleMonthlyEmail }
Expand All @@ -97,9 +97,9 @@ export default function EmailSettings({
bsStyle='primary'
className={
classnames(
'positive-20',
{ active: sendNotificationEmail },
'btn-toggle'
'positive-20',
{ active: sendNotificationEmail },
'btn-toggle'
)
}
onClick={ toggleNotificationEmail }
Expand All @@ -123,9 +123,9 @@ export default function EmailSettings({
bsStyle='primary'
className={
classnames(
'positive-20',
{ active: sendQuincyEmail },
'btn-toggle'
'positive-20',
{ active: sendQuincyEmail },
'btn-toggle'
)
}
onClick={ toggleQuincyEmail }
Expand Down
64 changes: 32 additions & 32 deletions common/app/routes/settings/components/Locked-Settings.jsx
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
import React, {PropTypes} from 'react';
import {Button, Row, Col} from 'react-bootstrap';
import React, { PropTypes } from 'react';
import { Button, Row, Col } from 'react-bootstrap';
import classnames from 'classnames';

export default function LockSettings({isLocked, toggle}) {
const className = classnames({
'positive-20': true,
active: isLocked,
'btn-toggle': true
});
return (
<Row>
<Col xs={ 9 }>
<p className='large-p'>
Make all of my solutions private
<br />
(this disables your certificates)
</p>
</Col>
<Col xs={ 3 }>
<Button
block={ true }
bsSize='lg'
bsStyle='primary'
className={ className }
onClick={ toggle }
>
{ isLocked ? 'On' : 'Off' }
</Button>
</Col>
</Row>
);
export default function LockSettings({ isLocked, toggle }) {
const className = classnames({
'positive-20': true,
active: isLocked,
'btn-toggle': true
});
return (
<Row>
<Col xs={ 9 }>
<p className='large-p'>
Make all of my solutions private
<br />
(this disables your certificates)
</p>
</Col>
<Col xs={ 3 }>
<Button
block={ true }
bsSize='lg'
bsStyle='primary'
className={ className }
onClick={ toggle }
>
{ isLocked ? 'On' : 'Off' }
</Button>
</Col>
</Row>
);
}

LockSettings.propTypes = {
isLocked: PropTypes.bool,
toggle: PropTypes.func.isRequired
isLocked: PropTypes.bool,
toggle: PropTypes.func.isRequired
};

0 comments on commit f262bfd

Please sign in to comment.