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

changed background color and column gutter

Torkel Odegaard 12 лет назад
Родитель
Сommit
3e0b9261e4

+ 8 - 26
src/app/directives/kibanaPanel.js

@@ -13,13 +13,14 @@ function (angular) {
 
         '<div class="row-fluid panel-extra"><div class="panel-extra-container">' +
 
-          '<span class="extra row-button" ng-show="panel.editable != false">' +
-            '<span ng-click="remove_panel_from_row(row,panel)" class="pointer">'+
-            '<i class="icon-remove pointer" bs-tooltip="\'Remove\'"></i></span>'+
+          '<span class="row-button extra" ng-show="panelMeta.loading == true">' +
+            '<span>'+
+              '<i class="icon-spinner icon-spin icon-large"></i>' +
+            '</span>'+
           '</span>' +
 
-          '<span class="extra row-button" ng-hide="panel.draggable == false">' +
-            '<span class="pointer" bs-tooltip="\'Drag here to move\'"' +
+          '<span ng-if="panelMeta.menuItems" class="dropdown" ng-show="panel.title">' +
+            '<span class="panel-text panel-title pointer" bs-dropdown="panelMeta.menuItems" tabindex="1" ' +
             'data-drag=true data-jqyoui-options="{revert: \'invalid\',helper:\'clone\'}"'+
             ' jqyoui-draggable="'+
             '{'+
@@ -28,27 +29,8 @@ function (angular) {
               'index:{{$index}},'+
               'onStart:\'panelMoveStart\','+
               'onStop:\'panelMoveStop\''+
-              '}"  ng-model="row.panels"><i class="icon-move"></i></span>'+
-          '</span>' +
-
-          '<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>' +
-
-          '<span ng-repeat="task in panelMeta.modals" class="row-button extra" ng-show="task.show">' +
-            '<span bs-modal="task.partial" class="pointer"><i ' +
-              'bs-tooltip="task.description" ng-class="task.icon" class="pointer"></i></span>'+
-          '</span>' +
-
-          '<span class="row-button extra" ng-show="panelMeta.loading == true">' +
-            '<span>'+
-              '<i class="icon-spinner icon-spin icon-large"></i>' +
-            '</span>'+
-          '</span>' +
-
-          '<span ng-if="panelMeta.menuItems" class="dropdown" ng-show="panel.title">' +
-            '<span class="panel-text panel-title pointer" bs-dropdown="panelMeta.menuItems" tabindex="1">' +
+              '}"  ng-model="row.panels" ' +
+              '>' +
               '{{panel.title}}' +
             '</span>' +
           '</span>'+

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


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


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


+ 1 - 0
src/vendor/bootstrap/less/bootstrap.light.less

@@ -2,3 +2,4 @@
 @import "bootswatch.light.less";
 @import "overrides.less";
 @import "variables.light.less";
+@import "grafana.less";

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

@@ -0,0 +1,23 @@
+@import "responsive.less";
+
+@gridColumnWidth:         70px;
+@gridGutterWidth:         10px;
+
+@gridColumnWidth768:      52px;
+@gridGutterWidth768:      10px;
+
+@gridColumnWidth1200:     90px;
+@gridGutterWidth1200:     10px;
+
+// Fluid grid
+// -------------------------
+@fluidGridColumnWidth:    percentage(@gridColumnWidth/@gridRowWidth);
+@fluidGridGutterWidth:    percentage(@gridGutterWidth/@gridRowWidth);
+
+// 1200px min
+@fluidGridColumnWidth1200:     percentage(@gridColumnWidth1200/@gridRowWidth1200);
+@fluidGridGutterWidth1200:     percentage(@gridGutterWidth1200/@gridRowWidth1200);
+
+// 768px-979px
+@fluidGridColumnWidth768:      percentage(@gridColumnWidth768/@gridRowWidth768);
+@fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);

+ 2 - 6
src/vendor/bootstrap/less/grafana.less

@@ -5,7 +5,7 @@
 
 .grafana-dashboard-hide-controls {
   padding: 0;
-  .extra, .grafana-row {
+  .grafana-row {
     display: none;
   }
 }
@@ -29,11 +29,7 @@
 }
 
 .filter-pulldown {
-  background: rgba(31, 31, 31, 0.42);
-  border-top: 1px solid #444;
-  border-left: 1px solid @grayDarker;
-  border-right: 1px solid @grayDarker;
-  border-bottom: 1px solid @grayDarker;
+  background: #292929;
 }
 
 .top-row-close {

+ 5 - 1
src/vendor/bootstrap/less/overrides.less

@@ -233,13 +233,17 @@ form input.ng-invalid {
 
 .panel-title {
   border: 0px;
-  text-transform: uppercase;
+  //text-transform: uppercase;
   font-weight: bold;
 }
 
 .panel div.panel-extra div.panel-extra-container {
   margin-right: -10px;
   margin-top: 3px;
+  text-align: center;
+  ul {
+    text-align: left;
+  }
 }
 
 .panel div.panel-extra {

+ 1 - 1
src/vendor/bootstrap/less/variables.dark.less

@@ -32,7 +32,7 @@
 
 // Scaffolding
 // -------------------------
-@bodyBackground:        @grayDark;
+@bodyBackground:        rgb(22,22,22);
 @textColor:             @grayLighter;
 
 

+ 2 - 1
tasks/options/less.js

@@ -17,7 +17,8 @@ module.exports = function(config) {
       },
       files: {
         "<%= srcDir %>/css/bootstrap.dark.min.css": "<%= srcDir %>/vendor/bootstrap/less/bootstrap.dark.less",
-        "<%= srcDir %>/css/bootstrap.light.min.css": "<%= srcDir %>/vendor/bootstrap/less/bootstrap.light.less"
+        "<%= srcDir %>/css/bootstrap.light.min.css": "<%= srcDir %>/vendor/bootstrap/less/bootstrap.light.less",
+        "<%= srcDir %>/css/bootstrap-responsive.min.css": "<%= srcDir %>/vendor/bootstrap/less/grafana-responsive.less"
       }
     }
   };

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