From 97cc454ded6a700aa6204afd099bcbe1c176afa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 1 Nov 2017 14:23:46 +0100
Subject: [PATCH] ux: minor changes

---
 pkg/api/index.go                              |  6 ----
 .../core/components/sidemenu/sidemenu.html    |  4 +--
 .../features/dashboard/dashnav/dashnav.html   |  2 +-
 .../img/icons_dark_theme/icon_add_panel.svg   | 32 +++++++++++++++++++
 .../img/icons_light_theme/icon_add_panel.svg  | 32 +++++++++++++++++++
 public/sass/base/_icons.scss                  |  5 +++
 public/sass/components/_cards.scss            |  2 +-
 public/sass/components/_sidemenu.scss         |  5 +--
 scripts/webpack/webpack.dev.js                |  3 +-
 9 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 public/img/icons_dark_theme/icon_add_panel.svg
 create mode 100644 public/img/icons_light_theme/icon_add_panel.svg

diff --git a/pkg/api/index.go b/pkg/api/index.go
index 41fff516f2d..bf5a128a03f 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -218,12 +218,6 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 						{Text: "New", Url: setting.AppSubUrl + "/datasources", Icon: "fa fa-fw fa-plus"},
 					},
 				},
-				{
-					Text:        "Dashboard List",
-					Description: "Manage Dashboards And Folders",
-					Id:          "dashboards",
-					Url:         setting.AppSubUrl + "/dashboards",
-				},
 				{
 					Text:        "Preferences",
 					Id:          "org",
diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html
index 212e37199f8..2869562c5b1 100644
--- a/public/app/core/components/sidemenu/sidemenu.html
+++ b/public/app/core/components/sidemenu/sidemenu.html
@@ -1,7 +1,5 @@
 <a class="sidemenu__logo" ng-click="ctrl.toggleSideMenu()">
-	<span class="navbar-brand-btn-background">
-		<img src="public/img/grafana_icon.svg"></img>
-	</span>
+	<img src="public/img/grafana_icon.svg"></img>
 </a>
 
 <div class="sidemenu__top">
diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index c23a15aa208..833a3351e4c 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -21,7 +21,7 @@
 		<ul class="nav dashnav-action-icons">
 			<li ng-show="::ctrl.dashboard.meta.canStar">
 				<a class="pointer" ng-click="ctrl.starDashboard()">
-					<i class="fa" ng-class="{'fa-star-o': !ctrl.dashboard.meta.isStarred, 'fa-star': ctrl.dashboard.meta.isStarred}"></i>
+					<i class="fa" ng-class="{'fa-star-o': !ctrl.dashboard.meta.isStarred, 'fa-star': ctrl.dashboard.meta.isStarred}" style="color: orange;"></i>
 				</a>
 			</li>
 			<li ng-show="::ctrl.dashboard.meta.canShare" class="dropdown">
diff --git a/public/img/icons_dark_theme/icon_add_panel.svg b/public/img/icons_dark_theme/icon_add_panel.svg
new file mode 100644
index 00000000000..a3005b3ee1c
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_add_panel.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<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:#E3E2E2;}
+	.st1{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<path class="st0" d="M15.2,22.7H1.9c-1.1,0-1.9,0.9-1.9,1.9v37.5C0,63.2,0.9,64,1.9,64h13.3c1.1,0,1.9-0.9,1.9-1.9V24.6
+		C17.1,23.5,16.3,22.7,15.2,22.7z"/>
+	<path class="st0" d="M36.3,10.2H23c-1.1,0-1.9,0.9-1.9,1.9v50c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9v-50
+		C38.2,11.1,37.3,10.2,36.3,10.2z"/>
+	<path class="st0" d="M57.3,32H44c-1.1,0-1.9,0.9-1.9,1.9v28.1c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9V34
+		C59.2,32.9,58.4,32,57.3,32z"/>
+	<path class="st0" d="M70.1,38V26.1c0-3.4,2.7-6.1,6.1-6.1h4.1V2c0-1.1-0.9-1.9-1.9-1.9H65.1C64,0,63.1,0.9,63.1,2v60.1
+		c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9V44.1h-4.1C72.9,44.1,70.1,41.3,70.1,38z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="96.4427" y1="83.7013" x2="96.4427" y2="-9.4831">
+		<stop  offset="0" style="stop-color:#FFF23A"/>
+		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
+		<stop  offset="0.1171" style="stop-color:#FED41A"/>
+		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
+		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
+		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
+		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="1" style="stop-color:#E83E39"/>
+	</linearGradient>
+	<path class="st1" d="M116.7,24.9h-7.2h-0.5h-5.4V11.8c0-0.6-0.5-1.1-1.1-1.1H90.5c-0.6,0-1.1,0.5-1.1,1.1v13.1h-9.1h-4.1
+		c-0.6,0-1.1,0.5-1.1,1.1V38c0,0.6,0.5,1.1,1.1,1.1h4.1h9.1v4.6v1.9v6.7c0,0.6,0.5,1.1,1.1,1.1h11.9c0.6,0,1.1-0.5,1.1-1.1V39.1
+		h13.1c0.6,0,1.1-0.5,1.1-1.1V26.1C117.8,25.5,117.3,24.9,116.7,24.9z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_add_panel.svg b/public/img/icons_light_theme/icon_add_panel.svg
new file mode 100644
index 00000000000..c04c6f719e2
--- /dev/null
+++ b/public/img/icons_light_theme/icon_add_panel.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<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;}
+	.st1{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<path class="st0" d="M15.2,22.7H1.9c-1.1,0-1.9,0.9-1.9,1.9v37.5C0,63.2,0.9,64,1.9,64h13.3c1.1,0,1.9-0.9,1.9-1.9V24.6
+		C17.1,23.5,16.3,22.7,15.2,22.7z"/>
+	<path class="st0" d="M36.3,10.2H23c-1.1,0-1.9,0.9-1.9,1.9v50c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9v-50
+		C38.2,11.1,37.3,10.2,36.3,10.2z"/>
+	<path class="st0" d="M57.3,32H44c-1.1,0-1.9,0.9-1.9,1.9v28.1c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9V34
+		C59.2,32.9,58.4,32,57.3,32z"/>
+	<path class="st0" d="M70.1,38V26.1c0-3.4,2.7-6.1,6.1-6.1h4.1V2c0-1.1-0.9-1.9-1.9-1.9H65.1C64,0,63.1,0.9,63.1,2v60.1
+		c0,1.1,0.9,1.9,1.9,1.9h13.3c1.1,0,1.9-0.9,1.9-1.9V44.1h-4.1C72.9,44.1,70.1,41.3,70.1,38z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="96.4427" y1="83.7013" x2="96.4427" y2="-9.4831">
+		<stop  offset="0" style="stop-color:#FFF23A"/>
+		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
+		<stop  offset="0.1171" style="stop-color:#FED41A"/>
+		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
+		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
+		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
+		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="1" style="stop-color:#E83E39"/>
+	</linearGradient>
+	<path class="st1" d="M116.7,24.9h-7.2h-0.5h-5.4V11.8c0-0.6-0.5-1.1-1.1-1.1H90.5c-0.6,0-1.1,0.5-1.1,1.1v13.1h-9.1h-4.1
+		c-0.6,0-1.1,0.5-1.1,1.1V38c0,0.6,0.5,1.1,1.1,1.1h4.1h9.1v4.6v1.9v6.7c0,0.6,0.5,1.1,1.1,1.1h11.9c0.6,0,1.1-0.5,1.1-1.1V39.1
+		h13.1c0.6,0,1.1-0.5,1.1-1.1V26.1C117.8,25.5,117.3,24.9,116.7,24.9z"/>
+</g>
+</svg>
diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss
index 3769ea4ff92..3388afb00d2 100644
--- a/public/sass/base/_icons.scss
+++ b/public/sass/base/_icons.scss
@@ -39,4 +39,9 @@
   background-image: url('../img/icons_#{$theme-name}_theme/icon_import_dashboard.svg');
 }
 
+.gicon-add-panel {
+  background-image: url('../img/icons_#{$theme-name}_theme/icon_add_panel.svg');
+}
+
+
 
diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss
index 69ee25ea191..c5979842206 100644
--- a/public/sass/components/_cards.scss
+++ b/public/sass/components/_cards.scss
@@ -158,7 +158,7 @@
     img {
       width: 6rem;
     }
-    .fa, .icon-gf {
+    .fa, .icon-gf, .gicon {
       font-size: 3.5rem;
     }
   }
diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index 088b09b7360..2facca8dadc 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -157,13 +157,10 @@ li.sidemenu-org-switcher {
   display: block;
   padding: 0.4rem 1.0rem 0.4rem 0.65rem;
   min-height: $navbarHeight;
+  position: relative;
 
   &:hover {
     background: $navbarButtonBackgroundHighlight;
-
-    .sidemenu__logo-expand {
-      display: block;
-    }
   }
 
   img {
diff --git a/scripts/webpack/webpack.dev.js b/scripts/webpack/webpack.dev.js
index 1ed9a412fdf..195ef54c5cc 100644
--- a/scripts/webpack/webpack.dev.js
+++ b/scripts/webpack/webpack.dev.js
@@ -21,7 +21,7 @@ module.exports = merge(common, {
   module: {
     rules: [
       require('./sass.rule.js')({
-        sourceMap: true, minimize: false
+        sourceMap: false, minimize: false
       })
     ]
   },
@@ -29,6 +29,7 @@ module.exports = merge(common, {
   plugins: [
     new ExtractTextPlugin({ // define where to save the file
       filename: 'grafana.[name].css',
+      allChunks: true,
     }),
     new HtmlWebpackPlugin({
       filename: path.resolve(__dirname, '../../public/views/index.html'),