Merge pull request #839 from aios/development

Make Kudos
LaravelRUS · May 21, 2018 · 41f2d52 · 41f2d52
2 parents 44d9704 + d2272ea
commit 41f2d52
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/resources/views/default/form/element/wysiwyg.blade.php b/resources/views/default/form/element/wysiwyg.blade.php
@@ -18,4 +18,4 @@
     {!! Form::textarea($name, $value, $attributes) !!}
 
     @include(app('sleeping_owl.template')->getViewPath('form.element.partials.errors'))
-</div>
+</div>
diff --git a/src/Form/FormPanel.php b/src/Form/FormPanel.php
@@ -93,7 +93,7 @@ public function addBody($items)
         }
 
         $class = $this->getElements()->last();
-        if (is_object($class) and get_class($class) === Body::class) {
+        if (is_object($class) && get_class($class) === Body::class) {
             $this->addElement(new Html('<hr />'));
         }
 

diff --git a/src/Navigation/Page.php b/src/Navigation/Page.php
@@ -131,7 +131,7 @@ public function getAccessLogic()
      */
     public function render($view = null)
     {
-        if ($this->hasChild() and ! $this->hasClassProperty($class = config('navigation.class.has_child', 'treeview'))) {
+        if ($this->hasChild() && ! $this->hasClassProperty($class = config('navigation.class.has_child', 'treeview'))) {
             $this->setHtmlAttribute('class', $class);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,4 @@ @@
         {!! Form::textarea($name, $value, $attributes) !!}
         @include(app('sleeping_owl.template')->getViewPath('form.element.partials.errors'))
-    </div>
+    </div>