Merge branch 'master' of https://github.com/utkarshcmu/grafana into metadata

public/app/partials/login.html

@@ -3,7 +3,8 @@
 	<div class="login-box">
 
 		<div class="login-box-logo">
-			<img src="img/logo_transparent_200x75.png">
+			<img class="logo-icon" src="img/grafana_icon.svg"></img><br>
+			<i class="icon-gf icon-gf-grafana_wordmark"></i>
 		</div>
 
     <div class="login-inner-box">

public/dashboards/home.json

@@ -12,10 +12,10 @@
     {
       "collapse": false,
       "editable": true,
-      "height": "100px",
+      "height": "90px",
       "panels": [
         {
-          "content": "<div class=\"text-center dashboard-header\">\nHome Dashboard\n</div>",
+          "content": "<div class=\"text-center dashboard-header\">\n  <span>Home Dashboard</span>\n</div>",
           "editable": true,
           "id": 1,
           "mode": "html",
@@ -23,7 +23,8 @@
           "style": {},
           "title": "",
           "transparent": true,
-          "type": "text"
+          "type": "text",
+          "links": []
         }
       ],
       "title": "New row"

public/less/grafana.less

@@ -391,12 +391,15 @@
 }
 
 .dashboard-header {
-  margin-top: 1rem;
   font-family: "grafana-icons";
   font-size: 22px;
-  padding-bottom: 1rem;
-  border: none;
-  border-bottom: 2px solid transparent;
-  border-image: linear-gradient(to right, rgba(255,213,0,1) 0%, rgba(255,68,0,1) 99%, rgba(255,68,0,1) 100%);
-  border-image-slice: 1;
+  text-align: center;
+  span {
+    display: inline-block;
+    border: none;
+    border-image: linear-gradient(to right, rgba(255,213,0,1) 0%, rgba(255,68,0,1) 99%, rgba(255,68,0,1) 100%);
+    border-image-slice: 1;
+    border-bottom: 2px solid transparent;
+    padding: 1.2rem 3rem 0.8rem 3rem;
+  }
 }

public/less/login.less

@@ -9,15 +9,23 @@
 
 .login-box {
   width: 700px;
-  margin: 100px auto 0 auto;
+  margin: 70px auto 0 auto;
 }
 
 .login-box-logo {
   text-align: center;
-  padding-bottom: 50px;
+  img {
+    width: 125px;
+  }
+  .icon-gf-grafana_wordmark {
+    color: @linkColor;
+    position: relative;
+    top: -90px;
+    font-size: 3rem;
+    text-shadow: 3px 3px 5px black;
+  }
 }
 
-
 .login-inner-box {
   background: @grafanaPanelBackground;
 }