Merge commit 'ac2c63cf08ca689d08ed0a47c43f8012ed096875' into staging

# Conflicts: # src/app/inbox/inbox.component.html # src/favicon.ico
mailchain · Nov 24, 2019 · d6cfe4c · d6cfe4c
2 parents 9b718a7 + ac2c63c
commit d6cfe4c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mailchain-web",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/src/app/inbox/inbox.component.html b/src/app/inbox/inbox.component.html
@@ -1,6 +1,8 @@
 <div class="row">
   <div class="col-md-6">
-    <h1 class="page-title"><img src="../../assets/logo.png"> Mailchain</h1>
+      <h1 class="page-title text-primary">
+        <img src="../../assets/mailchain_logo_text.png" alt="Mailchain" class="header-logo">
+      </h1>
   </div>
   <div class="col-md-6">
     <div class="row">
@@ -27,7 +29,7 @@ <h1 class="page-title"><img src="../../assets/logo.png"> Mailchain</h1>
     <div id="actionButtons" class="mb-4">
       <button class="btn btn-secondary btn-block" type="button" id="fetch-messages-btn" (click)="getMails(false)"
         [disabled]="fetchMessagesDisabled">{{fetchMessagesText}}</button>
-      <a class="btn btn-danger btn-block" href="#" id="compose" (click)="composeMessage()">Compose</a>
+      <a class="btn btn-primary btn-block" href="#" id="compose" (click)="composeMessage()">Compose</a>
     </div>
 
     <div class="card">

diff --git a/src/app/inbox/inbox.component.scss b/src/app/inbox/inbox.component.scss
@@ -15,4 +15,8 @@
 .accountNameRecord {
   display: block;
   padding: 0 1rem 0.5rem 1rem;
+}
+
+.header-logo {
+  max-width: 180px;
 }
diff --git a/src/assets/mailchain_logo_text.png b/src/assets/mailchain_logo_text.png
diff --git a/src/favicon.ico b/src/favicon.ico
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
@@ -2,4 +2,21 @@ $fa-font-path: "~font-awesome/fonts";
 
 
 $footer-height: 60px;
-$footer-margin-offset: 45px;
+$footer-margin-offset: 45px;
+
+// Color variables
+$custom:                #13ce67;
+$white:                 #ffffff;
+
+$primary:               #58638a;
+$success:               #519965;
+$info:                  #1f1420;
+$warning:               #ce892d;
+$danger:                #f44336;
+$dark:                  #0f1f3e;
+$light:                 #f8f9fa;
+
+// $background:            #B2B6CC;
+// #A84258 // burgundy red
+// #7983A3 // light purple
+// #F5F7F5 // light grey