From 8ced9f646220720f4b40fc70ba6448abb987298e Mon Sep 17 00:00:00 2001
From: Alexandre Rio <orbital.project42@gmail.com>
Date: Thu, 1 Feb 2018 16:41:33 +0100
Subject: [PATCH 1/6] Update search datasource by name API path

Correct path for search by name endpoint is /api/datasources/:name
---
 docs/sources/http_api/data_source.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sources/http_api/data_source.md b/docs/sources/http_api/data_source.md
index 364b55b0cfc..468a812c709 100644
--- a/docs/sources/http_api/data_source.md
+++ b/docs/sources/http_api/data_source.md
@@ -90,7 +90,7 @@ Content-Type: application/json
 
 ## Get a single data source by Name
 
-`GET /api/datasources/name/:name`
+`GET /api/datasources/:name`
 
 **Example Request**:
 

From d2827a000544fa6e3e8bb341f43ba5743d891719 Mon Sep 17 00:00:00 2001
From: Patrick O'Carroll <ocarroll.patrick@gmail.com>
Date: Fri, 2 Feb 2018 10:18:45 +0100
Subject: [PATCH 2/6] Light theme icon color (#10730)

* working on new colors for icons in light theme

* more work on icon colors

* changed colors of icons for light theme
---
 public/img/icons_light_theme/icon_add_annotation.svg          | 4 ++--
 public/img/icons_light_theme/icon_add_annotation_alt.svg      | 4 ++--
 public/img/icons_light_theme/icon_add_folder.svg              | 2 +-
 public/img/icons_light_theme/icon_add_link.svg                | 2 +-
 .../img/icons_light_theme/icon_add_notification_channel.svg   | 2 +-
 public/img/icons_light_theme/icon_add_panel.svg               | 2 +-
 public/img/icons_light_theme/icon_add_variable.svg            | 2 +-
 public/img/icons_light_theme/icon_alert.svg                   | 2 +-
 public/img/icons_light_theme/icon_alert_alt.svg               | 2 +-
 public/img/icons_light_theme/icon_alert_off.svg               | 2 +-
 public/img/icons_light_theme/icon_alert_rules.svg             | 2 +-
 public/img/icons_light_theme/icon_annotation.svg              | 2 +-
 public/img/icons_light_theme/icon_annotation_alt.svg          | 2 +-
 public/img/icons_light_theme/icon_apikeys.svg                 | 2 +-
 public/img/icons_light_theme/icon_cog.svg                     | 2 +-
 public/img/icons_light_theme/icon_dashboard.svg               | 2 +-
 public/img/icons_light_theme/icon_dashboard_fav.svg           | 2 +-
 public/img/icons_light_theme/icon_dashboard_list.svg          | 2 +-
 public/img/icons_light_theme/icon_data_sources.svg            | 2 +-
 public/img/icons_light_theme/icon_home.svg                    | 2 +-
 public/img/icons_light_theme/icon_import_dashboard.svg        | 2 +-
 public/img/icons_light_theme/icon_json.svg                    | 2 +-
 public/img/icons_light_theme/icon_link.svg                    | 2 +-
 public/img/icons_light_theme/icon_new_dashboard.svg           | 2 +-
 public/img/icons_light_theme/icon_notification_channels.svg   | 2 +-
 public/img/icons_light_theme/icon_org.svg                     | 2 +-
 public/img/icons_light_theme/icon_playlist.svg                | 2 +-
 public/img/icons_light_theme/icon_plugins.svg                 | 2 +-
 public/img/icons_light_theme/icon_preferences.svg             | 2 +-
 public/img/icons_light_theme/icon_question.svg                | 2 +-
 public/img/icons_light_theme/icon_shield.svg                  | 2 +-
 public/img/icons_light_theme/icon_sitemap.svg                 | 2 +-
 public/img/icons_light_theme/icon_snapshots.svg               | 2 +-
 public/img/icons_light_theme/icon_team.svg                    | 2 +-
 public/img/icons_light_theme/icon_user.svg                    | 2 +-
 public/img/icons_light_theme/icon_variable.svg                | 2 +-
 public/img/icons_light_theme/icon_zoom_out.svg                | 2 +-
 public/sass/_variables.light.scss                             | 3 ++-
 38 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/public/img/icons_light_theme/icon_add_annotation.svg b/public/img/icons_light_theme/icon_add_annotation.svg
index cb306bdd18b..1cf90df2bcb 100644
--- a/public/img/icons_light_theme/icon_add_annotation.svg
+++ b/public/img/icons_light_theme/icon_add_annotation.svg
@@ -4,7 +4,7 @@
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:none;}
-	.st1{fill:#555555;}
+	.st1{fill:#f7f8fa;}
 	.st2{fill:url(#SVGID_1_);}
 </style>
 <g>
@@ -13,7 +13,7 @@
 	<path class="st1" d="M31,41.9c0-2.9,2.4-5.3,5.3-5.3h4.1v-4.1c0-1.7,0.8-3.2,2.1-4.2V16.1v-3.9c0-4.5-3.7-8.2-8.2-8.2H17.8l0,0H8.2
 		C3.7,4,0,7.7,0,12.2v19.4c0,4.5,3.7,8.2,8.2,8.2h12.2l10.6,10v-0.1V41.9z M27.4,37.5L23,33.3H8.2c-0.9,0-1.7-0.7-1.7-1.7V12.2
 		c0-0.9,0.7-1.7,1.7-1.7h23.2l0,0h3.1c0.9,0,1.7,0.7,1.7,1.7v10.4v9l0,0c0,0.9-0.7,1.7-1.7,1.7h-7L27.4,37.5z"/>
-	
+
 		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="49.6596" y1="-13.1545" x2="49.6596" y2="47.3804" gradientTransform="matrix(1 0 0 -1 0 66)">
 		<stop  offset="0" style="stop-color:#FFF23A"/>
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
diff --git a/public/img/icons_light_theme/icon_add_annotation_alt.svg b/public/img/icons_light_theme/icon_add_annotation_alt.svg
index 2565f188d57..990df3a9d60 100644
--- a/public/img/icons_light_theme/icon_add_annotation_alt.svg
+++ b/public/img/icons_light_theme/icon_add_annotation_alt.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#f7f8fa;}
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <g>
@@ -14,7 +14,7 @@
 	<path class="st0" d="M47.6,9.2L47.8,9l1.3-1.3c1.3-1.3,1.3-3.4,0-4.7s-3.4-1.3-4.7,0l-1.3,1.3l-0.2,0.2L42,5.3l4.7,4.7L47.6,9.2z"
 		/>
 	<polygon class="st0" points="24.2,24.3 24.1,24.7 23.5,28.5 27.3,27.9 27.7,27.8 29.2,27.6 24.5,22.9 	"/>
-	
+
 		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="49.6596" y1="-15.1627" x2="49.6596" y2="45.3912" gradientTransform="matrix(1 0 0 -1 0 66)">
 		<stop  offset="0" style="stop-color:#FFF23A"/>
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
diff --git a/public/img/icons_light_theme/icon_add_folder.svg b/public/img/icons_light_theme/icon_add_folder.svg
index 81bbf349616..a127eeb4dee 100644
--- a/public/img/icons_light_theme/icon_add_folder.svg
+++ b/public/img/icons_light_theme/icon_add_folder.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+  .st0{fill:#52545c;}
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <g>
diff --git a/public/img/icons_light_theme/icon_add_link.svg b/public/img/icons_light_theme/icon_add_link.svg
index df31a3e99a3..cdeb4450bb4 100644
--- a/public/img/icons_light_theme/icon_add_link.svg
+++ b/public/img/icons_light_theme/icon_add_link.svg
@@ -4,7 +4,7 @@
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#66C9DC;}
-	.st1{fill:#555555;}
+	.st1{fill:#f7f8fa;}
 	.st2{fill:#5CB947;}
 	.st3{fill:url(#SVGID_1_);}
 </style>
diff --git a/public/img/icons_light_theme/icon_add_notification_channel.svg b/public/img/icons_light_theme/icon_add_notification_channel.svg
index 9059310dcdf..68fad3d13a5 100644
--- a/public/img/icons_light_theme/icon_add_notification_channel.svg
+++ b/public/img/icons_light_theme/icon_add_notification_channel.svg
@@ -4,7 +4,7 @@
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:none;}
-	.st1{fill:#555555;}
+	.st1{fill:#f7f8fa;}
 	.st2{fill:url(#SVGID_1_);}
 </style>
 <circle class="st0" cx="27.9" cy="30.3" r="5"/>
diff --git a/public/img/icons_light_theme/icon_add_panel.svg b/public/img/icons_light_theme/icon_add_panel.svg
index c04c6f719e2..e5630d26bb6 100644
--- a/public/img/icons_light_theme/icon_add_panel.svg
+++ b/public/img/icons_light_theme/icon_add_panel.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="117.8px" height="64px" viewBox="0 0 117.8 64" style="enable-background:new 0 0 117.8 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <g>
diff --git a/public/img/icons_light_theme/icon_add_variable.svg b/public/img/icons_light_theme/icon_add_variable.svg
index da50f124e2b..3ae26bf4d9f 100644
--- a/public/img/icons_light_theme/icon_add_variable.svg
+++ b/public/img/icons_light_theme/icon_add_variable.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+  .st0{fill:#f7f8fa;}
 	.st1{fill:url(#SVGID_1_);}
 	.st2{fill:url(#SVGID_2_);}
 </style>
diff --git a/public/img/icons_light_theme/icon_alert.svg b/public/img/icons_light_theme/icon_alert.svg
index a3109c23fa1..5f8b16acaa2 100644
--- a/public/img/icons_light_theme/icon_alert.svg
+++ b/public/img/icons_light_theme/icon_alert.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+  .st0{fill:#52545c;}
 </style>
 <g>
 	<g>
diff --git a/public/img/icons_light_theme/icon_alert_alt.svg b/public/img/icons_light_theme/icon_alert_alt.svg
index 0d105481a7d..542004bc4d3 100644
--- a/public/img/icons_light_theme/icon_alert_alt.svg
+++ b/public/img/icons_light_theme/icon_alert_alt.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 	.st1{fill:url(#SVGID_1_);}
 	.st2{fill:url(#SVGID_2_);}
 	.st3{fill:url(#SVGID_3_);}
diff --git a/public/img/icons_light_theme/icon_alert_off.svg b/public/img/icons_light_theme/icon_alert_off.svg
index b8fd5b000a3..279f3277ef3 100644
--- a/public/img/icons_light_theme/icon_alert_off.svg
+++ b/public/img/icons_light_theme/icon_alert_off.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M34.5,64c4.5,0,8.1-3.6,8.1-8.1H26.4C26.4,60.4,30,64,34.5,64z"/>
diff --git a/public/img/icons_light_theme/icon_alert_rules.svg b/public/img/icons_light_theme/icon_alert_rules.svg
index 0c429a93e48..b7f000dc67b 100644
--- a/public/img/icons_light_theme/icon_alert_rules.svg
+++ b/public/img/icons_light_theme/icon_alert_rules.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <circle class="st0" cx="6" cy="12" r="6"/>
 <path class="st0" d="M59,17.6H20.2c-2.8,0-5-2.2-5-5l0,0c0-2.8,2.2-5,5-5H59c2.8,0,5,2.2,5,5l0,0C64,15.3,61.8,17.6,59,17.6z"/>
diff --git a/public/img/icons_light_theme/icon_annotation.svg b/public/img/icons_light_theme/icon_annotation.svg
index ce8aa4e3372..86cfc857e97 100644
--- a/public/img/icons_light_theme/icon_annotation.svg
+++ b/public/img/icons_light_theme/icon_annotation.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<g>
diff --git a/public/img/icons_light_theme/icon_annotation_alt.svg b/public/img/icons_light_theme/icon_annotation_alt.svg
index 5379a6185c4..aaf3117f313 100644
--- a/public/img/icons_light_theme/icon_annotation_alt.svg
+++ b/public/img/icons_light_theme/icon_annotation_alt.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<g>
diff --git a/public/img/icons_light_theme/icon_apikeys.svg b/public/img/icons_light_theme/icon_apikeys.svg
index c54aabe4e30..a79d66dd370 100644
--- a/public/img/icons_light_theme/icon_apikeys.svg
+++ b/public/img/icons_light_theme/icon_apikeys.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+  .st0{fill:#52545c;}
 </style>
 <path class="st0" d="M59.5,50.8L28.4,19.6C32.2,15,32,8.2,27.6,3.9c-2.3-2.3-5.3-3.4-8.3-3.4s-6,1.1-8.3,3.4L5.7,9.3
 	c-4.6,4.6-4.6,12,0,16.6C8,28.1,11,29.2,14,29.2c2.6,0,5.3-0.9,7.5-2.7l20.9,20.9L35.8,54c-0.5,0.5-0.5,1.3,0,1.8l2.1,2.1
diff --git a/public/img/icons_light_theme/icon_cog.svg b/public/img/icons_light_theme/icon_cog.svg
index c8ccfaa38f3..049e56f4cca 100644
--- a/public/img/icons_light_theme/icon_cog.svg
+++ b/public/img/icons_light_theme/icon_cog.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M64,36.1V28l-8.7-2.5c-0.5-1.8-1.3-3.6-2.2-5.2l4.4-7.9l-5.7-5.7l-7.9,4.4c-1.6-0.9-3.4-1.7-5.2-2.2L36.1,0H28
diff --git a/public/img/icons_light_theme/icon_dashboard.svg b/public/img/icons_light_theme/icon_dashboard.svg
index 2e275b87568..140076e9249 100644
--- a/public/img/icons_light_theme/icon_dashboard.svg
+++ b/public/img/icons_light_theme/icon_dashboard.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+  .st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M24.5,31H6.1C2.7,31,0,28.3,0,24.9V6.5c0-3.4,2.7-6.1,6.1-6.1h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
diff --git a/public/img/icons_light_theme/icon_dashboard_fav.svg b/public/img/icons_light_theme/icon_dashboard_fav.svg
index 6ec8730e3ad..64e0c8e0831 100644
--- a/public/img/icons_light_theme/icon_dashboard_fav.svg
+++ b/public/img/icons_light_theme/icon_dashboard_fav.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <path class="st0" d="M23.5,22.7l7-17.3c-0.5-2.8-3-5-6-5H6.1C2.7,0.4,0,3.1,0,6.5v18.4C0,28.3,2.7,31,6.1,31H9l-7.4-6.5L23.5,22.7z"
diff --git a/public/img/icons_light_theme/icon_dashboard_list.svg b/public/img/icons_light_theme/icon_dashboard_list.svg
index c6d8ddd6c5e..0cde7975b2a 100644
--- a/public/img/icons_light_theme/icon_dashboard_list.svg
+++ b/public/img/icons_light_theme/icon_dashboard_list.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="18px" height="18px" viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#35373F;}
+  .st0{fill:#52545c;}
 </style>
 <g>
 	<g>
diff --git a/public/img/icons_light_theme/icon_data_sources.svg b/public/img/icons_light_theme/icon_data_sources.svg
index 3a6e65e8761..aa2829de4ec 100644
--- a/public/img/icons_light_theme/icon_data_sources.svg
+++ b/public/img/icons_light_theme/icon_data_sources.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="100px" height="100px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+  .st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M50,84.1c-22.1,0-40.7-6.5-49.3-16.2C0.2,69.1,0,70.4,0,71.7c0,13,22.9,23.9,50,23.9s50-11,50-23.9
diff --git a/public/img/icons_light_theme/icon_home.svg b/public/img/icons_light_theme/icon_home.svg
index a7f0fde536a..1ce7799c9f2 100644
--- a/public/img/icons_light_theme/icon_home.svg
+++ b/public/img/icons_light_theme/icon_home.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <path class="st0" d="M63.2,32l-7-7V11.8c0-2.9-2.4-5.3-5.3-5.3l0,0c-2.9,0-5.3,2.4-5.3,5.3v2.6L34,2.8c-1.1-1.1-2.8-1.1-3.9,0
 	L0.8,32c-1.7,1.7-0.5,4.7,2,4.7h5l0,0v7.6v14.8c0,1.5,1.2,2.8,2.8,2.8h13.2V44.4h16.5V62h13.2c1.5,0,2.8-1.2,2.8-2.8V36.8l0,0l0,0h5
diff --git a/public/img/icons_light_theme/icon_import_dashboard.svg b/public/img/icons_light_theme/icon_import_dashboard.svg
index d1b5f2fe17e..f2015379be3 100644
--- a/public/img/icons_light_theme/icon_import_dashboard.svg
+++ b/public/img/icons_light_theme/icon_import_dashboard.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+  .st0{fill:#52545c;}
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <path class="st0" d="M8.1,26.5h15.6c2.8,0,5.2-2.3,5.2-5.2V5.8c0-2.8-2.3-5.2-5.2-5.2H8.1c-2.8,0-5.2,2.3-5.2,5.2v15.6
diff --git a/public/img/icons_light_theme/icon_json.svg b/public/img/icons_light_theme/icon_json.svg
index 42ea7083403..d8f748e5e94 100644
--- a/public/img/icons_light_theme/icon_json.svg
+++ b/public/img/icons_light_theme/icon_json.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M0.1,31.8c0-1.6,1-2.9,2.5-3.4c0.5-0.2,1-0.4,1.4-0.6c0.9-0.6,1.4-1.5,1.4-2.7v-9.9c0-2,0.4-3.5,1.1-4.5
diff --git a/public/img/icons_light_theme/icon_link.svg b/public/img/icons_light_theme/icon_link.svg
index 7201eb6aa3a..ca0de590eb4 100644
--- a/public/img/icons_light_theme/icon_link.svg
+++ b/public/img/icons_light_theme/icon_link.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<ellipse class="st0" cx="30.2" cy="33.8" rx="0" ry="0"/>
diff --git a/public/img/icons_light_theme/icon_new_dashboard.svg b/public/img/icons_light_theme/icon_new_dashboard.svg
index 9ed93e4732b..83e04863aa4 100644
--- a/public/img/icons_light_theme/icon_new_dashboard.svg
+++ b/public/img/icons_light_theme/icon_new_dashboard.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <g>
diff --git a/public/img/icons_light_theme/icon_notification_channels.svg b/public/img/icons_light_theme/icon_notification_channels.svg
index aa6ada13c8a..ae42f0fd8d1 100644
--- a/public/img/icons_light_theme/icon_notification_channels.svg
+++ b/public/img/icons_light_theme/icon_notification_channels.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <path class="st0" d="M56.3,44.5c-1.6,0-3.2,0.5-4.4,1.4l-8.1-4.7c0.3-1,0.4-2,0.4-3.1c0-5.6-3.8-10.4-9-11.8v-7.5
 	c2.6-1.2,4.5-3.9,4.5-7c0-4.2-3.4-7.7-7.7-7.7s-7.7,3.4-7.7,7.7c0,3.1,1.8,5.7,4.5,7v7.5c-5.2,1.4-9,6.1-9,11.8
diff --git a/public/img/icons_light_theme/icon_org.svg b/public/img/icons_light_theme/icon_org.svg
index 2c4b738bda2..2f0eeb54a9e 100644
--- a/public/img/icons_light_theme/icon_org.svg
+++ b/public/img/icons_light_theme/icon_org.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M63.8,55.9h-2.1c-0.1,0-0.2-0.1-0.2-0.2V20.3c0-0.1-0.1-0.2-0.2-0.2l-20.5-3.1c0,0-0.1,0-0.1,0l-4.7,1.3
diff --git a/public/img/icons_light_theme/icon_playlist.svg b/public/img/icons_light_theme/icon_playlist.svg
index 772ad4f7a6f..53cab585fc5 100644
--- a/public/img/icons_light_theme/icon_playlist.svg
+++ b/public/img/icons_light_theme/icon_playlist.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M60.8,4.4H18.9c-1.8,0-3.2,1.4-3.2,3.2v6.6h36.9c3.6,0,6.6,2.9,6.6,6.6V35h1.6c1.8,0,3.2-1.4,3.2-3.2V7.5
diff --git a/public/img/icons_light_theme/icon_plugins.svg b/public/img/icons_light_theme/icon_plugins.svg
index 7f5dd78e1da..49df86fc8e2 100644
--- a/public/img/icons_light_theme/icon_plugins.svg
+++ b/public/img/icons_light_theme/icon_plugins.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <path class="st0" d="M59.4,23.7c-1.7-1.7-4.4-1.7-6,0L41.6,35.6l-12.9-13l11.8-11.9c1.7-1.7,1.7-4.4,0-6.1s-4.4-1.7-6,0L22.7,16.5
 	L12.6,6.2C1.3,17.6,0.4,35.5,9.8,48l-3.6,3.6c-1.7,1.7-1.7,4.4,0,6.1c1.7,1.7,4.4,1.7,6,0l3.6-3.6c12.4,9.5,30.1,8.6,41.4-2.8
diff --git a/public/img/icons_light_theme/icon_preferences.svg b/public/img/icons_light_theme/icon_preferences.svg
index ea2f7d70def..bbf01f74e52 100644
--- a/public/img/icons_light_theme/icon_preferences.svg
+++ b/public/img/icons_light_theme/icon_preferences.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <path class="st0" d="M23,48H3.2C1.4,48,0,49.3,0,51s1.4,3,3.2,3H23c-0.5-0.9-0.8-1.9-0.8-3S22.4,48.9,23,48z"/>
 <path class="st0" d="M34.7,54h26.1c1.8,0,3.2-1.3,3.2-3s-1.4-3-3.2-3H34.7c0.5,0.9,0.8,1.9,0.8,3S35.2,53.1,34.7,54z"/>
diff --git a/public/img/icons_light_theme/icon_question.svg b/public/img/icons_light_theme/icon_question.svg
index 90e284508ff..c213174208e 100644
--- a/public/img/icons_light_theme/icon_question.svg
+++ b/public/img/icons_light_theme/icon_question.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <path class="st0" d="M32.1,49.1c-1.9,0-3.5-1.6-3.5-3.5s1.6-3.5,3.5-3.5c1.9,0,3.5,1.6,3.5,3.5S34.1,49.1,32.1,49.1z M34.4,36.2v3.4
 	h-4.5v-7.9h2.4l0,0c3,0,5.4-2.4,5.4-5.3s-2.4-5.3-5.4-5.3c-2.1,0-3.9,1.1-4.9,2.9l-4.3-2c1.7-3.4,5.2-5.6,9.1-5.6
diff --git a/public/img/icons_light_theme/icon_shield.svg b/public/img/icons_light_theme/icon_shield.svg
index 675cad7c2ad..d86f0493afe 100644
--- a/public/img/icons_light_theme/icon_shield.svg
+++ b/public/img/icons_light_theme/icon_shield.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M14.9,46.8c-0.7-1-1.3-2-2-3C13.6,44.9,14.2,45.9,14.9,46.8z"/>
diff --git a/public/img/icons_light_theme/icon_sitemap.svg b/public/img/icons_light_theme/icon_sitemap.svg
index c19c62cb4b0..646bccfc41f 100644
--- a/public/img/icons_light_theme/icon_sitemap.svg
+++ b/public/img/icons_light_theme/icon_sitemap.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <path class="st0" d="M57.3,41.8V35c0-3.5-2.8-6.3-6.3-6.3H34.7v-6.5c3.9-1.2,6.7-4.8,6.7-9l0,0c0-5.2-4.2-9.4-9.4-9.4
 	s-9.4,4.2-9.4,9.4l0,0c0,4.3,2.8,7.9,6.7,9v6.5H13.1c-3.5,0-6.3,2.8-6.3,6.3v6.8C2.8,43,0,46.6,0,50.9l0,0c0,5.2,4.2,9.4,9.4,9.4
diff --git a/public/img/icons_light_theme/icon_snapshots.svg b/public/img/icons_light_theme/icon_snapshots.svg
index 7c29338a52f..4bfe0ae0ec1 100644
--- a/public/img/icons_light_theme/icon_snapshots.svg
+++ b/public/img/icons_light_theme/icon_snapshots.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M62,16.6L56.2,14l0.8-3l-8.6-2.4v-5H43l-0.2-1.4l-9,1.4h-1.1L24.2,0l-0.8,1.8l-6.2-1.7l-1,3.6h-9v4.1L2,8.6
diff --git a/public/img/icons_light_theme/icon_team.svg b/public/img/icons_light_theme/icon_team.svg
index 21efa62218e..d4f453afb6b 100644
--- a/public/img/icons_light_theme/icon_team.svg
+++ b/public/img/icons_light_theme/icon_team.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M54.1,40.6c0,0-0.1-0.1-0.2-0.1c-0.9-0.5-0.7-1.9-0.5-2.6c0.6-0.7,1.3-1.8,1.5-3.6c0.1-0.5,0.3-1,0.6-1.3
diff --git a/public/img/icons_light_theme/icon_user.svg b/public/img/icons_light_theme/icon_user.svg
index 205a345755a..568e5215dd4 100644
--- a/public/img/icons_light_theme/icon_user.svg
+++ b/public/img/icons_light_theme/icon_user.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M41.5,35.5c-0.1-0.1-0.2-0.1-0.4-0.2c-1.2-0.7-1-2.6-0.7-3.8c0.9-1,1.8-2.5,2.2-5.2c0.1-0.7,0.4-1.3,0.8-1.9
diff --git a/public/img/icons_light_theme/icon_variable.svg b/public/img/icons_light_theme/icon_variable.svg
index 8624f74bc63..a4603109e14 100644
--- a/public/img/icons_light_theme/icon_variable.svg
+++ b/public/img/icons_light_theme/icon_variable.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M33.5,27.3c2.2-3.7,4-6.1,5.4-7.1c1.4-1.1,2.7-1.6,4.1-1.6c1.2,0,2.2,0.4,2.9,1.1c0.8,0.7,1.1,1.6,1.1,2.7
diff --git a/public/img/icons_light_theme/icon_zoom_out.svg b/public/img/icons_light_theme/icon_zoom_out.svg
index b85181c1a31..7dfd3cf2600 100644
--- a/public/img/icons_light_theme/icon_zoom_out.svg
+++ b/public/img/icons_light_theme/icon_zoom_out.svg
@@ -3,7 +3,7 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#555555;}
+	.st0{fill:#52545c;}
 </style>
 <g>
 	<path class="st0" d="M62.5,55.1L43.9,36.6C49.8,27.4,48.7,15,40.7,7C31.4-2.3,16.3-2.3,7,7s-9.3,24.4,0,33.7c8,8,20.4,9.1,29.6,3.3
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index a91b4019d1e..e3f442b8908 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -59,7 +59,8 @@ $critical: #ec2128;
 $body-bg: $gray-7;
 $page-bg: $gray-7;
 $body-color: $gray-1;
-$text-color: $dark-4;
+//$text-color: $dark-4;
+$text-color: $gray-1;
 $text-color-strong: $white;
 $text-color-weak: $gray-2;
 $text-color-faint: $gray-4;

From 512f6992f162bebce444486c1cacb85995b1eebc Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Fri, 2 Feb 2018 10:33:31 +0100
Subject: [PATCH 3/6] dashfolders: rename Root folder to General. Closes #10692

---
 pkg/api/dashboard.go                               |  4 ++--
 public/app/core/services/search_srv.ts             |  2 +-
 public/app/core/specs/manage_dashboards.jest.ts    | 14 +++++++-------
 public/app/core/specs/search.jest.ts               |  4 ++--
 .../dashboard/folder_picker/folder_picker.ts       | 13 ++++++++-----
 public/app/features/dashboard/validation_srv.ts    |  4 ++--
 6 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 0e38a7587dc..6376b842192 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -88,8 +88,8 @@ func GetDashboard(c *middleware.Context) Response {
 		HasAcl:      dash.HasAcl,
 		IsFolder:    dash.IsFolder,
 		FolderId:    dash.FolderId,
-		FolderTitle: "Root",
 		Url:         dash.GetUrl(),
+		FolderTitle: "General",
 	}
 
 	// lookup folder title
@@ -309,7 +309,7 @@ func GetHomeDashboard(c *middleware.Context) Response {
 	dash := dtos.DashboardFullWithMeta{}
 	dash.Meta.IsHome = true
 	dash.Meta.CanEdit = c.SignedInUser.HasRole(m.ROLE_EDITOR)
-	dash.Meta.FolderTitle = "Root"
+	dash.Meta.FolderTitle = "General"
 
 	jsonParser := json.NewDecoder(file)
 	if err := jsonParser.Decode(&dash.Dashboard); err != nil {
diff --git a/public/app/core/services/search_srv.ts b/public/app/core/services/search_srv.ts
index cb9862f8cce..7bee5cdfec6 100644
--- a/public/app/core/services/search_srv.ts
+++ b/public/app/core/services/search_srv.ts
@@ -161,7 +161,7 @@ export class SearchSrv {
         } else {
           section = {
             id: 0,
-            title: 'Root',
+            title: 'General',
             items: [],
             icon: 'fa fa-folder-open',
             toggle: this.toggleFolder.bind(this),
diff --git a/public/app/core/specs/manage_dashboards.jest.ts b/public/app/core/specs/manage_dashboards.jest.ts
index b79c4fa06a3..8c640bc0630 100644
--- a/public/app/core/specs/manage_dashboards.jest.ts
+++ b/public/app/core/specs/manage_dashboards.jest.ts
@@ -30,7 +30,7 @@ describe('ManageDashboards', () => {
         },
         {
           id: 0,
-          title: 'Root',
+          title: 'General',
           icon: 'fa fa-folder-open',
           uri: 'db/something-else',
           type: 'dash-db',
@@ -363,7 +363,7 @@ describe('ManageDashboards', () => {
           },
           {
             id: 0,
-            title: 'Root',
+            title: 'General',
             items: [{ id: 3, checked: true }],
             checked: false,
           },
@@ -391,7 +391,7 @@ describe('ManageDashboards', () => {
           },
           {
             id: 0,
-            title: 'Root',
+            title: 'General',
             items: [{ id: 3, checked: false }],
             checked: false,
           },
@@ -420,7 +420,7 @@ describe('ManageDashboards', () => {
           },
           {
             id: 0,
-            title: 'Root',
+            title: 'General',
             items: [{ id: 3, checked: true }],
             checked: false,
           },
@@ -455,7 +455,7 @@ describe('ManageDashboards', () => {
           },
           {
             id: 0,
-            title: 'Root',
+            title: 'General',
             items: [{ id: 3, checked: false }],
             checked: false,
           },
@@ -497,7 +497,7 @@ describe('ManageDashboards', () => {
         },
         {
           id: 0,
-          title: 'Root',
+          title: 'General',
           items: [{ id: 3, checked: true, uid: 'root-dash' }],
           checked: true,
         },
@@ -541,7 +541,7 @@ describe('ManageDashboards', () => {
         },
         {
           id: 0,
-          title: 'Root',
+          title: 'General',
           items: [{ id: 3, checked: true, uid: 'dash-2' }],
           checked: false,
         },
diff --git a/public/app/core/specs/search.jest.ts b/public/app/core/specs/search.jest.ts
index 2457d71a48d..2c1172bcf55 100644
--- a/public/app/core/specs/search.jest.ts
+++ b/public/app/core/specs/search.jest.ts
@@ -49,7 +49,7 @@ describe('SearchCtrl', () => {
         },
         {
           id: 0,
-          title: 'Root',
+          title: 'General',
           items: [{ id: 3, selected: false }, { id: 5, selected: false }],
           selected: false,
           expanded: true,
@@ -146,7 +146,7 @@ describe('SearchCtrl', () => {
         },
         {
           id: 0,
-          title: 'Root',
+          title: 'General',
           items: [{ id: 3, selected: false }, { id: 5, selected: false }],
           selected: false,
           expanded: true,
diff --git a/public/app/features/dashboard/folder_picker/folder_picker.ts b/public/app/features/dashboard/folder_picker/folder_picker.ts
index 74b13c5c2a5..5eb3d094641 100644
--- a/public/app/features/dashboard/folder_picker/folder_picker.ts
+++ b/public/app/features/dashboard/folder_picker/folder_picker.ts
@@ -12,7 +12,7 @@ export class FolderPickerCtrl {
   enterFolderCreation: any;
   exitFolderCreation: any;
   enableCreateNew: boolean;
-  rootName = 'Root';
+  rootName = 'General';
   folder: any;
   createNewFolder: boolean;
   newFolderName: string;
@@ -33,10 +33,13 @@ export class FolderPickerCtrl {
     return this.backendSrv.get('api/dashboards/folders', { query: query }).then(result => {
       if (
         query === '' ||
-        query.toLowerCase() === 'r' ||
-        query.toLowerCase() === 'ro' ||
-        query.toLowerCase() === 'roo' ||
-        query.toLowerCase() === 'root'
+        query.toLowerCase() === 'g' ||
+        query.toLowerCase() === 'ge' ||
+        query.toLowerCase() === 'gen' ||
+        query.toLowerCase() === 'gene' ||
+        query.toLowerCase() === 'gener' ||
+        query.toLowerCase() === 'genera' ||
+        query.toLowerCase() === 'general'
       ) {
         result.unshift({ title: this.rootName, id: 0 });
       }
diff --git a/public/app/features/dashboard/validation_srv.ts b/public/app/features/dashboard/validation_srv.ts
index e70bb0c426d..8460f4efa71 100644
--- a/public/app/features/dashboard/validation_srv.ts
+++ b/public/app/features/dashboard/validation_srv.ts
@@ -1,7 +1,7 @@
 import coreModule from 'app/core/core_module';
 
 export class ValidationSrv {
-  rootName = 'root';
+  rootName = 'general';
 
   /** @ngInject */
   constructor(private $q, private backendSrv) {}
@@ -19,7 +19,7 @@ export class ValidationSrv {
     if (name.toLowerCase() === this.rootName) {
       return this.$q.reject({
         type: 'EXISTING',
-        message: 'A folder or dashboard with the same name already exists',
+        message: 'This is a reserved name and cannot be used for a folder.',
       });
     }
 

From 0c98c4db306fe31b7ddb5dd3844a7a540881debe Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 2 Feb 2018 10:56:49 +0100
Subject: [PATCH 4/6] removes uid when using 'save as'

closes #10720
---
 public/app/features/dashboard/save_as_modal.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts
index 04b029cbb4c..15a3ce5dba7 100644
--- a/public/app/features/dashboard/save_as_modal.ts
+++ b/public/app/features/dashboard/save_as_modal.ts
@@ -46,6 +46,7 @@ export class SaveDashboardAsModalCtrl {
     var dashboard = this.dashboardSrv.getCurrent();
     this.clone = dashboard.getSaveModelClone();
     this.clone.id = null;
+    this.clone.uid = '';
     this.clone.title += ' Copy';
     this.clone.editable = true;
     this.clone.hideControls = false;

From 130a2b6499e940678c0f447e54a08da17b27561e Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 2 Feb 2018 11:06:32 +0100
Subject: [PATCH 5/6] handle new error message

---
 pkg/api/dashboard.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 6376b842192..0267e2097eb 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -249,6 +249,9 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
 		if err == m.ErrDashboardWithSameUIDExists {
 			return Json(412, util.DynMap{"status": "name-exists", "message": err.Error()})
 		}
+		if err == m.ErrDashboardWithSameNameInFolderExists {
+			return Json(412, util.DynMap{"status": "name-exists", "message": err.Error()})
+		}
 		if err == m.ErrDashboardVersionMismatch {
 			return Json(412, util.DynMap{"status": "version-mismatch", "message": err.Error()})
 		}

From a0d8e96fd1b859e9e539232c0540344a218ad8da Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Fri, 2 Feb 2018 11:17:25 +0100
Subject: [PATCH 6/6] docs: dashboard provisioning

---
 docs/sources/guides/whats-new-in-v5.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/sources/guides/whats-new-in-v5.md b/docs/sources/guides/whats-new-in-v5.md
index 4580dbffd66..3f5b3626773 100644
--- a/docs/sources/guides/whats-new-in-v5.md
+++ b/docs/sources/guides/whats-new-in-v5.md
@@ -105,9 +105,9 @@ It's also possible to update and delete data sources from the config file. More
 
 ### Dashboards
 
-We also deprecated the [dashboard.json] in favor of our new dashboard provisioner that keeps dashboards on disk
+We also deprecated the `[dashboard.json]` in favor of our new dashboard provisioner that keeps dashboards on disk
 in sync with dashboards in Grafana's database. The dashboard provisioner has multiple advantages over the old
-[dashboard.json] feature. Instead of storing the dashboard in memory we now insert the dashboard into the database,
+`[dashboard.json]` feature. Instead of storing the dashboard in memory we now insert the dashboard into the database,
 which makes it possible to star them, use one as the home dashboard, set permissions and other features in Grafana that
 expects the dashboards to exist in the database. More info in the [dashboard provisioning docs](/administration/provisioning/#dashboards)
 
@@ -117,4 +117,4 @@ We are introducing a new identifier (`uid`) in the dashboard JSON model. The new
 We are also changing the route for getting dashboards to use this `uid` instead of the slug that the current route and API are using.
 We will keep supporting the old route for backward compatibility. This will make it possible to change the title on dashboards without breaking links.
 Sharing dashboards between instances becomes much easier since the uid is unique (unique enough). This might seem like a small change,
-but we are incredibly excited about it since it will make it much easier to manage, collaborate and navigate between dashboards.
\ No newline at end of file
+but we are incredibly excited about it since it will make it much easier to manage, collaborate and navigate between dashboards.