From 509a15562096622bc8700e02f03e8b8271eb6f31 Mon Sep 17 00:00:00 2001
From: Kevin Rose <krose33@gatech.edu>
Date: Wed, 20 Sep 2017 12:32:05 -0400
Subject: [PATCH 1/5] separated the md-content elements in cacheDisplay.html so
 that M.A.Q. doesnt have the dark theme

---
 src/cacheDisplay.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/cacheDisplay.html b/src/cacheDisplay.html
index c208fd0..8ce0e26 100644
--- a/src/cacheDisplay.html
+++ b/src/cacheDisplay.html
@@ -28,9 +28,9 @@
         <!--</div>-->
 
         <!--Mode code, but cache levels are different sizes-->
-        <div ng-app="Simulator" ng-controller="IndexController" layout="inline">
+        <div layout="inline">
             <!--L1-->
-            <md-card ng-show="showCache[0]" ng-click="$ctrl.clickCache(1)" flex="40">
+            <md-card ng-show="showCache[0]" flex="40">
                 <md-card-title layout="column">
                     <md-card-title-text>
                         <div layout="row" layout-align="space-between">
@@ -47,12 +47,11 @@
                         <div class="md-media-lg card-media"></div>
                     </md-card-title-media>
                     <md-button ng-click="$ctrl.removeCache(0)" ng-disabled="$ctrl.disableDeleteCache"><i class="material-icons">delete</i></md-button>
-
                 </md-card-title>
             </md-card>
 
             <!--L2-->
-            <md-card ng-show="showCache[1]" ng-click="$ctrl.clickCache(2)" flex>
+            <md-card ng-show="showCache[1]" flex>
                 <md-card-title layout="column">
                     <md-card-title-text>
                         <div layout="row" layout-align="space-between">
@@ -72,11 +71,10 @@
                     <md-button ng-click="$ctrl.removeCache(1)"><i class="material-icons">delete</i></md-button>
                 </md-card-title>
             </md-card>
-
         </div>
-        <div ng-controller="IndexController" layout="column">
+        <div layout="column">
             <!--L3-->
-            <md-card ng-show="showCache[2]" ng-click="$ctrl.clickCache(3)">
+            <md-card ng-show="showCache[2]">
                 <md-card-title layout="column">
                     <md-card-title-text>
                         <div layout="row" layout-align="space-between">
@@ -157,6 +155,8 @@
                 <md-subheader class="md-no-sticky">{{$ctrl.fileName}}</md-subheader>
                 <md-button class="md-primary md-raised" ng-click="$ctrl.handleUpload()" ng-disabled="$ctrl.fileName.length != 0" type="submit" style="margin-right: 0;">Upload</md-button>
             </md-content>
+        </md-content>
+        <md-content layout="column" layout-padding class="md-inline-form" flex>
             <md-subheader class="md-no-sticky">Memory Access Queue</md-subheader>
             <md-table-container style="height:150px">
                 <table md-table>
@@ -178,7 +178,8 @@
                     </tbody>
                 </table>
             </md-table-container>
-
+        </md-content>
+        <md-content layout="column" layout-padding class="md-inline-form" md-theme="docs-dark" flex>
             <!-- Control Flow Buttons -->
             <md-content layout="row" layout-align="space-around center">
                 <md-button class="md-icon-button"><i class="material-icons">skip_previous</i></md-button>

From 05dc378cfebe5f10a89ad69b1dc18cd0b333fde3 Mon Sep 17 00:00:00 2001
From: Kevin Rose <krose33@gatech.edu>
Date: Wed, 20 Sep 2017 14:02:33 -0400
Subject: [PATCH 2/5] update PR to not overwrite clickable cache display
 functionality

---
 src/cacheDisplay.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cacheDisplay.html b/src/cacheDisplay.html
index 8ce0e26..4726025 100644
--- a/src/cacheDisplay.html
+++ b/src/cacheDisplay.html
@@ -28,9 +28,9 @@
         <!--</div>-->
 
         <!--Mode code, but cache levels are different sizes-->
-        <div layout="inline">
+        <div ng-app="Simulator" ng-controller="IndexController" layout="inline">
             <!--L1-->
-            <md-card ng-show="showCache[0]" flex="40">
+            <md-card ng-show="showCache[0]" ng-click="$ctrl.clickCache(1)" flex="40">
                 <md-card-title layout="column">
                     <md-card-title-text>
                         <div layout="row" layout-align="space-between">
@@ -51,7 +51,7 @@
             </md-card>
 
             <!--L2-->
-            <md-card ng-show="showCache[1]" flex>
+            <md-card ng-show="showCache[1]" ng-click="$ctrl.clickCache(2)" flex>
                 <md-card-title layout="column">
                     <md-card-title-text>
                         <div layout="row" layout-align="space-between">
@@ -72,11 +72,11 @@
                 </md-card-title>
             </md-card>
         </div>
-        <div layout="column">
+        <div ng-controller="IndexController" layout="column">
             <!--L3-->
             <md-card ng-show="showCache[2]">
                 <md-card-title layout="column">
-                    <md-card-title-text>
+                    <md-card ng-show="showCache[2]" ng-click="$ctrl.clickCache(3)">
                         <div layout="row" layout-align="space-between">
                             <div>
                                 <span class="md-headline">{{$ctrl.caches[2].title}}</span>

