Bladeren bron

ported back some improvements from kibana

Torkel Ödegaard 12 jaren geleden
bovenliggende
commit
0c1df4250e

+ 3 - 2
src/app/directives/kibanaPanel.js

@@ -1,7 +1,8 @@
 define([
-  'angular'
+  'angular',
+  'jquery'
 ],
-function (angular) {
+function (angular, $) {
   'use strict';
 
   angular

+ 1 - 1
src/app/partials/dashboard.html

@@ -11,7 +11,7 @@
 <div class="clearfix"></div>
 <div class="container-fluid main" ng-class="{'grafana-dashboard-hide-controls': dashboard.current.hideControls}">
   <div>
-    <div class="container" style="margin-top:10px; width:98%">
+    <div class="grafana-container container">
       <!-- Rows -->
       <div class="kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.current.rows" ng-style="row_style(row)">
         <div class="row-control">

File diff suppressed because it is too large
+ 0 - 0
src/css/bootstrap.dark.min.css


File diff suppressed because it is too large
+ 0 - 0
src/css/bootstrap.light.min.css


+ 33 - 4
src/vendor/angular/angular-dragdrop.js

@@ -1,7 +1,36 @@
-/*
-  This has been modified from the default angular-draganddrop to provide the original
-  model and some other stuff as the 'data' arguement to callEventCallback
-*/
+/**
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * Implementing Drag and Drop functionality in AngularJS is easier than ever.
+ * Demo: http://codef0rmer.github.com/angular-dragdrop/
+ *
+ * @version 1.0.4
+ *
+ * (c) 2013 Amit Gharat a.k.a codef0rmer <amit.2006.it@gmail.com> - amitgharat.wordpress.com
+ */
+
+/**
+ * This has been modified from the default angular-draganddrop to provide the original
+ * model and some other stuff as the 'data' arguement to callEventCallback
+ */
 
 (function (window, angular, undefined) {
 'use strict';

+ 15 - 0
src/vendor/bootstrap/less/overrides.less

@@ -1,3 +1,12 @@
+// Media queries
+// ---------------------
+@media (max-width: 767px) {
+  div.panel {
+    width: 100% !important;
+    padding: 0px !important;
+  }
+}
+
 // Containers
 // ---------------------
 .container-fluid {
@@ -5,6 +14,11 @@
   padding-right: 0px;
 }
 
+.container.grafana-container {
+  padding: 5px 10px;
+  width: 100%;
+  box-sizing: border-box;
+}
 
 // Backgrounds
 // ---------------------
@@ -231,6 +245,7 @@ form input.ng-invalid {
 }
 
 .row-open {
+  margin-top: 5px;
   left:-34px;
   position: absolute;
   z-index: 100;

+ 74 - 0
src/vendor/license.json

@@ -0,0 +1,74 @@
+{
+  "angular": {
+    "version":"1.1.5",
+    "license":"MIT"
+  },
+  "angular-dragdrop": {
+    "version":"1.0.4",
+    "license":"MIT"
+  },
+  "angular-strap": {
+    "version":"0.7.5",
+    "license":"MIT"
+  },
+  "bindonce": {
+    "version":"0.2.1",
+    "license":"MIT"
+  },
+  "datepicker": {
+    "version":"12/3/2013",
+    "license":"Apache 2.0"
+  },
+  "timepicker": {
+    "version":"0.2.6",
+    "license":"MIT"
+  },
+  "bootstrap": {
+    "version":"2.3.2",
+    "license":"Apache 2.0"
+  },
+  "elasticjs": {
+    "version":"1.1.1",
+    "license":"MIT"
+  },
+  "jquery": {
+    "version":"1.8.0",
+    "license":"MIT"
+  },
+  "jquery-ui": {
+    "version":"1.10.3",
+    "license":"MIT"
+  },
+  "flot": {
+    "version":"0.8.1",
+    "license":"MIT"
+  },
+  "require": {
+    "version":"2.1.8",
+    "license":"MIT"
+  },
+  "chromath": {
+    "version":"0.0.5",
+    "license":"MIT"
+  },
+  "filesaver": {
+    "version":"2013-01-23",
+    "license":"MIT"
+  },
+  "modernizr": {
+    "version":"2.6.1",
+    "license":"MIT"
+  },
+  "moment": {
+    "version":"2.1.0",
+    "license":"MIT"
+  },
+  "timezone": {
+    "version":"2010",
+    "license":"Apache 2"
+  },
+  "underscore": {
+    "version":"1.5.1",
+    "license":"MIT"
+  }
+}

Some files were not shown because too many files changed in this diff