Merge branch 'module_blog' into dev

2016-09-20 15:34:44 +02:00
parent 8bd30d0301 65e9ca1c32
commit bbffbd5616
64 changed files with 692 additions and 357 deletions
@@ -38,7 +38,7 @@
                            @if (in_array($widget->id, $associatedWidgetIds))
                                <a href="{{route('widgets.deleteAssociation', ['widgetId' => $widget->id, 'widgetArea' => $widgetArea->id])}}"
                                   class="button column confirm large-6 alert">
-                                    <i class="fa fa-remove"></i>
+                                    <i class="fa fa-trash"></i>
                                </a>
                            @else
                                <a href="{{route('widgets.makeAssociation', ['widgetId' => $widget->id, 'widgetArea' => $widgetArea->id])}}"