summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorMichael Davis <michael.s.davis@ibm.com>2017-08-09 11:36:45 -0500
committerAdriana Kobylak <anoo@us.ibm.com>2017-10-09 13:55:47 -0500
commit9e62a1c88c7358b95d81eafd02a6d322d78a56d5 (patch)
tree30d07c3c0dae2ba84fa87289e43d5aee0bb63726 /app
parent3e2fe422bf3ee19cf2250a335b0285efe0fb3fe5 (diff)
downloadphosphor-webui-9e62a1c88c7358b95d81eafd02a6d322d78a56d5.tar.gz
phosphor-webui-9e62a1c88c7358b95d81eafd02a6d322d78a56d5.zip
changed 'mark as resolved' icon to only a checkmark based on user feedback.
Change-Id: I839206d30f0f2db158e23d683ff8cdc0e63398c9 Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/icon-check-white.svg1
-rw-r--r--app/assets/images/icon-check.svg4
-rw-r--r--app/assets/images/icon-checklist-white.svg10
-rw-r--r--app/assets/images/icon-checklist.svg7
-rw-r--r--app/common/directives/log-event.html2
-rw-r--r--app/server-health/controllers/log-controller.html2
6 files changed, 7 insertions, 19 deletions
diff --git a/app/assets/images/icon-check-white.svg b/app/assets/images/icon-check-white.svg
new file mode 100644
index 0000000..7f11b2c
--- /dev/null
+++ b/app/assets/images/icon-check-white.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 12"><defs><style>.cls-1{fill:#fff;}</style></defs><title>Artboard 1</title><polygon class="cls-1" points="14 2.2 12.2 0.5 4.7 8 1.8 5.1 0 6.9 4.7 11.5 14 2.2"/></svg> \ No newline at end of file
diff --git a/app/assets/images/icon-check.svg b/app/assets/images/icon-check.svg
new file mode 100644
index 0000000..e984f55
--- /dev/null
+++ b/app/assets/images/icon-check.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 14 12" style="enable-background:new 0 0 14 12;" xml:space="preserve">
+<polygon points="14,2.2 12.2,0.5 4.7,8 1.8,5.1 0,6.9 4.7,11.5 "/>
+</svg>
diff --git a/app/assets/images/icon-checklist-white.svg b/app/assets/images/icon-checklist-white.svg
deleted file mode 100644
index 232754c..0000000
--- a/app/assets/images/icon-checklist-white.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
- .st0{fill:#FFFFFF;}
-</style>
-<g>
- <path class="st0" d="M0,0v12l4,4h12V0H0z M14,14H5v-3H2V2h12V14z"/>
- <polygon class="st0" points="12.5,5.5 11,4 7,8 5.5,6.5 4,8 7,11 "/>
-</g>
-</svg>
diff --git a/app/assets/images/icon-checklist.svg b/app/assets/images/icon-checklist.svg
deleted file mode 100644
index 770e715..0000000
--- a/app/assets/images/icon-checklist.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<g>
- <path d="M0,0v12l4,4h12V0H0z M14,14H5v-3H2V2h12V14z"/>
- <polygon points="12.5,5.5 11,4 7,8 5.5,6.5 4,8 7,11 "/>
-</g>
-</svg>
diff --git a/app/common/directives/log-event.html b/app/common/directives/log-event.html
index 7d9ab4d..addb098 100644
--- a/app/common/directives/log-event.html
+++ b/app/common/directives/log-event.html
@@ -48,7 +48,7 @@
src="assets/images/icon-trashcan.svg"
alt=""/>Delete
</button>
- <button class="btn-resolve" ng-class="{'disabled': (event.Resolved == 1)}" ng-click="resolveEvent(event)" ng-disabled="event.Resolved == 1"><img class="event__icon" src="assets/images/icon-checklist.svg" alt=""/>Resolved</button>
+ <button class="btn-resolve" ng-class="{'disabled': (event.Resolved == 1)}" ng-click="resolveEvent(event)" ng-disabled="event.Resolved == 1"><img class="event__icon" src="assets/images/icon-check.svg" alt=""/>Resolved</button>
</div>
<div class="event__related" ng-show="event.related_items.length">
<p class="inline event__related-label">Related items:</p>
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index ec533a1..0975e7f 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -56,7 +56,7 @@
<img class="event__icon" src="assets/images/icon-trashcan-white.svg" alt="">Delete
</button>
<button class="inline btn-resolve" ng-show="selectedEvents.length || all" ng-click="resolve()">
- <img class="event__icon" src="assets/images/icon-checklist-white.svg" alt="">Mark as resolved
+ <img class="event__icon" src="assets/images/icon-check-white.svg" alt="">Mark as resolved
</button>
<a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="inline btn-export" download="{{export_name}}" ng-show="selectedEvents.length || all">Export</a>
</div>
OpenPOWER on IntegriCloud