From 76edba10149c9f157f360272842d8642a840c0d4 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed, 1 Jun 2016 19:19:58 -0700
Subject: [PATCH] [Frontend]  Mods to Edit button

fixes #709
- Changed title and style of main Edit button;
- Updated EditItem.js protractor ID accordingly;
---
 platform/commonUI/edit/bundle.js              |  2 +-
 .../general/res/sass/controls/_buttons.scss   | 30 ++++++++-----------
 protractor/common/EditItem.js                 |  4 +--
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js
index b8906107a0..3a9deb649e 100644
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -170,7 +170,7 @@ define([
                         "navigationService",
                         "$log"
                     ],
-                    "description": "Edit this object.",
+                    "description": "Edit",
                     "category": "view-control",
                     "glyph": "p"
                 },
diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss
index 7b585f8eec..d3cb8091f2 100644
--- a/platform/commonUI/general/res/sass/controls/_buttons.scss
+++ b/platform/commonUI/general/res/sass/controls/_buttons.scss
@@ -36,15 +36,7 @@ $pad: $interiorMargin * $baseRatio;
     padding: 0 $pad;
     font-size: 0.7rem;
     vertical-align: top;
-
-    .icon {
-        font-size: 0.8rem;
-        color: $colorKey;
-    }
-
-    .title-label {
-        vertical-align: top;
-    }
+    @include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon);
 
 	&.lg {
 		font-size: 1rem;
@@ -58,19 +50,13 @@ $pad: $interiorMargin * $baseRatio;
         padding: 0 ($pad / $baseRatio) / 2;
     }
 
-    &.major {
+    &.major,
+    &.key-edit {
         $bg: $colorBtnMajorBg;
         $hc: lighten($bg, 10%);
         @include btnSubtle($bg, $hc, $colorBtnMajorFg, $colorBtnMajorFg);
     }
 
-    &:not(.major) {
-        // bg, bgHov, fg, ic
-        @include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon);
-    }
-    &.pause-play {
-
-    }
     &.t-save:before {
         content:'\e612';
         font-family: symbolsfont;
@@ -109,6 +95,15 @@ $pad: $interiorMargin * $baseRatio;
             content: "\000039";
         }
     }
+
+    .icon {
+        font-size: 0.8rem;
+        color: $colorKey;
+    }
+
+    .title-label {
+        vertical-align: top;
+    }
 }
 
 .s-icon-btn {
@@ -275,4 +270,3 @@ body.desktop .mini-tab-icon {
         color: $colorPausedBg !important;
     }
 }
-
diff --git a/protractor/common/EditItem.js b/protractor/common/EditItem.js
index fffd8108a9..ceffcdb3ea 100644
--- a/protractor/common/EditItem.js
+++ b/protractor/common/EditItem.js
@@ -34,8 +34,8 @@ var EditItem = (function () {
     EditItem.prototype.EditButton = function () {
         return element.all(by.css('[ng-click="parameters.action.perform()"]')).filter(function (arg) {
             return arg.getAttribute("title").then(function (title){
-                //expect(title).toEqual("Edit this object.");
-                return title == 'Edit this object.';
+                //expect(title).toEqual("Edit");
+                return title == 'Edit';
             })
         });
     };