mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
changed background color and column gutter
This commit is contained in:
parent
734ce95167
commit
3e0b9261e4
@ -13,13 +13,14 @@ function (angular) {
|
|||||||
|
|
||||||
'<div class="row-fluid panel-extra"><div class="panel-extra-container">' +
|
'<div class="row-fluid panel-extra"><div class="panel-extra-container">' +
|
||||||
|
|
||||||
'<span class="extra row-button" ng-show="panel.editable != false">' +
|
'<span class="row-button extra" ng-show="panelMeta.loading == true">' +
|
||||||
'<span ng-click="remove_panel_from_row(row,panel)" class="pointer">'+
|
'<span>'+
|
||||||
'<i class="icon-remove pointer" bs-tooltip="\'Remove\'"></i></span>'+
|
'<i class="icon-spinner icon-spin icon-large"></i>' +
|
||||||
|
'</span>'+
|
||||||
'</span>' +
|
'</span>' +
|
||||||
|
|
||||||
'<span class="extra row-button" ng-hide="panel.draggable == false">' +
|
'<span ng-if="panelMeta.menuItems" class="dropdown" ng-show="panel.title">' +
|
||||||
'<span class="pointer" bs-tooltip="\'Drag here to move\'"' +
|
'<span class="panel-text panel-title pointer" bs-dropdown="panelMeta.menuItems" tabindex="1" ' +
|
||||||
'data-drag=true data-jqyoui-options="{revert: \'invalid\',helper:\'clone\'}"'+
|
'data-drag=true data-jqyoui-options="{revert: \'invalid\',helper:\'clone\'}"'+
|
||||||
' jqyoui-draggable="'+
|
' jqyoui-draggable="'+
|
||||||
'{'+
|
'{'+
|
||||||
@ -28,27 +29,8 @@ function (angular) {
|
|||||||
'index:{{$index}},'+
|
'index:{{$index}},'+
|
||||||
'onStart:\'panelMoveStart\','+
|
'onStart:\'panelMoveStart\','+
|
||||||
'onStop:\'panelMoveStop\''+
|
'onStop:\'panelMoveStop\''+
|
||||||
'}" ng-model="row.panels"><i class="icon-move"></i></span>'+
|
'}" ng-model="row.panels" ' +
|
||||||
'</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">' +
|
|
||||||
'{{panel.title}}' +
|
'{{panel.title}}' +
|
||||||
'</span>' +
|
'</span>' +
|
||||||
'</span>'+
|
'</span>'+
|
||||||
|
8
src/css/bootstrap-responsive.min.css
vendored
8
src/css/bootstrap-responsive.min.css
vendored
File diff suppressed because one or more lines are too long
2
src/css/bootstrap.dark.min.css
vendored
2
src/css/bootstrap.dark.min.css
vendored
File diff suppressed because one or more lines are too long
2
src/css/bootstrap.light.min.css
vendored
2
src/css/bootstrap.light.min.css
vendored
File diff suppressed because one or more lines are too long
@ -2,3 +2,4 @@
|
|||||||
@import "bootswatch.light.less";
|
@import "bootswatch.light.less";
|
||||||
@import "overrides.less";
|
@import "overrides.less";
|
||||||
@import "variables.light.less";
|
@import "variables.light.less";
|
||||||
|
@import "grafana.less";
|
23
src/vendor/bootstrap/less/grafana-responsive.less
vendored
Normal file
23
src/vendor/bootstrap/less/grafana-responsive.less
vendored
Normal file
@ -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);
|
8
src/vendor/bootstrap/less/grafana.less
vendored
8
src/vendor/bootstrap/less/grafana.less
vendored
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
.grafana-dashboard-hide-controls {
|
.grafana-dashboard-hide-controls {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
.extra, .grafana-row {
|
.grafana-row {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -29,11 +29,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.filter-pulldown {
|
.filter-pulldown {
|
||||||
background: rgba(31, 31, 31, 0.42);
|
background: #292929;
|
||||||
border-top: 1px solid #444;
|
|
||||||
border-left: 1px solid @grayDarker;
|
|
||||||
border-right: 1px solid @grayDarker;
|
|
||||||
border-bottom: 1px solid @grayDarker;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.top-row-close {
|
.top-row-close {
|
||||||
|
6
src/vendor/bootstrap/less/overrides.less
vendored
6
src/vendor/bootstrap/less/overrides.less
vendored
@ -233,13 +233,17 @@ form input.ng-invalid {
|
|||||||
|
|
||||||
.panel-title {
|
.panel-title {
|
||||||
border: 0px;
|
border: 0px;
|
||||||
text-transform: uppercase;
|
//text-transform: uppercase;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel div.panel-extra div.panel-extra-container {
|
.panel div.panel-extra div.panel-extra-container {
|
||||||
margin-right: -10px;
|
margin-right: -10px;
|
||||||
margin-top: 3px;
|
margin-top: 3px;
|
||||||
|
text-align: center;
|
||||||
|
ul {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel div.panel-extra {
|
.panel div.panel-extra {
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
// Scaffolding
|
// Scaffolding
|
||||||
// -------------------------
|
// -------------------------
|
||||||
@bodyBackground: @grayDark;
|
@bodyBackground: rgb(22,22,22);
|
||||||
@textColor: @grayLighter;
|
@textColor: @grayLighter;
|
||||||
|
|
||||||
|
|
||||||
|
@ -17,7 +17,8 @@ module.exports = function(config) {
|
|||||||
},
|
},
|
||||||
files: {
|
files: {
|
||||||
"<%= srcDir %>/css/bootstrap.dark.min.css": "<%= srcDir %>/vendor/bootstrap/less/bootstrap.dark.less",
|
"<%= 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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user