fixes after upstream merge

src/app/panels/filtering/module.html

@@ -37,7 +37,7 @@
     <span ng-show="filterSrv.ids.length == 0">
       <h5>No filters available</h5>
     </span>
-    <div ng-repeat="id in filterSrv.ids" class="small filter-panel-filter filter-must" ng-class="{'filter-deselected': !filterSrv.list[id].active}">
+    <div ng-repeat="id in filterSrv.ids" class="small filter-panel-filter">
       <div>
         <i class="filter-action pointer icon-remove" bs-tooltip="'Remove'" ng-click="remove(id)"></i>
         <i class="filter-action pointer" ng-class="{'icon-check': filterSrv.list[id].active,'icon-check-empty': !filterSrv.list[id].active}" bs-tooltip="'Toggle'" ng-click="toggle(id)"></i>
@@ -66,10 +66,11 @@
         </ul>
         <div>
           <input type="submit" value="Apply" ng-click="filterSrv.list[id].editing=undefined;refresh()" class="filter-apply btn btn-success btn-mini" bs-tooltip="'Save and refresh'"/>
+
           <button ng-click="filterSrv.list[id].editing=undefined" class="filter-apply btn btn-mini" bs-tooltip="'Save without refresh'">Save</button>
         </div>
       </form>
     </div>
-    <i class="link icon-plus-sign" ng-click="add()" bs-tooltip="'Add metric filter / param'" data-placement="right"></i>
+    <i class="pointer icon-plus-sign" ng-click="add()" bs-tooltip="'Add metric filter / param'" data-placement="right"></i>
   </div>
 </div>

src/app/panels/filtering/module.js

@@ -74,24 +74,6 @@ function (angular, app, _) {
       return !_.contains(['type','id','active','editing', 'name', 'query', 'value'],key);
     };
 
-    $scope.getFilterClass = function(filter) {
-      if(filter.active !== true) {
-        return 'muted';
-      } else {
-        switch (filter.mandate)
-        {
-        case 'must':
-          return 'text-success';
-        case 'mustNot':
-          return 'text-error';
-        case 'either':
-          return 'text-warning';
-        default:
-          return 'text-info';
-        }
-      }
-    };
-
     $scope.isEditable = function(filter) {
       var uneditable = ['time'];
       if(_.contains(uneditable,filter.type)) {

src/app/partials/dashLoader.html

@@ -21,7 +21,7 @@
 
     <li ng-show="dashboard.current.loader.save_elasticsearch">
       <form class="input-prepend nomargin">
-        <button style="margin-top:-1px" class="btn" ng-click="elasticsearch_save('dashboard')"><i class="icon-save"></i></button>
+        <button class="btn" ng-click="elasticsearch_save('dashboard')"><i class="icon-save"></i></button>
         <input class='input-medium' ng-model="dashboard.current.title" type="text" ng-model="elasticsearch.title"/>
       </form>
     </li>

src/vendor/bootstrap/less/grafana.less

@@ -24,7 +24,20 @@
 }
 
 .panelCont {
-  //padding: 0 0 10px 10px;
+  padding: 0px 10px;
+}
+
+.panel div.panel-extra div.panel-extra-container {
+  margin-right: -10px;
+  margin-top: 0px;
+}
+
+.panel-title {
+  font-size: 0.9em;
+}
+
+.row-button {
+  width: 24px;
 }
 
 .modal {