fixes after upstream merge

src/app/directives/configModal.js

@@ -14,6 +14,12 @@ function (angular) {
           // create a new modal. Can't reuse one modal unforunately as the directive will not
           // re-render on show.
           elem.bind('click',function(){
+            if (scope.openConfigureModal) {
+              scope.openConfigureModal();
+              scope.$apply();
+              return;
+            }
+
             var panelModal = $modal({
               template: './app/partials/paneleditor.html',
               persist: true,

src/app/directives/kibanaPanel.js

@@ -34,7 +34,7 @@ function (angular) {
             '<span class="row-text">{{panel.type}}</span>'+
           '</span>' +
 
-	  '<span class="row-button extra" ng-show="panel.editable != false">' +
+          '<span class="row-button extra" ng-show="panel.editable != false">' +
             '<span config-modal class="pointer">'+
             '<i class="icon-cog pointer" bs-tooltip="\'Configure\'"></i></span>'+
           '</span>' +
@@ -50,7 +50,7 @@ function (angular) {
             '</span>'+
           '</span>' +
 
-          '<span class="row-button row-text panel-title pointer" ng-show="panel.title" ng-click="openConfigureModal($event)">' +
+          '<span class="row-button row-text panel-title pointer" ng-show="panel.title" ng-click="openConfigureModal()">' +
             '{{panel.title}}' +
           '</span>'+
 

src/app/panels/graphite/module.js

@@ -211,7 +211,7 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
 
 
     $scope.init = function() {
-      $scope.openConfigureModal({preventDefault: function() {}, stopPropagation: function() {} });
+      $scope.openConfigureModal();
 
       // Hide view options by default
       $scope.options = false;
@@ -398,9 +398,12 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv, RQ) {
       $scope.panel.targets.push({target: ''});
     };
 
-    $scope.openConfigureModal = function($event) {
-      $event.preventDefault();
-      $event.stopPropagation();
+    $scope.openConfigureModal = function() {
+      if ($scope.inEditMode) {
+        $rootScope.$emit('fullEditMode', false);
+        return;
+      }
+
       var oldHeight = $scope.row.height;
       $scope.row.height = 200;
 

src/vendor/bootstrap/less/grafana.less

@@ -19,9 +19,8 @@
 }
 
 .modal {
-  width: 770px;
-  margin-left: -385px;
-  top: 100px !important;
+  margin: 5%;
+  width: 90%;
 }
 
 .grafana-search-metric-actions {