From cbbb76988af825658efa4ed6a15e297c9ea66ab0 Mon Sep 17 00:00:00 2001
From: cmwebby <websterchris@live.com>
Date: Thu, 12 May 2016 12:57:47 +0100
Subject: [PATCH 1/2] Changed buttons for patients and appointments index

---
 app/appointments/item/template.hbs | 11 ++++++-----
 app/patients/index/template.hbs    |  2 +-
 app/styles/_bootstrap-theme.scss   |  4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/appointments/item/template.hbs b/app/appointments/item/template.hbs
index dcc23237f6..71d5f0e766 100644
--- a/app/appointments/item/template.hbs
+++ b/app/appointments/item/template.hbs
@@ -8,14 +8,15 @@
     <td>{{appointment.provider}}</td>
     <td class="appointment-status">{{appointment.displayStatus}}</td>
     <td>
+        
+        {{#if canEdit}}
+            <button class="btn btn-default neutral" {{action 'editAppointment' appointment bubbles=false }}>{{t 'labels.edit'}}</button>
+        {{/if}}
         {{#if canAddVisit}}
             <button class="btn btn-default" {{action 'createVisit' appointment bubbles=false }}>{{t 'buttons.add_visit'}}</button>
         {{/if}}
-        {{#if canEdit}}
-            <button class="btn btn-default" {{action 'editAppointment' appointment bubbles=false }}>{{t 'labels.edit'}}</button>
-        {{/if}}
         {{#if canDelete}}
-            <button class="btn btn-default" {{action 'deleteItem' appointment bubbles=false }}>{{t 'buttons.delete'}}</button>
-        {{/if}}
+                  <button class="btn btn-default warning" {{action 'deleteItem' appointment  bubbles=false }}><span class="octicon octicon-x"></span> Delete</button>
+                {{/if}}
     </td>
 </tr>
diff --git a/app/patients/index/template.hbs b/app/patients/index/template.hbs
index ed2f15aadb..79ebdc1d2a 100644
--- a/app/patients/index/template.hbs
+++ b/app/patients/index/template.hbs
@@ -30,7 +30,7 @@
                 {{/if}}
                 {{#unless patient.admitted}}
                   {{#if canAdmitPatient}}
-                    <button class="btn btn-default success" {{action 'admitPatient' patient  bubbles=false }}><span class="glyphicon glyphicon-log-in"></span> Admit</button>
+                    <button class="btn btn-default success admit" {{action 'admitPatient' patient  bubbles=false }}><span class="glyphicon glyphicon-log-in"></span> Admit</button>
                   {{/if}}
                 {{/unless}}
                 {{#if patient.admitted}}
diff --git a/app/styles/_bootstrap-theme.scss b/app/styles/_bootstrap-theme.scss
index 66403606b4..301864855c 100644
--- a/app/styles/_bootstrap-theme.scss
+++ b/app/styles/_bootstrap-theme.scss
@@ -27,6 +27,10 @@
     &:focus { opacity: .8; }
   }
 
+  &.admit{
+    width:103px
+  }
+
   .octicon {
     position: relative;
     left: -3px;

From 085f646cb561db1baaede76f9bfd0a19d42d8d3c Mon Sep 17 00:00:00 2001
From: Chris Webster <websterchris@live.com>
Date: Thu, 12 May 2016 13:42:08 +0100
Subject: [PATCH 2/2] Update _bootstrap-theme.scss

---
 app/styles/_bootstrap-theme.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/styles/_bootstrap-theme.scss b/app/styles/_bootstrap-theme.scss
index 301864855c..7796249cfb 100644
--- a/app/styles/_bootstrap-theme.scss
+++ b/app/styles/_bootstrap-theme.scss
@@ -27,8 +27,8 @@
     &:focus { opacity: .8; }
   }
 
-  &.admit{
-    width:103px
+  &.admit {
+    width: 103px;
   }
 
   .octicon {