From 2c6f0b1f09437141e85e60cf80778c78be7c3fe7 Mon Sep 17 00:00:00 2001
From: Stuart Taylor <staylor1012@gmail.com>
Date: Sun, 24 Dec 2017 09:34:05 +0000
Subject: [PATCH] fix(merge-conflicts): Add missing classNames to Get Help
 button

---
 common/app/routes/Challenges/Tool-Panel.jsx  |  3 +--
 common/app/routes/Challenges/challenges.less | 20 ++++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/common/app/routes/Challenges/Tool-Panel.jsx b/common/app/routes/Challenges/Tool-Panel.jsx
index 20a07c5540..d46b5ae509 100644
--- a/common/app/routes/Challenges/Tool-Panel.jsx
+++ b/common/app/routes/Challenges/Tool-Panel.jsx
@@ -2,8 +2,6 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Button, Tooltip, OverlayTrigger } from 'react-bootstrap';
 
-import ns from './ns.json';
-
 const unlockWarning = (
   <Tooltip id='tooltip'>
     <h4>
@@ -123,6 +121,7 @@ export default class ToolPanel extends PureComponent {
           <div className='button-spacer' />
           <Button
             bsStyle='primary'
+            className='btn-big btn-block'
             onClick={ openHelpModal }
             >
             Get Help
diff --git a/common/app/routes/Challenges/challenges.less b/common/app/routes/Challenges/challenges.less
index 9d15cea115..0fbf31c5af 100644
--- a/common/app/routes/Challenges/challenges.less
+++ b/common/app/routes/Challenges/challenges.less
@@ -124,12 +124,12 @@
 }
 
 @keyframes skeletonShimmer{
-   0% {
-     transform: translateX(-48px);
-   }
-   100% {
-     transform: translateX(1000px);
-   }
+  0% {
+    transform: translateX(-48px);
+  }
+  100% {
+    transform: translateX(1000px);
+  }
 }
 
 .@{ns}-shimmer {
@@ -216,12 +216,4 @@
   width: 100%;
 }
 
-.@{ns}-tool-panel-btn-grp {
-  display: flex;
-
-  .btn {
-    flex-grow: 1;
-  }
-}
-
 &{ @import "./views/index.less"; }