Merge branch 'panel-edit-ux' of github.com:grafana/grafana into panel-edit-ux

public/app/features/dashboard/dashgrid/PanelEditor.tsx

@@ -101,15 +101,12 @@ export class PanelEditor extends React.Component<PanelEditorProps, any> {
           })}
 
           <div className="panel-editor__aside-actions">
-            <a className="btn btn-link" onClick={this.onClose}>
-              <i className="fa fa-check" /> Close
-            </a>
-            <a className="btn btn-link" onClick={this.onClose}>
-              <i className="fa fa-trash" /> Discard
-            </a>
-            <a className="btn btn-link" onClick={this.onClose}>
-              <i className="fa fa-copy" /> Save as master type
-            </a>
+            <button className="btn btn-success" onClick={this.onClose}>
+              Back to dashboard
+            </button>
+            <button className="btn btn-inverse" onClick={this.onClose}>
+              Discard changes
+            </button>
           </div>
         </div>
         <div className="panel-editor__content">

public/sass/components/_viz_editor.scss

@@ -140,11 +140,10 @@
   flex-direction: column;
   height: 100%;
   flex-grow: 1;
-  padding: 30px 0 0 0;
+  padding: 60px 15px;
 
-  a {
-    text-align: left;
-    padding-left: 20px;
+  button {
+    margin-bottom: 10px;
   }
 }