mirror of
https://github.com/grafana/grafana.git
synced 2025-02-14 01:23:32 -06:00
style changes
This commit is contained in:
parent
bcc3efffcf
commit
a6420302d1
@ -2,7 +2,7 @@
|
||||
ng-class="{'pull-right': series.yaxis === 2, 'hidden-series': hiddenSeries[series.alias]}"
|
||||
ng-repeat='series in legend'
|
||||
class="histogram-legend">
|
||||
<i class='icon-circle pointer'
|
||||
<i class='icon-minus pointer'
|
||||
ng-style="{color: series.color}"
|
||||
bs-popover="'colorPopup.html'"
|
||||
data-unique="1"
|
||||
|
@ -2,41 +2,6 @@
|
||||
ng-init="init()"
|
||||
style="min-height:{{panel.height || row.height}}"
|
||||
ng-class='{"panel-fullscreen": fullscreen}'>
|
||||
|
||||
<style>
|
||||
.histogram-legend {
|
||||
display:inline-block;
|
||||
padding-right:5px
|
||||
}
|
||||
.histogram-legend-dot {
|
||||
display:inline-block;
|
||||
height:10px;
|
||||
width:10px;
|
||||
border-radius:5px;
|
||||
}
|
||||
.histogram-legend-item {
|
||||
display:inline-block;
|
||||
}
|
||||
.histogram-chart {
|
||||
position:relative;
|
||||
}
|
||||
.histogram-options {
|
||||
padding: 5px;
|
||||
margin-right: 15px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.histogram-options label {
|
||||
margin: 0px 0px 0px 10px !important;
|
||||
}
|
||||
.histogram-options span {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* this is actually should be in bootstrap */
|
||||
.form-inline .checkbox {
|
||||
display: inline-block;
|
||||
}
|
||||
</style>
|
||||
<div>
|
||||
<span ng-show='panel.options'>
|
||||
<a class="link underline small" ng-show='panel.options' ng-click="options=!options">
|
||||
|
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,16 +2,6 @@
|
||||
// Bootswatch
|
||||
// -----------------------------------------------------
|
||||
|
||||
// KIBANA
|
||||
.panelCont {
|
||||
outline: 1px solid darken(@bodyBackground, 10%);
|
||||
border-top: 1px solid lighten(@bodyBackground, 10%);
|
||||
padding: 0px 10px 10px 10px;
|
||||
background: darken(@bodyBackground, 3%);
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
|
||||
// TYPOGRAPHY
|
||||
// -----------------------------------------------------
|
||||
|
||||
|
36
src/vendor/bootstrap/less/grafana.less
vendored
36
src/vendor/bootstrap/less/grafana.less
vendored
@ -1,9 +1,3 @@
|
||||
// Global color overrides
|
||||
// ---------------------------------------------------------
|
||||
//@grayDark: #3A3F44;
|
||||
//@grayDarker: #272B30;
|
||||
@grayDark: #303030;
|
||||
@grayLighter: #BBBFC2;
|
||||
|
||||
.navbar-static-top {
|
||||
border-bottom: 1px solid black;
|
||||
@ -51,10 +45,6 @@
|
||||
background: none;
|
||||
}
|
||||
|
||||
.panelCont {
|
||||
padding: 0px 10px;
|
||||
}
|
||||
|
||||
.panel div.panel-extra div.panel-extra-container {
|
||||
margin-right: -10px;
|
||||
margin-top: 0px;
|
||||
@ -141,6 +131,8 @@
|
||||
right: -10000px;
|
||||
}
|
||||
|
||||
// Graphite Graph Legends
|
||||
|
||||
.grafana-legend-container {
|
||||
margin: 4px 15px;
|
||||
text-align: left;
|
||||
@ -150,6 +142,30 @@
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.histogram-legend {
|
||||
display:inline-block;
|
||||
padding: 0 4px;
|
||||
i {
|
||||
position: relative;
|
||||
top: 3px;
|
||||
}
|
||||
}
|
||||
|
||||
.histogram-legend-dot {
|
||||
display:inline-block;
|
||||
height:10px;
|
||||
width:10px;
|
||||
border-radius:5px;
|
||||
}
|
||||
|
||||
.histogram-legend-item {
|
||||
display:inline-block;
|
||||
}
|
||||
|
||||
.histogram-chart {
|
||||
position:relative;
|
||||
}
|
||||
|
||||
.histogram-legend-popover {
|
||||
width: 150px;
|
||||
|
||||
|
5
src/vendor/bootstrap/less/overrides.less
vendored
5
src/vendor/bootstrap/less/overrides.less
vendored
@ -51,13 +51,12 @@ code, pre {
|
||||
background-color: @grayLighter;
|
||||
}
|
||||
|
||||
// KIBANA
|
||||
.panelCont {
|
||||
padding: 0px 10px 10px 10px;
|
||||
background: @kibanaPanelBackground;
|
||||
//box-shadow: 0px 0px 8px rgba(30, 30, 30, 0.75);
|
||||
margin: 0px;
|
||||
border: 1px solid rgba(100, 100, 100, 0.25);
|
||||
//border: 1px solid rgba(100, 100, 100, 0.25);
|
||||
//outline: 1px solid darken(@bodyBackground, 10%);
|
||||
}
|
||||
|
||||
div.editor-row {
|
||||
|
@ -6,11 +6,11 @@
|
||||
// -------------------------
|
||||
@black: #000;
|
||||
@gray: #bbb;
|
||||
@grayDark: #333;
|
||||
@grayDark: #303030;
|
||||
@grayDarker: #1f1f1f;
|
||||
|
||||
@grayLight: #ADAFAE;
|
||||
@grayLighter: #eee;
|
||||
@grayLighter: #BBBFC2;
|
||||
@white: #fff;
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user