Merge branch 'master' into fixes-439

quran · Jan 9, 2017 · 868662f · 868662f
2 parents caf33ac + df624a9
commit 868662f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/containers/Surah/index.js b/src/containers/Surah/index.js
@@ -234,7 +234,7 @@ class Surah extends Component {
       return `Surat ${surah.name.simple} [verse ${params.range}]`;
     }
 
-    return `${surah.info.shortDescription} This Surah has ${surah.ayat} ayahs and resides between pages ${surah.page[0]} to ${surah.page[1]} in the Quran.`; // eslint-disable-line max-len
+    return `${surah.info ? surah.info.shortDescription : ''} This Surah has ${surah.ayat} ayahs and resides between pages ${surah.page[0]} to ${surah.page[1]} in the Quran.`; // eslint-disable-line max-len
   }
 
   renderPagination() {

diff --git a/src/styles/bootstrap.config.js b/src/styles/bootstrap.config.js
@@ -7,12 +7,12 @@ module.exports = {
   "scripts": {
     "transition": false,
     "alert": false,
-    "button": false,
+    "button": true,
     "carousel": false,
     "collapse": false,
-    "dropdown": false,
+    "dropdown": true,
     "modal": false,
-    "tooltip": false,
+    "tooltip": true,
     "popover": false,
     "scrollspy": false,
     "tab": false,