BookStackApp · ssddanbrown · Feb 17, 2018 · Feb 17, 2018 · Feb 17, 2018
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -2,6 +2,7 @@
 
 use Activity;
 use BookStack\Repos\EntityRepo;
+use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Views;
 
@@ -88,6 +89,27 @@ public function getTranslations()
         ]);
     }
 
+    /**
+     * Get an icon via image request.
+     * Can provide a 'color' parameter with hex value to color the icon.
+     * @param $iconName
+     * @param Request $request
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
+     */
+    public function getIcon($iconName, Request $request)
+    {
+        $attrs = [];
+        if ($request->filled('color')) {
+            $attrs['fill'] = '#' . $request->get('color');
+        }
+
+        $icon = icon($iconName, $attrs);
+        return response($icon, 200, [
+            'Content-Type' => 'image/svg+xml',
+            'Cache-Control' => 'max-age=3600',
+        ]);
+    }
+
     /**
      * Get custom head HTML, Used in ajax calls to show in editor.
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

diff --git a/app/helpers.php b/app/helpers.php
@@ -149,12 +149,18 @@ function theme_path($path = '')
  * Get fetch an SVG icon as a string.
  * Checks for icons defined within a custom theme before defaulting back
  * to the 'resources/assets/icons' folder.
+ *
+ * Returns an empty string if icon file not found.
  * @param $name
  * @param array $attrs
  * @return mixed
  */
 function icon($name, $attrs = [])
 {
+    $attrs = array_merge([
+        'class' => 'svg-icon',
+        'data-icon' => $name
+    ], $attrs);
     $attrString = ' ';
     foreach ($attrs as $attrName => $attr) {
         $attrString .=  $attrName . '="' . $attr . '" ';
@@ -164,6 +170,8 @@ function icon($name, $attrs = [])
     $themeIconPath = theme_path('icons/' . $name . '.svg');
     if ($themeIconPath && file_exists($themeIconPath)) {
         $iconPath = $themeIconPath;
+    } else if (!file_exists($iconPath)) {
+        return '';
     }
 
     $fileContents = file_get_contents($iconPath);

diff --git a/config/app.php b/config/app.php
@@ -4,8 +4,6 @@
 
     'env' => env('APP_ENV', 'production'),
 
-    'editor' => env('APP_EDITOR', 'html'),
-
     'views' => [
         'books' => env('APP_VIEWS_BOOKS', 'list')
     ],

diff --git a/public/libs/material-design-iconic-font/css/material-design-iconic-font.min.css b/public/libs/material-design-iconic-font/css/material-design-iconic-font.min.css
diff --git a/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot b/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot
diff --git a/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg b/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg
diff --git a/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf b/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf
diff --git a/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff b/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff
diff --git a/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 b/public/libs/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2
diff --git a/public/system_images/drawing.svg b/public/system_images/drawing.svg
diff --git a/readme.md b/readme.md
@@ -103,7 +103,7 @@ These are the great open-source projects used to help build BookStack:
 * [Vue.js](http://vuejs.org/)
 * [Axios](https://github.com/mzabriskie/axios)
 * [jQuery Sortable](https://johnny.github.io/jquery-sortable/)
-* [Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font/icons.html)
+* [Google Material Icons](https://material.io/icons/)
 * [Dropzone.js](http://www.dropzonejs.com/)
 * [clipboard.js](https://clipboardjs.com/)
 * [TinyColorPicker](http://www.dematte.at/tinyColorPicker/index.html)

diff --git a/resources/assets/icons/add-circle.svg b/resources/assets/icons/add-circle.svg
diff --git a/resources/assets/icons/add.svg b/resources/assets/icons/add.svg
diff --git a/resources/assets/icons/attach.svg b/resources/assets/icons/attach.svg
diff --git a/resources/assets/icons/azure.svg → resources/assets/icons/auth/azure.svg b/resources/assets/icons/azure.svg → resources/assets/icons/auth/azure.svg
diff --git a/resources/assets/icons/facebook.svg → resources/assets/icons/auth/facebook.svg b/resources/assets/icons/facebook.svg → resources/assets/icons/auth/facebook.svg
diff --git a/resources/assets/icons/github.svg → resources/assets/icons/auth/github.svg b/resources/assets/icons/github.svg → resources/assets/icons/auth/github.svg
diff --git a/resources/assets/icons/gitlab.svg → resources/assets/icons/auth/gitlab.svg b/resources/assets/icons/gitlab.svg → resources/assets/icons/auth/gitlab.svg
diff --git a/resources/assets/icons/google.svg → resources/assets/icons/auth/google.svg b/resources/assets/icons/google.svg → resources/assets/icons/auth/google.svg
diff --git a/resources/assets/icons/okta.svg → resources/assets/icons/auth/okta.svg b/resources/assets/icons/okta.svg → resources/assets/icons/auth/okta.svg
diff --git a/resources/assets/icons/slack.svg → resources/assets/icons/auth/slack.svg b/resources/assets/icons/slack.svg → resources/assets/icons/auth/slack.svg
diff --git a/resources/assets/icons/twitch.svg → resources/assets/icons/auth/twitch.svg b/resources/assets/icons/twitch.svg → resources/assets/icons/auth/twitch.svg
diff --git a/resources/assets/icons/twitter.svg → resources/assets/icons/auth/twitter.svg b/resources/assets/icons/twitter.svg → resources/assets/icons/auth/twitter.svg
diff --git a/resources/assets/icons/back.svg b/resources/assets/icons/back.svg
diff --git a/resources/assets/icons/book.svg b/resources/assets/icons/book.svg
diff --git a/resources/assets/icons/cancel.svg b/resources/assets/icons/cancel.svg
diff --git a/resources/assets/icons/caret-down.svg b/resources/assets/icons/caret-down.svg
diff --git a/resources/assets/icons/caret-left-circle.svg b/resources/assets/icons/caret-left-circle.svg
diff --git a/resources/assets/icons/caret-right-circle.svg b/resources/assets/icons/caret-right-circle.svg
diff --git a/resources/assets/icons/caret-right.svg b/resources/assets/icons/caret-right.svg
diff --git a/resources/assets/icons/chapter.svg b/resources/assets/icons/chapter.svg
diff --git a/resources/assets/icons/check-circle.svg b/resources/assets/icons/check-circle.svg
diff --git a/resources/assets/icons/chevron-up.svg b/resources/assets/icons/chevron-up.svg
diff --git a/resources/assets/icons/close.svg b/resources/assets/icons/close.svg
diff --git a/resources/assets/icons/comment.svg b/resources/assets/icons/comment.svg
diff --git a/resources/assets/icons/copy.svg b/resources/assets/icons/copy.svg
diff --git a/resources/assets/icons/danger.svg b/resources/assets/icons/danger.svg
diff --git a/resources/assets/icons/delete.svg b/resources/assets/icons/delete.svg
diff --git a/resources/assets/icons/drawing.svg b/resources/assets/icons/drawing.svg
diff --git a/resources/assets/icons/edit.svg b/resources/assets/icons/edit.svg
diff --git a/resources/assets/icons/expand-text.svg b/resources/assets/icons/expand-text.svg
diff --git a/resources/assets/icons/export.svg b/resources/assets/icons/export.svg
diff --git a/resources/assets/icons/file.svg b/resources/assets/icons/file.svg
diff --git a/resources/assets/icons/folder.svg b/resources/assets/icons/folder.svg
diff --git a/resources/assets/icons/grid.svg b/resources/assets/icons/grid.svg
diff --git a/resources/assets/icons/grip.svg b/resources/assets/icons/grip.svg
diff --git a/resources/assets/icons/history.svg b/resources/assets/icons/history.svg
diff --git a/resources/assets/icons/image.svg b/resources/assets/icons/image.svg
diff --git a/resources/assets/icons/images.svg b/resources/assets/icons/images.svg
diff --git a/resources/assets/icons/include.svg b/resources/assets/icons/include.svg
diff --git a/resources/assets/icons/info-filled.svg b/resources/assets/icons/info-filled.svg
diff --git a/resources/assets/icons/info.svg b/resources/assets/icons/info.svg
diff --git a/resources/assets/icons/link.svg b/resources/assets/icons/link.svg
diff --git a/resources/assets/icons/list.svg b/resources/assets/icons/list.svg
diff --git a/resources/assets/icons/lock-open.svg b/resources/assets/icons/lock-open.svg