From b85f2c94409822491f0a6e0f1beb1ad31b07a57e Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Fri, 19 Apr 2013 18:15:53 -0700
Subject: [PATCH] css cleanup, fixed issue where dashboards using relative time
 might not save correctly

---
 common/css/main.css         | 68 +++++++++++++++++++------------------
 panels/column/editor.html   |  2 +-
 panels/timepicker/module.js | 14 +++++---
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/common/css/main.css b/common/css/main.css
index 1d72620a14d..3dad01af61c 100644
--- a/common/css/main.css
+++ b/common/css/main.css
@@ -6,17 +6,19 @@
   color: #000;
 }
 
-.kibana-row {
-  margin-left: 15px;
-  margin-bottom: 15px;
-}
-
 .navbar .brand {
   color: #eee;
 }
 
 .navbar-inner {
-    border-width: 0 0 0px;
+  border-width: 0 0 0px;
+  padding-left: 0px;
+  padding-right: 0px;
+}
+
+.kibana-row {
+  margin-left: 15px;
+  margin-bottom: 15px;
 }
 
 .row-close {
@@ -54,6 +56,10 @@
   background-color: #f9f9f9;
 }
 
+.nomargin {
+  margin: 0px;
+}
+
 [ng\:cloak], [ng-cloak], .ng-cloak {
   display: none !important;
 }
@@ -90,7 +96,15 @@
   opacity: 1;
 }
 
-.pointer:hover {
+.link {
+  cursor: pointer;
+}
+
+.pointer {
+  cursor: pointer;
+}
+
+.link:hover {
   color: #0088CC;
 }
 
@@ -98,30 +112,34 @@
   max-width: 500px;
 }
 
-.pointer {
-  cursor: pointer;
+.popover-title { display: none; }
+
+.tiny {
+  font-size: 50%;
 }
 
 .small {
   font-size: 85%;
 }
 
-.input-append label {
-  font-size: inherit !important;
-}
-
 .large {
   font-size: 120%;
 }
 
-.nomargin {
-  margin: 0px;
-}
-
 .strong {
   font-weight: bold;
 }
 
+.input-append label {
+  font-size: inherit !important;
+}
+
+.input-smaller {
+  width: 75px;
+}
+
+.typeahead { z-index: 1051; }
+
 .btn-active {
   background-color: #E6E6E6;
   background-image: none;
@@ -129,23 +147,7 @@
   outline: 0 none
 }
 
-.popover-title { display: none; }
-
-.input-smaller {
-  width: 75px;
-}
-
-.tiny {
-  font-size: 50%;
-}
-
 .remove:hover {
   background-color: #A60000;
 }
 
-.typeahead { z-index: 1051; }
-
-.navbar-inner {
-  padding-left: 0px;
-  padding-right: 0px;
-}
\ No newline at end of file
diff --git a/panels/column/editor.html b/panels/column/editor.html
index c260bafe38a..e5dec0361b4 100644
--- a/panels/column/editor.html
+++ b/panels/column/editor.html
@@ -33,4 +33,4 @@
       </table>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/panels/timepicker/module.js b/panels/timepicker/module.js
index a07a1070488..cc030e23256 100644
--- a/panels/timepicker/module.js
+++ b/panels/timepicker/module.js
@@ -214,11 +214,15 @@ angular.module('kibana.timepicker', [])
     }
 
     // Update panel's string representation of the time object
-    $scope.panel.time = { 
-      from : $scope.time.from.format("mm/dd/yyyy HH:MM:ss"),
-      to : $scope.time.to.format("mm/dd/yyyy HH:MM:ss"),
-      index : $scope.time.index,
-    };
+    if($scope.panel.mode !== 'relative') {
+      $scope.panel.time = { 
+        from : $scope.time.from.format("mm/dd/yyyy HH:MM:ss"),
+        to : $scope.time.to.format("mm/dd/yyyy HH:MM:ss"),
+        index : $scope.time.index,
+      };
+    } else {
+      delete $scope.panel.time;
+    }
   };
 
   function set_timepicker(from,to) {