From 11373ad5ad856adfb0fff980c5ae9b893507bf5e Mon Sep 17 00:00:00 2001
From: Le Deng <z00382545@z00382545-mac.local>
Date: Sun, 5 Mar 2017 14:42:47 -0500
Subject: [PATCH] latest

---
 .../components/nav-bar/nav-bar.component.css  | 10 ++--
 .../components/nav-bar/nav-bar.component.html | 46 ++-----------------
 admin-portal/src/styles.css                   | 18 +++++++-
 bookstore-api/.idea/workspace.xml             |  4 +-
 4 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/admin-portal/src/app/components/nav-bar/nav-bar.component.css b/admin-portal/src/app/components/nav-bar/nav-bar.component.css
index 7ab073e..25bdd37 100644
--- a/admin-portal/src/app/components/nav-bar/nav-bar.component.css
+++ b/admin-portal/src/app/components/nav-bar/nav-bar.component.css
@@ -1,9 +1,7 @@
-.example-container {
-  width: 500px;
+.example-icon {
+  padding: 0 14px;
 }
 
-.example-button-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
+.example-spacer {
+  flex: 1 1 auto;
 }
\ No newline at end of file
diff --git a/admin-portal/src/app/components/nav-bar/nav-bar.component.html b/admin-portal/src/app/components/nav-bar/nav-bar.component.html
index 30be302..a3a7fe5 100644
--- a/admin-portal/src/app/components/nav-bar/nav-bar.component.html
+++ b/admin-portal/src/app/components/nav-bar/nav-bar.component.html
@@ -1,42 +1,4 @@
-<md-menu #appMenu="mdMenu">
-  <button md-menu-item> Settings </button>
-  <button md-menu-item> Help </button>
-</md-menu>
-
-<button md-icon-button [mdMenuTriggerFor]="appMenu">
-   <md-icon>more_vert</md-icon>
-</button>
-
-<md-select placeholder="Favorite food">
-  <md-option *ngFor="let food of foods" [value]="food.value">
-    {{ food.viewValue }}
-  </md-option>
-</md-select>
-
-<md-grid-list cols="4" rowHeight="100px">
-  <md-grid-tile
-      *ngFor="let tile of tiles"
-      [colspan]="tile.cols"
-      [rowspan]="tile.rows"
-      [style.background]="tile.color">
-    {{tile.text}}
-  </md-grid-tile>
-</md-grid-list>
-
-<div class="example-container">
-  <h3>Normal Buttons</h3>
-  <div class="button-row">
-    <button md-button>Flat button</button>
-    <button md-raised-button>Raised button</button>
-    <button md-fab><md-icon>check</md-icon></button>
-    <button md-mini-fab><md-icon>check</md-icon></button>
-  </div>
-
-  <h3>Link Buttons</h3>
-  <div class="example-button-row">
-    <a md-button routerLink=".">Flat button</a>
-    <a md-raised-button routerLink=".">Raised button</a>
-    <a md-fab routerLink="."><md-icon>check</md-icon></a>
-    <a md-mini-fab routerLink="."><md-icon>check</md-icon></a>
-  </div>
-</div>
\ No newline at end of file
+<md-toolbar [style.background]="'#3175e2'">
+    <h3 [style.color]="'white'">ADMIN PORTAL</h3>
+    <span class="example-spacer"></span>
+</md-toolbar>
\ No newline at end of file
diff --git a/admin-portal/src/styles.css b/admin-portal/src/styles.css
index e7b9b12..3ef7aa2 100644
--- a/admin-portal/src/styles.css
+++ b/admin-portal/src/styles.css
@@ -1,2 +1,18 @@
 /* You can add global styles to this file, and also import other style files */
-@import '~@angular/material/core/theming/prebuilt/deeppurple-amber.css';
\ No newline at end of file
+@import '~@angular/material/core/theming/prebuilt/deeppurple-amber.css';
+
+.box {
+	border: 1px solid black;
+}
+
+hr {
+    border: none;
+    height: 1px;
+    /* Set the hr color */
+    color: #333; /* old IE */
+    background-color: #333; /* Modern Browsers */
+}
+
+body {
+    font-family: Tahoma, Serif;
+}
\ No newline at end of file
diff --git a/bookstore-api/.idea/workspace.xml b/bookstore-api/.idea/workspace.xml
index 89fc6ea..676d519 100644
--- a/bookstore-api/.idea/workspace.xml
+++ b/bookstore-api/.idea/workspace.xml
@@ -695,12 +695,12 @@
       <workItem from="1486538831944" duration="450000" />
       <workItem from="1488378219247" duration="650000" />
       <workItem from="1488461561430" duration="18419000" />
-      <workItem from="1488731165185" duration="698000" />
+      <workItem from="1488731165185" duration="1670000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="62710000" />
+    <option name="totallyTimeSpent" value="63682000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="50" y="23" width="1351" height="797" extended-state="0" />