ux(annotations): minor polish to annotations editor

public/app/features/annotations/editor_ctrl.js

@@ -12,10 +12,7 @@ function (angular, _, $) {
     var annotationDefaults = {
     var annotationDefaults = {
       name: '',
       name: '',
       datasource: null,
       datasource: null,
-      showLine: true,
-      iconColor: '#C0C6BE',
-      lineColor: 'rgba(255, 96, 96, 0.592157)',
-      iconSize: 13,
+      iconColor: 'rgba(255, 96, 96, 1)',
       enable: true
       enable: true
     };
     };
 
 

public/app/features/annotations/partials/editor.html

@@ -76,8 +76,8 @@
 					<div class="gf-form">
 					<div class="gf-form">
 						<label class="gf-form-label">
 						<label class="gf-form-label">
 							<span>Color</span>
 							<span>Color</span>
-							<spectrum-picker ng-model="currentAnnotation.iconColor"></spectrum-picker>
 						</label>
 						</label>
+						<spectrum-picker class="gf-form-input" ng-model="currentAnnotation.iconColor"></spectrum-picker>
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>

public/sass/components/_color_picker.scss

@@ -31,7 +31,7 @@
   width: 15px;
   width: 15px;
   height: 15px;
   height: 15px;
   border: none;
   border: none;
-  margin-right: 5px;
+  margin: 0;
   float: left;
   float: left;
   z-index: 0;
   z-index: 0;
 }
 }