Merge pull request #268 from CTemplar/dev

v1.1.4
CTemplar · Oct 24, 2018 · 9c7b0df · 9c7b0df
2 parents d87c101 + f80caad
commit 9c7b0df
Show file tree

Hide file tree

Showing 43 changed files with 1,067 additions and 344 deletions.
diff --git a/src/app/blog/shared/blog-grid/blog-grid.component.html b/src/app/blog/shared/blog-grid/blog-grid.component.html
@@ -1,4 +1,4 @@
-<div class="l-block-body pb-5">
+<div class="l-block-body">
   <div class="row justify-content-center">
       <article class="col-md-4 col-sm-6 mb-4" *ngFor="let post of posts">
           <a href="https://blog.ctemplar.com/{{post.slug}}" target="_blank" rel="noopener" class="d-block news-card-holder">
@@ -27,6 +27,10 @@ <h4 class="news-card-title">{{post.name}}</h4>
                         </li>
                     </ul>
                 </footer>
+                <p class="post-meta">
+                    <span class="post-date">{{post.date}}</span>
+                    <span class="post-comments">{{post.comments_count}} Comments</span>
+                </p>
               </div>
           </a>
       </article>

diff --git a/src/app/mail/mail-contact/mail-contact.component.html b/src/app/mail/mail-contact/mail-contact.component.html
@@ -40,7 +40,7 @@
         </nav>
 
         <div class="mailbox-sidebar-footer text-center">
-            <div class="mailbox-sidebar-footer-text mb-0 mb-md-1 visible-in-sm" translate="mail_sidebar.used">Used
+            <div class="mailbox-sidebar-footer-text mb-0 mb-md-1 visible-in-sm" translate="mail_sidebar.used">
                 <div class="text-white mt-1">{{(userState.settings?.used_storage * 1024) | filesize}}</div>
             </div>
             <div class="mailbox-sidebar-footer-text mb-1 hidden-in-sm">

diff --git a/src/app/mail/mail-contact/save-contact/save-contact.component.html b/src/app/mail/mail-contact/save-contact/save-contact.component.html
@@ -11,19 +11,18 @@
         <div class="row align-items-center">
             <div class="col-sm-2 px-2">
                 <label class="form-label mb-sm-0" for="contactName">
-                    <span translate="common.name">Name</span>
-                    <sup>*</sup></label>
+                    <span translate="common.name">Name</span><sup>*</sup></label>
             </div>
             <div class="col-sm-10">
                 <input class="form-control form-control-sm" id="contactName"
                        name="name" required
                        #contactName="ngModel"
                        [(ngModel)]="newContactModel.name"
-                       placeholder="Curtis Scott" type="text"/>
+                       placeholder="Contact Name" type="text"/>
             </div>
         </div>
     </div>
-    <div class="form-group is-repeatable">
+    <div class="form-group is-repeatable add-button">
         <!-- Email validation -->
         <div class="md-errors-spacer" *ngIf="contactEmail.errors">
             <div *ngIf="contactEmail.errors.required">
@@ -44,13 +43,14 @@
                        name="email" required
                        [(ngModel)]="newContactModel.email"
                        #contactEmail="ngModel"
-                       placeholder="Curtis_Scottgmail.com" type="text"
+                       placeholder="Type E-mail" type="text"
                        pattern="^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$"/>
             </div>
+            <button type="button" class="add-button-link"><img src="assets/images/plus@2x.png"></button>
         </div>
     </div>
     <div class="mb-2 hidden-xs-down">&nbsp;</div>
-    <div class="form-group">
+    <div class="form-group add-button">
         <div class="row align-items-center">
             <div class="col-sm-2 px-2">
                 <label class="form-label mb-sm-0" for="contactPhone1" translate="common.phone">Phone</label>
@@ -59,24 +59,26 @@
                 <input class="form-control form-control-sm" id="contactPhone1"
                        name="phone"
                        [(ngModel)]="newContactModel.phone"
-                       placeholder="+73409853498" type="text"/>
+                       placeholder="Phone" type="text"/>
             </div>
+            <button type="button" class="add-button-link"><img src="assets/images/plus@2x.png"></button>
         </div>
     </div>
-    <div class="form-group is-repeatable">
+    <div class="form-group is-repeatable add-button">
         <div class="row align-items-center">
             <div class="col-sm-2 px-2">
                 <label class="form-label mb-sm-0" for="contactPhone2" translate="contacts.phone2">Phone2</label>
             </div>
             <div class="col-sm-10">
-                <input class="form-control form-control-sm" id="contactPhone2" placeholder="+734920"
+                <input class="form-control form-control-sm" id="contactPhone2" placeholder="Phone"
                        name="phone2"
                        [(ngModel)]="newContactModel.phone2"
                        type="text"/>
             </div>
+            <button type="button" class="add-button-link"><img src="assets/images/plus@2x.png"></button>
         </div>
     </div>
-    <div class="form-group is-repeatable">
+    <div class="form-group is-repeatable add-button">
         <div class="row">
             <div class="col-sm-2 px-2">
                 <label class="form-label pt-sm-2 mb-sm-0" for="contactAddress" translate="contacts.address">Address</label>
@@ -87,6 +89,7 @@
                                               [(ngModel)]="newContactModel.address"
                                               rows="3"></textarea>
             </div>
+            <button type="button" class="add-button-link"><img src="assets/images/plus@2x.png"></button>
         </div>
     </div>
     <div class="mb-2 hidden-xs-down">&nbsp;</div>
@@ -96,7 +99,7 @@
                 <label class="form-label pt-sm-2 mb-sm-0" for="contactNote" translate="contacts.note">Note</label>
             </div>
             <div class="col-sm-10">
-                                    <textarea class="form-control form-control-sm resize-off" id="contactNote" placeholder="Note"
+                                    <textarea class="form-control form-control-sm resize-off" id="contactNote" placeholder="A note"
                                               name="note"
                                               [(ngModel)]="newContactModel.note"
                                               rows="3"></textarea>