IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop-newgrid-row-design2

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-09-07 15:05:41 +02:00
parent ba1fbe0786 c9a30ef149
commit a38ded9e7e
131 changed files with 3458 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
public/sass/components/_code_editor.scss Normal file
View File

@@ -0,0 +1,79 @@
.gf-code-editor {
min-height: 2.60rem;
min-width: 20rem;
flex-grow: 1;
margin-right: 0.25rem;
visibility: hidden;
&.ace_editor {
@include font-family-monospace();
font-size: 1rem;
min-height: 2.60rem;
@include border-radius($input-border-radius-sm);
border: $input-btn-border-width solid $input-border-color;
}
&--theme-loaded {
visibility: visible;
}
}
.ace_editor.ace_autocomplete {
@include font-family-monospace();
font-size: 1rem;
// Ace editor adds <style> tag at the end of <head>, after grafana.css, so !important
// is used for overriding styles with the same CSS specificity.
background-color: $dropdownBackground !important;
color: $dropdownLinkColor !important;
border: 1px solid $dropdownBorder !important;
width: 320px !important;
.ace_scroller {
.ace_selected, .ace_active-line, .ace_line-hover {
color: $dropdownLinkColorHover;
background-color: $dropdownLinkBackgroundHover !important;
}
.ace_line-hover {
border-color: transparent;
}
.ace_completion-highlight {
color: $yellow;
}
.ace_rightAlignedText {
color: $text-muted;
z-index: 0;
}
}
}
$doc-font-size: $font-size-sm;
.ace_tooltip.ace_doc-tooltip {
@include font-family-monospace();
font-size: $doc-font-size;
background-color: $popover-help-bg;
color: $popover-help-color;
background-image: none;
border: 1px solid $dropdownBorder;
padding: 0.5rem 1rem;
hr {
background-color: $popover-help-color;
margin: 0.5rem 0rem;
}
code {
padding: 0px 1px;
margin: 0px;
}
}
.ace_tooltip {
border-radius: 3px;
}

11
public/sass/components/_gf-form.scss
View File

@@ -16,6 +16,10 @@ $gf-form-margin: 1px;
&--grow {
flex-grow: 1;
}
&--flex-end {
justify-content: flex-end;
}
}
.gf-form-disabled {
@@ -57,7 +61,6 @@ $gf-form-margin: 1px;
background-color: #292a2d; //$input-label-bg;
display: block;
font-size: $font-size-sm;
margin-right: $gf-form-margin;
border: $input-btn-border-width solid transparent;
@include border-radius($label-border-radius-sm);
@@ -105,7 +108,6 @@ $gf-form-margin: 1px;
width: 100%;
padding: $input-padding-y $input-padding-x;
font-size: $font-size-base;
margin-right: $gf-form-margin;
line-height: $input-line-height;
color: $input-color;
background-color: $input-bg;
@@ -116,7 +118,6 @@ $gf-form-margin: 1px;
border-left: none;
@include border-radius($input-border-radius-sm);
@include box-shadow($input-box-shadow);
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -239,6 +240,8 @@ $gf-form-margin: 1px;
line-height: $input-line-height;
font-size: $font-size-sm;
box-shadow: none;
@include border-radius($label-border-radius-sm);
border: $input-btn-border-width solid transparent;
flex-shrink: 0;
flex-grow: 0;
@@ -284,7 +287,7 @@ $gf-form-margin: 1px;
&--right-absolute {
position: absolute;
right: $spacer;
top: 8px;
top: 10px;
}
&--right-normal {

30
public/sass/components/_infobox.scss
View File

@@ -1,12 +1,12 @@
.grafana-info-box::before {
content: "\f05a";
font-family:'FontAwesome';
position: absolute;
top: -13px;
left: -8px;
font-size: 20px;
color: $text-color;
}
// .grafana-info-box::before {
// content: "\f05a";
// font-family:'FontAwesome';
// position: absolute;
// top: -13px;
// left: -8px;
// font-size: 20px;
// color: $text-color;
// }
.grafana-info-box {
position: relative;
@@ -15,12 +15,14 @@
padding: 1rem;
border-radius: 4px;
margin-bottom: $spacer;
margin-right: $gf-form-margin;
flex-grow: 1;
h5 {
margin-bottom: $spacer;
}
ul {
padding-left: $spacer;
padding-left: $spacer * 1.5;
}
a {
@@ -28,3 +30,11 @@
}
}
.grafana-info-box__close {
text-align: center;
display: block;
color: $link-color !important;
height: 0;
position: relative;
top: -9px;
}

5
public/sass/components/_modals.scss
View File

@@ -20,7 +20,8 @@
// Base modal
.modal {
position: absolute;
position: fixed;
overflow: hidden;
z-index: $zindex-modal;
width: 100%;
background-color: $panel-bg;
@@ -33,7 +34,7 @@
right: 0;
margin-left: auto;
margin-right: auto;
top: 20%;
top: 10%;
}
.modal-header {

8
public/sass/components/_panel_graph.scss
View File

@@ -181,7 +181,7 @@
}
.graph-legend {
margin: 0;
margin: 0 0 0 1rem;
}
.graph-legend-series {
@@ -321,7 +321,7 @@
.left-yaxis-label {
top: 50%;
left: 0;
left: 2px;
transform: translateX(-50%) translateY(-50%) rotate(-90deg);
// this is needed for phantomsjs 2.1
-webkit-transform: translateX(-50%) translateY(-50%) rotate(-90deg);
@@ -329,7 +329,7 @@
.right-yaxis-label {
top: 50%;
right: 0;
right: 2px;
transform: translateX(50%) translateY(-50%) rotate(90deg);
// this is needed for phantomsjs 2.1
-webkit-transform: translateX(50%) translateY(-50%) rotate(90deg);
@@ -339,7 +339,7 @@
display: inline-block;
color: $text-color;
font-size: $font-size-sm;
position: relative;
position: absolute;
text-align: center;
font-size: 12px;
}

27
public/sass/components/_query_editor.scss
View File

@@ -73,6 +73,11 @@
}
}
.gf-query-ds-label {
text-align: center;
width: 44px;
}
.grafana-metric-options {
margin-top: 25px;
}
@@ -152,3 +157,25 @@ input[type="text"].tight-form-func-param {
margin-left: 10px;
}
}
.query-troubleshooter {
font-size: $font-size-sm;
margin: $gf-form-margin;
border: 1px solid $btn-secondary-bg;
min-height: 100px;
border-radius: 3px;
}
.query-troubleshooter__header {
float: right;
font-size: $font-size-sm;
text-align: right;
padding: $input-padding-y $input-padding-x;
a {
margin-left: $spacer;
}
}
.query-troubleshooter__body {
padding: $spacer 0;
}