From 30b59063061b419e52fb0571b149ac5cbe6a302b Mon Sep 17 00:00:00 2001
From: Nicholas Nelson <nelsonni@oregonstate.edu>
Date: Wed, 23 Aug 2017 13:53:48 -0700
Subject: [PATCH 1/2] minor clean-up and styling of Card class, specificity
 added for Dialog styling

---
 app/Card.js      | 20 ++++++++++----------
 style/card.css   | 37 +++++++++++++++++++++++++++++++++++++
 style/dialog.css | 10 +++++-----
 3 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/app/Card.js b/app/Card.js
index c419d2081..26e645d79 100644
--- a/app/Card.js
+++ b/app/Card.js
@@ -29,21 +29,21 @@ module.exports = class Card {
     this.title = document.createElement('span');
     $(this.title).html("My Card");
 
-    this.closeButton = document.createElement('button');
-      $(this.closeButton).click(() => console.log('close button clicked'))
-    this.saveButton = document.createElement('button');
-      $(this.saveButton).click(() => console.log('save button clicked'))
-    this.fullscreenButton = document.createElement('button');
-      $(this.fullscreenButton).click(() => console.log('fullscreen button clicked'));
+    const saveButton = document.createElement('button');
+    $(saveButton).click(() => console.log('save button clicked'))
+    const fullscreenButton = document.createElement('button');
+    $(fullscreenButton).click(() => console.log('fullscreen button clicked'));
+    const closeButton = document.createElement('button');
+    $(closeButton).attr('class', 'close');
+    $(closeButton).click(() => { $(this.card).remove(); });
 
     this.header.appendChild(this.title);
-    this.header.appendChild(this.closeButton);
-    this.header.appendChild(this.saveButton);
-    this.header.appendChild(this.fullscreenButton);
+    this.header.appendChild(saveButton);
+    this.header.appendChild(fullscreenButton);
+    this.header.appendChild(closeButton);
     this.card.appendChild(this.header);
     context.appendChild(this.card);
     if (modal) this.toggleDraggable();
-    this.toggleDroppable();
   }
 
   destructor() {
diff --git a/style/card.css b/style/card.css
index 51ba5bd63..15fb31a69 100644
--- a/style/card.css
+++ b/style/card.css
@@ -15,6 +15,10 @@ div.card {
   user-select: none;
 }
 
+div.card:hover {
+  box-shadow: 0 0 3pt 1pt rgba(102, 204, 117, 0.75);
+}
+
 div.card-header {
   height: 29px;
   background: rgba(89, 87, 90, 1.0);
@@ -27,3 +31,36 @@ div.card-header {
   font-family: 'Lato', Georgia, Serif;
   font-weight: bold;
 }
+
+div.card-header button {
+  height: 15px;
+  width: 15px;
+  position: absolute;
+  top: 7px;
+  right: 10px;
+  border: 0;
+  /*border-radius: 50%;*/
+  z-index: 9999;
+}
+
+div.card-header svg.close {
+  height: 15px;
+  width: 15px;
+  position: absolute;
+  top: 7px;
+  right: 10px;
+  border: 0;
+  z-index: 9999;
+}
+
+div.card-header button.close {
+  background: rgba(89, 87, 90, 1.0) url('../asset/close_dark.svg') center/15px auto no-repeat;
+  background-size: cover;
+}
+
+div.card-header button.close:hover,
+div.card-header button.close:active {
+  background: rgba(89, 87, 90, 1.0) url('../asset/close_active.svg') no-repeat;
+  background-size: cover;
+  cursor: pointer;
+}
diff --git a/style/dialog.css b/style/dialog.css
index 248925079..093e1e7d5 100644
--- a/style/dialog.css
+++ b/style/dialog.css
@@ -8,7 +8,7 @@ div.dialog {
   overflow: hidden;
 }
 
-button.close {
+div.dialog button.close {
   background: url('../asset/close_dark.svg') no-repeat;
   background-size: cover;
   height: 19px;
@@ -21,14 +21,14 @@ button.close {
   z-index: 9999;
 }
 
-button.close:hover,
-button.close:active {
+div.dialog button.close:hover,
+div.dialog button.close:active {
   background: url('../asset/close_active.svg') no-repeat;
   background-size: cover;
   cursor: pointer;
 }
 
-button.acknowledge {
+div.dialog button.acknowledge {
   height: 29px;
   width: 85px;
   color: rgba(0, 0, 0, 1.0);
@@ -40,7 +40,7 @@ button.acknowledge {
   font-size: 90%;
 }
 
-div.overlay {
+div.dialog div.overlay {
   background: rgba(40, 44, 52, 0.4);
   position: absolute;
   top: 0;

From 473cdf84bbba40d5a85d03f1a2318e502c7cc5e7 Mon Sep 17 00:00:00 2001
From: Nicholas Nelson <nelsonni@oregonstate.edu>
Date: Wed, 23 Aug 2017 13:54:36 -0700
Subject: [PATCH 2/2] Keyboard shortcuts for Control -> Switch Canvas based
 upon Canvas ID

---
 lib/manager.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/manager.js b/lib/manager.js
index 15f9baf5e..de3452ee3 100644
--- a/lib/manager.js
+++ b/lib/manager.js
@@ -4,8 +4,8 @@ const singletonEnforcer = Symbol();
 const Canvas = require('../app/Canvas.js');
 const { Menu, MenuItem } = require('electron').remote;
 
-let applicationMenu;
-let canvasSelectionSubmenu;
+let applicationMenu; // reference item for accessing the AppMenu entries
+let canvasSelectionSubmenu; // reference item for accessing the AppMenu entries
 
 let canvasList;
 let currentCanvas;
@@ -56,6 +56,7 @@ class AppManager {
 
     let menuItem = new MenuItem({
       label: 'Canvas ' + canvas.id,
+      accelerator: ('Cmd+' + canvas.id),
       type: 'checkbox',
       checked: false,
       uuid: canvas.uuid,