Fixed cutting text and pr comments

quran · Apr 8, 2017 · bc19531 · bc19531
1 parent e2f7be2
commit bc19531
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 180 deletions.
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "promise": "7.1.1",
     "proxy-middleware": "0.14.0",
     "qs": "6.2.1",
-    "quran-components": "^0.0.65",
+    "quran-components": "^0.0.66",
     "raven": "1.1.1",
     "raw-loader": "0.5.1",
     "react": "15.4.1",

diff --git a/src/components/GlobalNav/Surah/index.js b/src/components/GlobalNav/Surah/index.js
@@ -96,7 +96,7 @@ class GlobalNavSurah extends Component {
             toggle={<noscript />}
           >
             <div style={{ padding: 15 }}>
-              <h4>Settings</h4>
+              <h4><LocaleFormattedMessage id="setting.title" defaultMessage="Settings" /></h4>
             </div>
             <Menu>
               <InformationToggle
@@ -118,10 +118,6 @@ class GlobalNavSurah extends Component {
               <ContentDropdown
                 onOptionChange={this.handleOptionChange}
               />
-              <hr />
-              <div className={styles.title}>
-                <LocaleFormattedMessage id="setting.tooltip.title" defaultMessage="Tooltip Content" />
-              </div>
               <TooltipDropdown
                 tooltip={options.tooltip}
                 onOptionChange={setOption}

diff --git a/src/components/NightModeToggle/index.js b/src/components/NightModeToggle/index.js
@@ -35,7 +35,7 @@ class NightModeToggle extends Component {
         icon={<i className="ss-icon ss-lightbulb vertical-align-middle" />}
         onClick={this.toggleNightMode}
       >
-        <LocaleFormattedMessage id="settings.nightMode" defaultMessage="Night Mode" />
+        <LocaleFormattedMessage id="setting.nightMode" defaultMessage="Night Mode" />
       </MenuItem>
     );
   }

diff --git a/src/components/Radio/index.js b/src/components/Radio/index.js
diff --git a/src/components/Radio/style.scss b/src/components/Radio/style.scss
diff --git a/src/components/ReadingModeToggle/index.js b/src/components/ReadingModeToggle/index.js
@@ -7,7 +7,7 @@ const ReadingModeToggle = ({ onToggle, isToggled }) => (
     icon={<i className="ss-icon ss-openbook vertical-align-middle" />}
     onClick={() => onToggle({ isReadingMode: !isToggled })}
   >
-    <LocaleFormattedMessage id="settings.reading" defaultMessage="Reading" />
+    <LocaleFormattedMessage id="setting.reading" defaultMessage="Reading" />
   </MenuItem>
 );
 

diff --git a/src/components/ReciterDropdown/index.js b/src/components/ReciterDropdown/index.js
@@ -35,7 +35,9 @@ class ReciterDropdown extends Component {
       >
         <Radio
           checked={slug.id === audio}
-          id={slug.id} name="reciter" handleChange={() => onOptionChange({ audio: slug.id })}
+          id={slug.id}
+          name="reciter"
+          handleChange={() => onOptionChange({ audio: slug.id })}
         >
           {slug.reciterNameEng} {slug.style ? `(${slug.style})` : ''}
         </Radio>

diff --git a/src/components/TooltipDropdown/index.js b/src/components/TooltipDropdown/index.js
@@ -1,6 +1,7 @@
 import React, { PropTypes } from 'react';
-
-import Radio from 'components/Radio';
+import Menu, { MenuItem } from 'quran-components/lib/Menu';
+import Radio from 'quran-components/lib/Radio';
+import Icon from 'quran-components/lib/Icon';
 import LocaleFormattedMessage from 'components/LocaleFormattedMessage';
 
 const TooltipDropdown = ({ tooltip, onOptionChange }) => {
@@ -9,15 +10,29 @@ const TooltipDropdown = ({ tooltip, onOptionChange }) => {
   });
 
   const list = ['translation', 'transliteration'].map(type => (
-    <Radio key={type} id={type} name="type" checked={type === tooltip} handleChange={() => handleOptionChange(type)}>
-      <LocaleFormattedMessage id={`setting.tooltip.${type}`} defaultMessage={type.toUpperCase()} />
-    </Radio>
+    <MenuItem key={type}>
+      <Radio
+        id={type}
+        name="type"
+        checked={type === tooltip}
+        handleChange={() => handleOptionChange(type)}
+      >
+        <LocaleFormattedMessage id={`setting.tooltip.${type}`} defaultMessage={type.toUpperCase()} />
+      </Radio>
+    </MenuItem>
   ));
 
   return (
-    <div>
-      {list}
-    </div>
+    <MenuItem
+      icon={<Icon type="globe" />}
+      menu={
+        <Menu>
+          {list}
+        </Menu>
+      }
+    >
+      <LocaleFormattedMessage id="setting.tooltip.title" defaultMessage="Tooltip Content" />
+    </MenuItem>
   );
 };
 

diff --git a/yarn.lock b/yarn.lock
@@ -7067,9 +7067,9 @@ querystringify@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
 
-quran-components@^0.0.65:
-  version "0.0.65"
-  resolved "https://registry.yarnpkg.com/quran-components/-/quran-components-0.0.65.tgz#39b81221d7c550079b019a24d507ce5c1dec011c"
+quran-components@^0.0.66:
+  version "0.0.66"
+  resolved "https://registry.yarnpkg.com/quran-components/-/quran-components-0.0.66.tgz#6ed563ee77b30365d910fd807be20e90d1e84c10"
   dependencies:
     react-icons "^2.2.3"
     react-tether "^0.5.6"