[Frontend] Mods to Edit button

fixes #709
- Changed title and style of main Edit button;
- Updated EditItem.js protractor ID accordingly;
This commit is contained in:
Charles Hacskaylo 2016-06-01 19:19:58 -07:00
parent 7904989a23
commit 76edba1014
3 changed files with 15 additions and 21 deletions

View File

@ -170,7 +170,7 @@ define([
"navigationService", "navigationService",
"$log" "$log"
], ],
"description": "Edit this object.", "description": "Edit",
"category": "view-control", "category": "view-control",
"glyph": "p" "glyph": "p"
}, },

View File

@ -36,15 +36,7 @@ $pad: $interiorMargin * $baseRatio;
padding: 0 $pad; padding: 0 $pad;
font-size: 0.7rem; font-size: 0.7rem;
vertical-align: top; vertical-align: top;
@include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon);
.icon {
font-size: 0.8rem;
color: $colorKey;
}
.title-label {
vertical-align: top;
}
&.lg { &.lg {
font-size: 1rem; font-size: 1rem;
@ -58,19 +50,13 @@ $pad: $interiorMargin * $baseRatio;
padding: 0 ($pad / $baseRatio) / 2; padding: 0 ($pad / $baseRatio) / 2;
} }
&.major { &.major,
&.key-edit {
$bg: $colorBtnMajorBg; $bg: $colorBtnMajorBg;
$hc: lighten($bg, 10%); $hc: lighten($bg, 10%);
@include btnSubtle($bg, $hc, $colorBtnMajorFg, $colorBtnMajorFg); @include btnSubtle($bg, $hc, $colorBtnMajorFg, $colorBtnMajorFg);
} }
&:not(.major) {
// bg, bgHov, fg, ic
@include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon);
}
&.pause-play {
}
&.t-save:before { &.t-save:before {
content:'\e612'; content:'\e612';
font-family: symbolsfont; font-family: symbolsfont;
@ -109,6 +95,15 @@ $pad: $interiorMargin * $baseRatio;
content: "\000039"; content: "\000039";
} }
} }
.icon {
font-size: 0.8rem;
color: $colorKey;
}
.title-label {
vertical-align: top;
}
} }
.s-icon-btn { .s-icon-btn {
@ -275,4 +270,3 @@ body.desktop .mini-tab-icon {
color: $colorPausedBg !important; color: $colorPausedBg !important;
} }
} }

View File

@ -34,8 +34,8 @@ var EditItem = (function () {
EditItem.prototype.EditButton = function () { EditItem.prototype.EditButton = function () {
return element.all(by.css('[ng-click="parameters.action.perform()"]')).filter(function (arg) { return element.all(by.css('[ng-click="parameters.action.perform()"]')).filter(function (arg) {
return arg.getAttribute("title").then(function (title){ return arg.getAttribute("title").then(function (title){
//expect(title).toEqual("Edit this object."); //expect(title).toEqual("Edit");
return title == 'Edit this object.'; return title == 'Edit';
}) })
}); });
}; };