Merge branch 'develop'

joedixon · Oct 31, 2018 · 3a9fda3 · 3a9fda3
2 parents 422dd4c + 4fc5910
commit 3a9fda3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/public/assets/css/main.css b/public/assets/css/main.css
diff --git a/resources/assets/css/main.css b/resources/assets/css/main.css
@@ -146,6 +146,7 @@ nav a:hover {
 }
 
 .panel-body td textarea {
+    overflow-wrap: inherit;
     @apply border-none resize-none bg-transparent text-grey-darker w-full font-thin h-auto p-0
 }
 

diff --git a/src/Drivers/File.php b/src/Drivers/File.php
@@ -36,7 +36,7 @@ public function allLanguages()
         $directories = Collection::make($this->disk->directories($this->languageFilesPath));
 
         return $directories->mapWithKeys(function ($directory) {
-            $language = array_last(explode('/', $directory));
+            $language = basename($directory);
 
             return [$language => $language];
         })->filter(function ($language) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,6 +146,7 @@ nav a:hover { @@
     }
     .panel-body td textarea {
+        overflow-wrap: inherit;
         @apply border-none resize-none bg-transparent text-grey-darker w-full font-thin h-auto p-0
     }
@@ Expand Down @@