From c70637ed85dc4987581f102b3adc98a114d9d19a Mon Sep 17 00:00:00 2001
From: Kevin Rose <krose33@gatech.edu>
Date: Wed, 20 Sep 2017 14:03:59 -0400
Subject: [PATCH 3/5] whoops

---
 src/cacheDisplay.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cacheDisplay.html b/src/cacheDisplay.html
index 4726025..5ba4c5c 100644
--- a/src/cacheDisplay.html
+++ b/src/cacheDisplay.html
@@ -74,9 +74,9 @@
         </div>
         <div ng-controller="IndexController" layout="column">
             <!--L3-->
-            <md-card ng-show="showCache[2]">
+            <md-card ng-show="showCache[2]" ng-click="$ctrl.clickCache(3)">
                 <md-card-title layout="column">
-                    <md-card ng-show="showCache[2]" ng-click="$ctrl.clickCache(3)">
+                    <md-card-title-text>
                         <div layout="row" layout-align="space-between">
                             <div>
                                 <span class="md-headline">{{$ctrl.caches[2].title}}</span>

From 6773d71612fe01d182c332dfd7cde1754a3594c1 Mon Sep 17 00:00:00 2001
From: Kevin Rose <krose33@gatech.edu>
Date: Wed, 20 Sep 2017 17:36:14 -0400
Subject: [PATCH 4/5] update cacheDisplay to have the whole sidebar be a light
 theme with blue/dark blue colors

---
 app.js                | 4 ++++
 src/cacheDisplay.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 82e8816..c45ba4f 100644
--- a/app.js
+++ b/app.js
@@ -5,6 +5,10 @@ simulator.config(function($mdThemingProvider) {
             .primaryPalette('blue')
             .accentPalette('blue-grey')
             .dark();
+
+        $mdThemingProvider.theme('docs-light')
+            .primaryPalette('blue')
+            .accentPalette('blue-grey');
     });
 
 simulator.controller('IndexController', ['$scope', function($scope) {
diff --git a/src/cacheDisplay.html b/src/cacheDisplay.html
index c208fd0..f1bdba0 100644
--- a/src/cacheDisplay.html
+++ b/src/cacheDisplay.html
@@ -100,7 +100,7 @@
 
     <!--Cache Input-->
     <section resizable r-directions="['left']" r-flex="true" style="max-width: 700px">
-        <md-content layout="column" layout-padding md-theme="docs-dark" class="md-inline-form" flex>
+        <md-content layout="column" layout-padding md-theme="docs-light" class="md-inline-form" flex>
             <md-input-container>
                 <label>Replacement Policy</label>
                 <md-select ng-model="$ctrl.policy" placeholder="Select a Policy" ng-change="$ctrl.setPolicy()">

From f43f2bfdd5321dc64845c5b19165b8db22031b5e Mon Sep 17 00:00:00 2001
From: Kevin Rose <krose33@gatech.edu>
Date: Wed, 20 Sep 2017 17:43:04 -0400
Subject: [PATCH 5/5] ok should be good now

---
 src/cacheDisplay.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/cacheDisplay.html b/src/cacheDisplay.html
index ae5c346..f15c3b0 100644
--- a/src/cacheDisplay.html
+++ b/src/cacheDisplay.html
@@ -47,6 +47,7 @@
                         <div class="md-media-lg card-media"></div>
                     </md-card-title-media>
                     <md-button ng-click="$ctrl.removeCache(0)" ng-disabled="$ctrl.disableDeleteCache"><i class="material-icons">delete</i></md-button>
+
                 </md-card-title>
             </md-card>
 
@@ -71,6 +72,7 @@
                     <md-button ng-click="$ctrl.removeCache(1)"><i class="material-icons">delete</i></md-button>
                 </md-card-title>
             </md-card>
+
         </div>
         <div ng-controller="IndexController" layout="column">
             <!--L3-->
@@ -155,8 +157,6 @@
                 <md-subheader class="md-no-sticky">{{$ctrl.fileName}}</md-subheader>
                 <md-button class="md-primary md-raised" ng-click="$ctrl.handleUpload()" ng-disabled="$ctrl.fileName.length != 0" type="submit" style="margin-right: 0;">Upload</md-button>
             </md-content>
-        </md-content>
-        <md-content layout="column" layout-padding class="md-inline-form" flex>
             <md-subheader class="md-no-sticky">Memory Access Queue</md-subheader>
             <md-table-container style="height:150px">
                 <table md-table>
@@ -178,8 +178,7 @@
                     </tbody>
                 </table>
             </md-table-container>
-        </md-content>
-        <md-content layout="column" layout-padding class="md-inline-form" md-theme="docs-dark" flex>
+
             <!-- Control Flow Buttons -->
             <md-content layout="row" layout-align="space-around center">
                 <md-button class="md-icon-button"><i class="material-icons">skip_previous</i></md-button>
@@ -193,7 +192,7 @@
                     <span class="md-body-1">Speed</span>
                 </div>
                 <div style="width:100%;padding:10px">
-                	<md-slider flex class="md-primary" md-discrete ng-model="$ctrl.speedRating" step="1" min="1" max="5" aria-label="rating">
+                    <md-slider flex class="md-primary" md-discrete ng-model="$ctrl.speedRating" step="1" min="1" max="5" aria-label="rating">
                 </div>
                 </md-slider>
             </md-content>