From f82cb3aefe8b26c3e672cb41d87790a8fee07805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 7 Feb 2015 22:00:33 +0100
Subject: [PATCH] Various css updates

---
 .../features/annotations/partials/editor.html | 13 +++++-----
 .../features/profile/partials/profile.html    |  6 ++---
 src/css/less/tables_lists.less                | 24 +++++++++++++++++--
 src/css/less/variables.dark.less              |  8 +++----
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/app/features/annotations/partials/editor.html b/src/app/features/annotations/partials/editor.html
index 05ea697bc57..fc7d6225d3f 100644
--- a/src/app/features/annotations/partials/editor.html
+++ b/src/app/features/annotations/partials/editor.html
@@ -27,16 +27,17 @@
 							<i class="fa fa-bolt"></i> &nbsp;
 							{{annotation.name}}
 						</td>
-						<td style="width: 1%">
-							<a ng-click="edit(annotation)" class="btn btn-success btn-small">
+						<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
+						<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
+
+						<td style="width: 1%" class="nobg">
+							<a ng-click="edit(annotation)" class="btn btn-inverse btn-mini">
 								<i class="fa fa-edit"></i>
 								Edit
 							</a>
 						</td>
-						<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
-						<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
-						<td style="width: 1%">
-							<a ng-click="removeAnnotation(annotation)" class="btn btn-danger btn-small">
+						<td style="width: 1%" class="nobg">
+							<a ng-click="removeAnnotation(annotation)" class="btn btn-danger btn-mini">
 								<i class="fa fa-remove"></i>
 							</a>
 						</td>
diff --git a/src/app/features/profile/partials/profile.html b/src/app/features/profile/partials/profile.html
index 6db4a45ce8e..5b19a8e2690 100644
--- a/src/app/features/profile/partials/profile.html
+++ b/src/app/features/profile/partials/profile.html
@@ -55,9 +55,9 @@
 
 		<table class="grafana-options-table">
 			<tr ng-repeat="ac in accounts">
-				<td style="width: 98%">Name: {{ac.name}}</td>
-				<td>Role: {{ac.role}}</td>
-				<td>
+				<td style="width: 98%"><strong>Name: </strong> {{ac.name}}</td>
+				<td><strong>Role: </strong> {{ac.role}}</td>
+				<td class="nobg max-width-btns">
 					<span class="btn btn-primary" ng-show="ac.isUsing">
 						Current
 					</span>
diff --git a/src/css/less/tables_lists.less b/src/css/less/tables_lists.less
index f51f214c4cc..4020660bca0 100644
--- a/src/css/less/tables_lists.less
+++ b/src/css/less/tables_lists.less
@@ -3,13 +3,22 @@
 
   tr:nth-child(odd) td {
     background-color: @grafanaListAccent;
+    &.nobg {
+      background-color: transparent;
+      border:none;
+      border-left: 1px solid @grafanaListBorderBottom;
+    }
   }
 
-  td, th {
-    text-align: left;
+  td {
     padding: 5px 10px;
     white-space: nowrap;
     border-bottom: 1px solid @grafanaListBorderBottom;
+    &.nobg {
+      background-color: transparent;
+      border:none;
+      border-left: 1px solid @grafanaListBorderBottom;
+    }
   }
 
   tr:first-child {
@@ -25,6 +34,17 @@
   td:last-child {
     border-right: 1px solid @grafanaListBorderBottom;
   }
+
+  .max-width-btns {
+    .btn {
+      width: 100%;
+    }
+  }
+
+  strong {
+    font-weight: normal;
+    color: @white;
+  }
 }
 
 .max-width {
diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index af8b72360d8..65adf89729a 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -16,7 +16,7 @@
 // Accent colors
 // -------------------------
 @blue:                  #33B5E5;
-@blueDark:              #0086b3;
+@blueDark:              #005f81;
 @green:                 #669900;
 @red:                   #CC3900;
 @yellow:                #ECBB13;
@@ -89,7 +89,7 @@
 @grafanaListAccent:      lighten(@grayDarker, 2%);
 @grafanaListBorderTop:      @grayDark;
 @grafanaListBorderBottom:   @black;
-@grafanaListHighlight:      #343434;
+@grafanaListHighlight:      #333;
 @grafanaListMainLinkColor: @textColor;
 
 // Scrollbars
@@ -110,8 +110,8 @@
 @btnBackgroundHighlight:            darken(@grayLight, 15%);
 @btnBorder:                         #bbb;
 
-@btnPrimaryBackground:              lighten(@blueDark, 5%);
-@btnPrimaryBackgroundHighlight:     darken(@blueDark, 5%);
+@btnPrimaryBackground:              @blueDark;
+@btnPrimaryBackgroundHighlight:     lighten(@blueDark, 10%);
 
 @btnInfoBackground:                 lighten(@purple, 5%);
 @btnInfoBackgroundHighlight:        darken(@purple, 5%);