Merge branch 'release/1.3.0'

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.3.0
+## 11/18/2015
+
+1. [](#new)
+    * SimpleForm replaced with Forms plugin
+2. [](#bugfix)
+    * Admin plugin bugfixes
+
 # v1.2.0
 ## 09/18/2015
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Deliver
-version: 1.2.0
+version: 1.3.0
 description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme."
 icon: newspaper-o
 author:

css-compiled/template.css

@@ -586,8 +586,8 @@ textarea, input[type="email"], input[type="number"], input[type="password"], inp
 
 .form-field .required {
   color: #F3443F;
-  font-size: 3rem;
-  line-height: 3rem;
+  font-size: 2rem;
+  line-height: 2rem;
   vertical-align: top;
   height: 1.5rem;
   display: inline-block; }

scss/template/_forms.scss

@@ -25,8 +25,8 @@ label {
 .form-field {
 	.required {
 		color: #F3443F;
-		font-size: $core-font-size + 2rem;
-		line-height: $core-font-size + 2rem;
+		font-size: $core-font-size + 1rem;
+		line-height: $core-font-size + 1rem;
 		vertical-align: top;
 		height: 1.5rem;
 		display: inline-block;

templates/form.html.twig

@@ -1,8 +0,0 @@
-{% extends 'partials/base.html.twig' %}
-
-{% block content %}
-
-    {{ content }}
-    {% include "forms/form.html.twig" %}
-
-{% endblock %}

templates/formdata.html.twig

@@ -1,12 +1,12 @@
 {% extends 'partials/base.html.twig' %}
 
 {% block content %}
-
+  <div class="modular-row bottom ">
     {{ content }}
 
-    <div class="alert">{{ form.message }}</div>
+    <h2>{{ form.message }}</h2>
     <p>Here is the summary of what you wrote to us:</p>
 
     {% include "forms/data.html.twig" %}
-
+</div>
 {% endblock %}

templates/modular/form.html.twig

@@ -0,0 +1,10 @@
+<div class="modular-row contact {{ page.header.class }}">
+    <div class="g-grid pure-g-r">
+        <div id="listing" class="g-block pure-u-2-3">
+            {% include "forms/form.html.twig" %}
+        </div>
+        <div id="sidebar" class="g-block size-1-3 pure-u-1-3">
+            {{ page.content }}
+        </div>
+    </div>
+</div>