From 1928fe18de988d30a75d9247c9b1dc64bc0a91ea Mon Sep 17 00:00:00 2001
From: Simon Williams <simon@instructure.com>
Date: Wed, 4 Mar 2015 13:26:34 -0700
Subject: [PATCH] fix tab order of ok/delete buttons in outcome criteria cells

fixes CNVS-19021

test plan:
- in a course, go to the outcomes page
- create/edit an outcome, and edit one of the criteria cells
- you should be able to tab from the label field to the delete/ok
  buttons, and the tab order should match visual order, from left to
  right

Change-Id: Ie9d335f0e7cb49cdd63346eea152625c4d5dffbb
Reviewed-on: https://gerrit.instructure.com/49868
Tested-by: Jenkins
Reviewed-by: Steven Burnett <sburnett@instructure.com>
QA-Review: Adam Stone <astone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
---
 app/stylesheets/bundles/learning_outcomes.scss |  4 +++-
 app/views/jst/outcomes/_criterion.handlebars   | 17 +++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/stylesheets/bundles/learning_outcomes.scss b/app/stylesheets/bundles/learning_outcomes.scss
index b6662744835..b6bb89b355c 100644
--- a/app/stylesheets/bundles/learning_outcomes.scss
+++ b/app/stylesheets/bundles/learning_outcomes.scss
@@ -203,9 +203,11 @@ table.criterion .edit {
     margin-bottom: 8px;
   }
   .buttons button {
-    float: right;
     margin-left: 4px;
   }
+  .buttons .button-container {
+    float: right;
+  }
 }
 
 .edit_rating {
diff --git a/app/views/jst/outcomes/_criterion.handlebars b/app/views/jst/outcomes/_criterion.handlebars
index cb48f68b2a8..b46db42e9c7 100644
--- a/app/views/jst/outcomes/_criterion.handlebars
+++ b/app/views/jst/outcomes/_criterion.handlebars
@@ -24,12 +24,17 @@
 
       <div class="buttons row-fluid">
         <div class="span12">
-          <button
-            class="btn btn-small btn-primary save_rating_link"
-            aria-controls="edit_rating_{{_index}}"
-            type="button"
-          >{{#t "close_rating"}}Ok{{/t}}</button>
-          <button class="btn btn-small delete_rating_link" type="button">{{#t "delete_criterion"}}Delete{{/t}}</button>
+          <div class="button-container">
+            <button
+              class="btn btn-small delete_rating_link"
+              type="button"
+            >{{#t "delete_criterion"}}Delete{{/t}}</button>
+            <button
+              class="btn btn-small btn-primary save_rating_link"
+              aria-controls="edit_rating_{{_index}}"
+              type="button"
+            >{{#t "close_rating"}}Ok{{/t}}</button>
+          </div>
         </div>
       </div>
     </div>