1 files changed, 64 insertions, 31 deletions
diff --git a/templates/webmail/writemail.html.ep b/templates/webmail/writemail.html.ep
index 9d148c1..95b9cf8 100644
--- a/templates/webmail/writemail.html.ep
+++ b/templates/webmail/writemail.html.ep
@@ -1,47 +1,80 @@
 % layout 'mainlayout';
 
-<div class="jwm-base">
+<div class="section container">
 
-  <h1>Write Message</h1>
+  <h1 class=title>Write Message</h1>
 
   % if (my $msg = stash('warning')) {
-    <p class=warn> <%= $msg %> </p>
+    <p class=message> <%= $msg %> </p>
   % }
 
-  %= form_for '' => (method => 'post') => (enctype => 'multipart/form-data') => (class => 'pure-form pure-form-stacked') => begin
-  <fieldset>
-
-    %= label_for mail => ucfirst l 'send_to'
-    %= email_field 'to' => (id => 'mail') => (multiple => '') => (required => '')
-
-    %= label_for subject => ucfirst l 'subject'
-    %= text_field 'subject' => (required => '')
-
-    %= label_for cc => 'CC'
-    %= email_field 'cc' => (multiple => '')
-
-    %= label_for bcc => 'BCC'
-    %= email_field 'bcc' => (multiple => '')
-
-    %= label_for back_to => ucfirst l 'answer_to'
-    %= email_field 'back_to'
-
-    %= label_for txt => ucfirst l 'content'
-    %# text_area body => (cols => 80) => (rows => 24) => (name => 'txt')
-    %= text_area body => (style => 'width: 100%') => (rows => 24) => (name => 'txt')
-
-    %= label_for attach => ucfirst l 'attach file'
-    %= file_field 'attach'
-
-    %= submit_button l('send') => (class => 'pure-button pure-button-primary')
+  %= form_for '' => (method => 'post') => (enctype => 'multipart/form-data') => (class => '') => begin
+
+    <div class=field>
+    %= label_for mail => ucfirst l('send_to') => (class => 'label')
+      <div class=control>
+      %= email_field 'to' => (id => 'mail') => (multiple => '') => (required => '') => (class => 'input')
+      </div>
+    </div>
+
+    <div class=field>
+    %= label_for subject => ucfirst l('subject') => (class => 'label')
+      <div class=control>
+      %= text_field 'subject' => (required => '') => (class => 'input')
+      </div>
+    </div>
+
+    <div class=field>
+    %= label_for cc => 'CC' => (class => 'label')
+      <div class=control>
+      %= email_field 'cc' => (multiple => '') => (class => 'input')
+      </div>
+    </div>
+
+    <div class=field>
+    %= label_for bcc => 'BCC' => (class => 'label')
+      <div class=control>
+      %= email_field 'bcc' => (multiple => '') => (class => 'input')
+      </div>
+    </div>
+
+    <div class=field>
+    %= label_for back_to => ucfirst l('answer_to') => (class => 'label')
+      <div class=control>
+      %= email_field 'back_to' => (class => 'input')
+      </div>
+    </div>
+
+    <div class=field>
+    %= label_for txt => ucfirst l('content') => (class => 'label')
+    %= text_area body => (rows => 24) => (name => 'txt') => (class => 'textarea')
+    </div>
+
+    <div class=field>
+      <div class=file>
+        <label class=file-label>
+          %= file_field 'attach' => (class => 'file-input')
+          <div class="file-cta">
+            %= tag span => (class => 'file-label') => begin
+            %= ucfirst l('attach file')
+            % end
+          </div>
+        </label>
+      </div>
+    </div>
+
+    <div class=field>
+      <div class=control>
+      %= submit_button l('send') => (class => 'button')
+      </div>
+    </div>
 
     %= csrf_field
 
-  </fieldset>
   % end
 
   <nav>
-    <a href="javascript:history.back()" class="pure-button"> <%= ucfirst l 'back' %> </a>
+    <a href="javascript:history.back()" class="button"> <%= ucfirst l 'back' %> </a>
   </nav>
 
 </div>