From cc4fdd6d0c663d75096ecad4b23be33715d56f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sun, 21 Feb 2016 12:47:57 +0100
Subject: [PATCH] ux(): fixed issue with cach buster for temlpates, and updated
 on hover style for sidemenu to look better

---
 public/app/app.ts                     |  7 +++++--
 public/sass/_variables.dark.scss      |  6 +++---
 public/sass/components/_search.scss   |  1 +
 public/sass/components/_sidemenu.scss | 11 +++++------
 public/sass/mixins/_mixins.scss       | 12 ++++++++++++
 public/vendor/angular/angular.js      |  2 +-
 6 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/public/app/app.ts b/public/app/app.ts
index 00ae0974ec0..b30b75a0ca3 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -48,11 +48,14 @@ export class GrafanaApp {
       this.registerFunctions.service    = $provide.service;
       this.registerFunctions.filter     = $filterProvider.register;
 
-      $provide.decorator("$http", ["$delegate", function($delegate) {
+      $provide.decorator("$http", ["$delegate", "$templateCache", function($delegate, $templateCache) {
         var get = $delegate.get;
         $delegate.get = function(url, config) {
           if (url.match(/\.html$/)) {
-            url += "?v=" + new Date().getTime();
+            // some template's already exist in the cache
+            if (!$templateCache.get(url)) {
+              url += "?v=" + new Date().getTime();
+            }
           }
           return get(url, config);
         };
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 9e2dd08b50e..8604552f020 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -166,8 +166,8 @@ $dropdownLinkColor:             $text-color;
 $dropdownLinkColorHover:        $white;
 $dropdownLinkColorActive:       $white;
 
-$dropdownLinkBackgroundActive:  $blue-dark;
-$dropdownLinkBackgroundHover:   $blue-dark;
+$dropdownLinkBackgroundActive:  $dark-4;
+$dropdownLinkBackgroundHover:   $dark-4;
 
 
 // COMPONENT VARIABLES
@@ -206,7 +206,7 @@ $navbarButtonBackgroundHighlight: lighten($navbarBackground, 5%);
 // Sidemenu
 // -------------------------
 $side-menu-bg:            $body-bg;
-$side-menu-item-hover-bg: $dark-4;
+$side-menu-item-hover-bg: $dark-3;
 $side-menu-opacity:		  0.97;
 
 // Pagination
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index 47b713f7e1a..eb583e224bc 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -73,6 +73,7 @@
     white-space: nowrap;
     background-color: $grafanaListBackground;
     margin-bottom: 4px;
+
     .search-result-icon:before {
       content: "\f009";
     }
diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index 546f4f9dada..04e9b71d42a 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -58,8 +58,12 @@
 
   li {
     position: relative;
+    @include left-brand-border();
 
     &:hover {
+      background-color: $side-menu-item-hover-bg;
+      @include left-brand-border-gradient();
+
       .dropdown-menu {
         display: block;
         opacity: 0;
@@ -125,10 +129,8 @@
   line-height: 47px;
   padding: 0px 10px 0px 10px;
   display: block;
+  border-left: 1px solid transparent;
 
-  &:hover {
-    background-color: $side-menu-item-hover-bg;
-  }
 
   .sidemenu-item-text {
     padding-left: 11px;
@@ -180,9 +182,6 @@
   padding: 17px 10px 15px 14px;
   box-sizing: border-box;
   cursor: pointer;
-  &:hover {
-    background-color: $side-menu-item-hover-bg;
-  }
   display: table;
   position: relative;
   width: 100%;
diff --git a/public/sass/mixins/_mixins.scss b/public/sass/mixins/_mixins.scss
index 2c33ea82daa..3d536ec1b82 100644
--- a/public/sass/mixins/_mixins.scss
+++ b/public/sass/mixins/_mixins.scss
@@ -331,4 +331,16 @@
   background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
 }
 
+@mixin left-brand-border() {
+  border-left: 1px solid transparent;
+}
 
+@mixin left-brand-border-gradient() {
+  border-left: 1px solid transparent;
+  border-image: linear-gradient(rgba(255,213,0,1) 0%, rgba(255,68,0,1) 99%, rgba(255,68,0,1) 100%);
+  border-image-slice: 1;
+  border-top: 0;
+  border-right: 0;
+  border-bottom: 0;
+  border-left: 1px solid transparent;
+}
diff --git a/public/vendor/angular/angular.js b/public/vendor/angular/angular.js
index 7a8f983b2e1..8b7ccd9468e 100644
--- a/public/vendor/angular/angular.js
+++ b/public/vendor/angular/angular.js
@@ -30458,4 +30458,4 @@ $provide.value("$locale", {
 
 })(window, document);
 
-!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
\ No newline at end of file
+!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');