gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(merge-conflicts): Add missing classNames to Get Help button

Browse Source
This commit is contained in:
Stuart Taylor
2017-12-24 09:34:05 +00:00
parent 71708aa7ff
commit 2c6f0b1f09
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/app/routes/Challenges/Tool-Panel.jsx
View File

@ -2,8 +2,6 @@ import React, { PureComponent } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Button, Tooltip, OverlayTrigger } from 'react-bootstrap'; import { Button, Tooltip, OverlayTrigger } from 'react-bootstrap';
import ns from './ns.json';
const unlockWarning = ( const unlockWarning = (
<Tooltip id='tooltip'> <Tooltip id='tooltip'>
<h4> <h4>
@ -123,6 +121,7 @@ export default class ToolPanel extends PureComponent {
<div className='button-spacer' /> <div className='button-spacer' />
<Button <Button
bsStyle='primary' bsStyle='primary'
className='btn-big btn-block'
onClick={ openHelpModal } onClick={ openHelpModal }
> >
Get Help Get Help

20
common/app/routes/Challenges/challenges.less
View File

@ -124,12 +124,12 @@
} }
@keyframes skeletonShimmer{ @keyframes skeletonShimmer{
0% { 0% {
transform: translateX(-48px); transform: translateX(-48px);
} }
100% { 100% {
transform: translateX(1000px); transform: translateX(1000px);
} }
} }
.@{ns}-shimmer { .@{ns}-shimmer {
@ -216,12 +216,4 @@
width: 100%; width: 100%;
} }
.@{ns}-tool-panel-btn-grp {
display: flex;
.btn {
flex-grow: 1;
}
}
&{ @import "./views/index.less"; } &{ @import "./views/index.less"; }