From ae604b62896959cb4370ecaee02e3127baca0a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 29 Feb 2016 09:50:40 +0100
Subject: [PATCH] ux(annotations): minor polish to annotations editor

---
 public/app/features/annotations/editor_ctrl.js       | 5 +----
 public/app/features/annotations/partials/editor.html | 2 +-
 public/sass/components/_color_picker.scss            | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/public/app/features/annotations/editor_ctrl.js b/public/app/features/annotations/editor_ctrl.js
index d9731686a4f..8d3887ee757 100644
--- a/public/app/features/annotations/editor_ctrl.js
+++ b/public/app/features/annotations/editor_ctrl.js
@@ -12,10 +12,7 @@ function (angular, _, $) {
     var annotationDefaults = {
       name: '',
       datasource: null,
-      showLine: true,
-      iconColor: '#C0C6BE',
-      lineColor: 'rgba(255, 96, 96, 0.592157)',
-      iconSize: 13,
+      iconColor: 'rgba(255, 96, 96, 1)',
       enable: true
     };
 
diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index c54d33fe939..702d8921bef 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -76,8 +76,8 @@
 					<div class="gf-form">
 						<label class="gf-form-label">
 							<span>Color</span>
-							<spectrum-picker ng-model="currentAnnotation.iconColor"></spectrum-picker>
 						</label>
+						<spectrum-picker class="gf-form-input" ng-model="currentAnnotation.iconColor"></spectrum-picker>
 					</div>
 				</div>
 			</div>
diff --git a/public/sass/components/_color_picker.scss b/public/sass/components/_color_picker.scss
index 9e8adfd6226..d5f04265fc8 100644
--- a/public/sass/components/_color_picker.scss
+++ b/public/sass/components/_color_picker.scss
@@ -31,7 +31,7 @@
   width: 15px;
   height: 15px;
   border: none;
-  margin-right: 5px;
+  margin: 0;
   float: left;
   z-index: 0;
 }