Merge branch 'dev' into refactoring

This commit is contained in:
Michal Kváček
2016-11-23 01:05:22 +01:00
3 changed files with 27 additions and 4 deletions
@@ -52,7 +52,7 @@ class HtmlCode implements WidgetRenderer
*/
public static function renderEditForm(Widget $widget)
{
$settings = json_decode($widget->settings);
$settings = $widget->settings;
return view('admin.widgets.htmlCode.edit', ['widget' => $widget, 'settings' => $settings]);
}
}
}
@@ -59,7 +59,7 @@ class Presenter implements WidgetRenderer
*/
public static function renderEditForm(Widget $widget)
{
$settings = json_decode($widget->settings);
$settings = $widget->settings;
return view('template::admin.widgets.onePageMenu.edit', ['widget' => $widget, 'settings' => $settings]);
}
}
}
+23
View File
@@ -80,8 +80,31 @@ textarea.materialize-textarea.valid:not([readonly]){
#index-banner .section {
top: 0;
}
.parallax-container .section {
position: absolute;
top: 20%;
}
.contact-form-widget {
margin-bottom: 25px;
}
.company-data {
text-align: center;
}
.company-data span {
display: block;
}
.section .row div.col.s12 img {
display: block;
margin: 15px auto;
}
}
.section .row>div {font-size: 1.4em; margin-bottom: 20px;}
.icon-block {
padding: 0 15px;
}