From db663c380b0220cf9f58a1be8eb1b4e862c2fc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 8 Dec 2017 14:38:33 +0100
Subject: [PATCH] new timepicker is working

---
 public/app/features/dashboard/timepicker/dropdown.html   | 1 -
 public/app/features/dashboard/timepicker/timepicker.html | 2 +-
 public/sass/components/_timepicker.scss                  | 7 +++----
 3 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 public/app/features/dashboard/timepicker/dropdown.html

diff --git a/public/app/features/dashboard/timepicker/dropdown.html b/public/app/features/dashboard/timepicker/dropdown.html
deleted file mode 100644
index 8b137891791..00000000000
--- a/public/app/features/dashboard/timepicker/dropdown.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html
index 0ffe33ed31a..07f97604c42 100644
--- a/public/app/features/dashboard/timepicker/timepicker.html
+++ b/public/app/features/dashboard/timepicker/timepicker.html
@@ -27,7 +27,7 @@
 
 <div ng-if="ctrl.isOpen" class="gf-timepicker-dropdown">
   <form name="timeForm" class="gf-timepicker-absolute-section">
-    <h3 class="section-heading">Time range</h3>
+    <h3 class="section-heading">Custom range</h3>
 
     <label class="small">From:</label>
     <div class="gf-form-inline">
diff --git a/public/sass/components/_timepicker.scss b/public/sass/components/_timepicker.scss
index 24fbdfa2fcb..e4beb2cb39e 100644
--- a/public/sass/components/_timepicker.scss
+++ b/public/sass/components/_timepicker.scss
@@ -17,7 +17,7 @@
   top: $navbarHeight;
   right: 0;
   padding: 10px 20px;
-  background-color: $search-filter-box-bg;
+  background-color: $page-bg;
   border-radius: 0 0 0 4px;
   box-shadow: $search-shadow;
 }
@@ -25,7 +25,6 @@
 .gf-timepicker-absolute-section {
   width: 290px;
   float: left;
-  border-right: 1px solid $divider-border-color;
   padding: 0 10px;
   select {
     width: 183px;
@@ -43,7 +42,7 @@
   font-size: 75%;
   padding: 3px;
   border-radius: 2px;
-  font-weight: bold;
+  font-weight: 500;
   margin-left: 4px;
 }
 
@@ -61,7 +60,7 @@
     li.active {
       border-bottom: 1px solid $blue;
       margin: 3px 0;
-      font-weight: bold;
+      font-weight: 500;
     }
   }
 }