From 4c5c7e5e39fe5b271db33db8842a4b08c7abc399 Mon Sep 17 00:00:00 2001
From: kgough <kgough@redhat.com>
Date: Thu, 17 May 2018 16:07:08 +1000
Subject: [PATCH] refactor(ZNTA-2514) css styling for TMMergeModal

---
 .../app/containers/ProjectVersion/TMMergeModal.js   | 13 +++++++------
 .../src/app/styles/ant-theme-vars.less              |  4 ++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js b/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
index 289c1281e0..4e3cb03574 100644
--- a/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
+++ b/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
@@ -79,7 +79,8 @@ const MergeOptions = (
     : (
     <span>
       <SelectableDropdown
-        id="languageDropdown" className='versionMergeDropdown'
+        id='vmergeDropdown'
+        className='versionMergeDropdown'
         onSelectDropdownItem={onLanguageSelection}
         selectedValue={mergeOptions.selectedLanguage}
         valueToDisplay={localeToDisplay}
@@ -90,7 +91,7 @@ const MergeOptions = (
     )
   return (
     <div>
-      <p className="intro">
+      <p className="intro mb2">
         Copy existing <strong>translations</strong> from similar documents
         in other projects and versions into this project version.
         <Link useHref link={docLink} target="_blank">
@@ -100,7 +101,7 @@ const MergeOptions = (
           </span>
         </Link>
       </p>
-      <Collapse>
+      <Collapse className="mb2">
         <Panel header={
           <span>
             Matching phrases are found in the selected projects and
@@ -137,8 +138,8 @@ const MergeOptions = (
         </Panel>
       </Col>
       <Col>
-        <p className="lead">For every potential translation:</p>
-        <div className="VersionMergeTitle u-textNewBlue">
+        <p className="b f4">For every potential translation:</p>
+        <div className="di text-newblue">
           If text is less than
           <SelectableDropdown title={mergeOptions.matchPercentage + '%'}
             id="percentDropdown" className='versionMergeDropdown'
@@ -148,7 +149,7 @@ const MergeOptions = (
             values={[80, 90, 100]} /> similar, don't use it.
         </div>
       </Col>
-      <Col z>
+      <Col>
         <TMMergeProjectSources {...{projectVersions, fetchingProject,
           mergeOptions, onFromAllProjectsChange, onProjectSearchChange,
           flushProjectSearch, onAllVersionCheckboxChange,
diff --git a/server/zanata-frontend/src/app/styles/ant-theme-vars.less b/server/zanata-frontend/src/app/styles/ant-theme-vars.less
index 7f5bc99ee8..1727c83813 100644
--- a/server/zanata-frontend/src/app/styles/ant-theme-vars.less
+++ b/server/zanata-frontend/src/app/styles/ant-theme-vars.less
@@ -77,6 +77,10 @@
   color: @warning-color;
 }
 
+.txt-newblue {
+  color: @processing-color;
+}
+
 .txt-error {
   color: @error-color;
 }