From 2e52008542fb8f93d6a123ddf790151be85be33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 23 Feb 2016 08:22:00 +0100
Subject: [PATCH] feat(annotations): updated editor, removed line color and
 icon size

---
 .../features/annotations/partials/editor.html | 25 ++++++-------------
 public/app/plugins/panel/graph/graph.js       |  9 +------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index 10f93b5ef05..8b4661fe24f 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -68,7 +68,7 @@
 			<div class="gf-form-group">
 				<div class="gf-form-inline">
 					<div class="gf-form gf-size-max-xxl">
-						<span class="gf-form-label width-10">Name</span>
+						<span class="gf-form-label">Name</span>
 						<input type="text" class="gf-form-input" ng-model='currentAnnotation.name' placeholder="name"></input>
 					</div>
 					<div class="gf-form">
@@ -77,27 +77,18 @@
 							<select class="gf-form-input gf-size-auto" ng-model="currentAnnotation.datasource" ng-options="f.name as f.name for f in datasources" ng-change="datasourceChanged()"></select>
 						</div>
 					</div>
-				</div>
-				<div class="gf-form-inline">
-					<div class="gf-form gf-size-max-xl">
-						<span class="gf-form-label width-10">Icon size</span>
-						<div class="gf-form-select-wrapper">
-							<select class="gf-form-input gf-size-md" ng-model="currentAnnotation.iconSize" ng-options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select>
-						</div>
-					</div>
+					<!-- <div class="gf&#45;form gf&#45;size&#45;max&#45;xl"> -->
+					<!-- 	<span class="gf&#45;form&#45;label width&#45;10">Icon size</span> -->
+					<!-- 	<div class="gf&#45;form&#45;select&#45;wrapper"> -->
+					<!-- 		<select class="gf&#45;form&#45;input gf&#45;size&#45;md" ng&#45;model="currentAnnotation.iconSize" ng&#45;options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select> -->
+					<!-- 	</div> -->
+					<!-- </div> -->
 					<div class="gf-form">
 						<label class="gf-form-label">
-							<span>Icon color</span>
+							<span>Color</span>
 							<spectrum-picker ng-model="currentAnnotation.iconColor"></spectrum-picker>
 						</label>
 					</div>
-					<div class="gf-form">
-						<label class="gf-form-label">
-							<span>Line color</span>
-							<spectrum-picker ng-model="currentAnnotation.lineColor"></spectrum-picker>
-						</label>
-						<editor-checkbox text="Grid line" model="currentAnnotation.showLine"></editor-checkbox>
-					</div>
 				</div>
 			</div>
 
diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js
index 87f565d9137..c7490d1133d 100755
--- a/public/app/plugins/panel/graph/graph.js
+++ b/public/app/plugins/panel/graph/graph.js
@@ -335,16 +335,9 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
               types[event.annotation.name] = {
                 color: event.annotation.iconColor,
                 position: 'BOTTOM',
+                markerSize: 5,
               };
             }
-
-            // if (event.annotation.showLine) {
-            //   options.grid.markings.push({
-            //     color: event.annotation.lineColor,
-            //     lineWidth: 1,
-            //     xaxis: { from: event.min, to: event.max }
-            //   });
-            // }
           });
 
           options.events = {