Просмотр исходного кода

Fixes #4, also improves responsive layout for mobiles

Torkel Ödegaard 12 лет назад
Родитель
Сommit
2ee2266865

+ 3 - 2
src/app/panels/graphite/module.js

@@ -531,8 +531,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
             return;
             return;
           }
           }
 
 
-          // IE doesn't work without this
-          elem.css({height:scope.height || scope.row.height});
+          try {
+            elem.css({ height:scope.panel.height || scope.row.height });
+          } catch(e) { return; }
 
 
           _.each(data, function(series) {
           _.each(data, function(series) {
             series.label = series.info.alias;
             series.label = series.info.alias;

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

@@ -56,7 +56,7 @@
             <div ng-show="rowSpan(row) < 10 && dashboard.panelDragging" class="panel" style="margin:5px;width:30%;background:rgba(100,100,100,0.50)" ng-class="{'dragInProgress':dashboard.panelDragging}" ng-style="{height:row.height}" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:row.panels.length,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver',onOut:'panelMoveOut'}">
             <div ng-show="rowSpan(row) < 10 && dashboard.panelDragging" class="panel" style="margin:5px;width:30%;background:rgba(100,100,100,0.50)" ng-class="{'dragInProgress':dashboard.panelDragging}" ng-style="{height:row.height}" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:row.panels.length,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver',onOut:'panelMoveOut'}">
             </div>
             </div>
 
 
-            <span bs-modal="'app/partials/roweditor.html'" ng-show="row.editable && !dashboard.panelDragging">
+            <span bs-modal="'app/partials/roweditor.html'" ng-show="!dashboard.panelDragging && !dashboard.current.hideControls">
               <i ng-hide="rowSpan(row) >= 10" class="pointer icon-plus-sign" ng-click="editor.index = 2" bs-tooltip="'Add a panel to this row'" data-placement="right"></i>
               <i ng-hide="rowSpan(row) >= 10" class="pointer icon-plus-sign" ng-click="editor.index = 2" bs-tooltip="'Add a panel to this row'" data-placement="right"></i>
             </span>
             </span>
 
 

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/css/bootstrap-responsive.min.css


+ 13 - 0
src/vendor/bootstrap/less/grafana-responsive.less

@@ -21,3 +21,16 @@
 // 768px-979px
 // 768px-979px
 @fluidGridColumnWidth768:      percentage(@gridColumnWidth768/@gridRowWidth768);
 @fluidGridColumnWidth768:      percentage(@gridColumnWidth768/@gridRowWidth768);
 @fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);
 @fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);
+
+
+// Media queries
+// ---------------------
+@media (max-width: 767px) {
+  div.panel {
+    width: 100% !important;
+    padding: 0px !important;
+  }
+  body {
+    padding: 0;
+  }
+}

Некоторые файлы не были показаны из-за большого количества измененных файлов