Merge branch 'master' into theme-files-cleanup

This commit is contained in:
Patrick O'Carroll
2019-02-13 15:46:59 +01:00
committed by GitHub
145 changed files with 2028 additions and 1707 deletions

View File

@@ -206,6 +206,6 @@ $external-services: (
!default;
:export {
panelHorizontalPadding: $panel-horizontal-padding;
panelVerticalPadding: $panel-vertical-padding;
panelhorizontalpadding: $panel-horizontal-padding;
panelverticalpadding: $panel-vertical-padding;
}

View File

@@ -1,6 +1,6 @@
export interface GrafanaVariables {
'panelHorizontalPadding': number;
'panelVerticalPadding': number;
panelHorizontalPadding: number;
panelVerticalPadding: number;
}
declare const variables: GrafanaVariables;

View File

@@ -3,16 +3,16 @@
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
@import "./font-awesome/variables";
@import "./font-awesome/mixins";
@import "./font-awesome/path";
@import "./font-awesome/core";
@import "./font-awesome/larger";
@import "./font-awesome/fixed-width";
@import "./font-awesome/list";
@import "./font-awesome/bordered-pulled";
@import "./font-awesome/animated";
@import "./font-awesome/rotated-flipped";
@import "./font-awesome/stacked";
@import "./font-awesome/icons";
@import "./font-awesome/screen-reader";
@import './font-awesome/variables';
@import './font-awesome/mixins';
@import './font-awesome/path';
@import './font-awesome/core';
@import './font-awesome/larger';
@import './font-awesome/fixed-width';
@import './font-awesome/list';
@import './font-awesome/bordered-pulled';
@import './font-awesome/animated';
@import './font-awesome/rotated-flipped';
@import './font-awesome/stacked';
@import './font-awesome/icons';
@import './font-awesome/screen-reader';

View File

@@ -58,19 +58,19 @@ textarea {
}
// Reset width of input images, buttons, radios, checkboxes
input[type="file"],
input[type="image"],
input[type="submit"],
input[type="reset"],
input[type="button"],
input[type="radio"],
input[type="checkbox"] {
input[type='file'],
input[type='image'],
input[type='submit'],
input[type='reset'],
input[type='button'],
input[type='radio'],
input[type='checkbox'] {
width: auto; // Override of generic input selector
}
// Set the height of select and file controls to match text inputs
select,
input[type="file"] {
input[type='file'] {
height: $input-height; /* In IE7, the height of the select element cannot be changed by height, only font-size */
line-height: $input-height;
}
@@ -90,19 +90,19 @@ select[size] {
// Focus for select, file, radio, and checkbox
select:focus,
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
input[type='file']:focus,
input[type='radio']:focus,
input[type='checkbox']:focus {
@include tab-focus();
}
// not a big fan of number fields
input[type="number"]::-webkit-outer-spin-button,
input[type="number"]::-webkit-inner-spin-button {
input[type='number']::-webkit-outer-spin-button,
input[type='number']::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}
input[type="number"] {
input[type='number'] {
-moz-appearance: textfield;
}
// Placeholder
@@ -155,15 +155,15 @@ textarea[readonly] {
}
// Explicitly reset the colors here
input[type="radio"][disabled],
input[type="checkbox"][disabled],
input[type="radio"][readonly],
input[type="checkbox"][readonly] {
input[type='radio'][disabled],
input[type='checkbox'][disabled],
input[type='radio'][readonly],
input[type='checkbox'][readonly] {
cursor: $cursor-disabled;
background-color: transparent;
}
input[type="text"].input-fluid {
input[type='text'].input-fluid {
width: 100%;
box-sizing: border-box;
padding: 10px;
@@ -172,7 +172,7 @@ input[type="text"].input-fluid {
height: 100%;
}
input[type="checkbox"].cr1 {
input[type='checkbox'].cr1 {
display: none;
}
@@ -194,7 +194,7 @@ label.cr1 {
cursor: pointer;
}
input[type="checkbox"].cr1:checked + label {
input[type='checkbox'].cr1:checked + label {
background: url($checkboxImageUrl) 0px -18px no-repeat;
}
@@ -203,7 +203,7 @@ input[type="checkbox"].cr1:checked + label {
display: block;
overflow: hidden;
padding-right: 10px;
input[type="text"] {
input[type='text'] {
width: 100%;
padding: 5px 6px;
height: 100%;

View File

@@ -1,18 +1,17 @@
@font-face {
font-family: "grafana-icons";
src: url("../fonts/grafana-icons.eot?okx5td");
src: url("../fonts/grafana-icons.eot?okx5td#iefix")
format("embedded-opentype"),
url("../fonts/grafana-icons.ttf?okx5td") format("truetype"),
url("../fonts/grafana-icons.woff?okx5td") format("woff"),
url("../fonts/grafana-icons.svg?okx5td#grafana-icons") format("svg");
font-family: 'grafana-icons';
src: url('../fonts/grafana-icons.eot?okx5td');
src: url('../fonts/grafana-icons.eot?okx5td#iefix') format('embedded-opentype'),
url('../fonts/grafana-icons.ttf?okx5td') format('truetype'),
url('../fonts/grafana-icons.woff?okx5td') format('woff'),
url('../fonts/grafana-icons.svg?okx5td#grafana-icons') format('svg');
font-weight: normal;
font-style: normal;
}
.icon-gf {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: "grafana-icons" !important;
font-family: 'grafana-icons' !important;
speak: none;
font-style: normal;
font-weight: normal;
@@ -37,165 +36,165 @@
}
.icon-gf-raintank_wordmark:before {
content: "\e600";
content: '\e600';
}
.micon-gf-raintank_icn:before {
content: "\e601";
content: '\e601';
}
.icon-gf-raintank_r-icn:before {
content: "\e905";
content: '\e905';
}
.icon-gf-check-alt:before {
content: "\e603";
content: '\e603';
}
.icon-gf-check:before {
content: "\e604";
content: '\e604';
}
.icon-gf-collector:before {
content: "\e605";
content: '\e605';
}
.icon-gf-dashboard:before {
content: "\e606";
content: '\e606';
}
.icon-gf-panel:before {
content: "\e904";
content: '\e904';
}
.icon-gf-datasources:before {
content: "\e607";
content: '\e607';
}
.icon-gf-endpoint-tiny:before {
content: "\e608";
content: '\e608';
}
.icon-gf-endpoint:before {
content: "\e609";
content: '\e609';
}
.icon-gf-page:before {
content: "\e908";
content: '\e908';
}
.icon-gf-filter:before {
content: "\e60a";
content: '\e60a';
}
.icon-gf-status:before {
content: "\e60b";
content: '\e60b';
}
.icon-gf-monitoring:before {
content: "\e60c";
content: '\e60c';
}
.icon-gf-monitoring-tiny:before {
content: "\e620";
content: '\e620';
}
.icon-gf-jump-to-dashboard:before {
content: "\e60d";
content: '\e60d';
}
.icon-gf-warn,
.icon-gf-warning:before {
content: "\e60e";
content: '\e60e';
}
.icon-gf-nodata:before {
content: "\e60f";
content: '\e60f';
}
.icon-gf-critical:before {
content: "\e610";
content: '\e610';
}
.icon-gf-crit:before {
content: "\e610";
content: '\e610';
}
.icon-gf-online:before {
content: "\e611";
content: '\e611';
}
.icon-gf-event-error:before {
content: "\e623";
content: '\e623';
}
.icon-gf-event:before {
content: "\e624";
content: '\e624';
}
.icon-gf-sadface:before {
content: "\e907";
content: '\e907';
}
.icon-gf-private-collector:before {
content: "\e612";
content: '\e612';
}
.icon-gf-alert:before {
content: "\e61f";
content: '\e61f';
}
.icon-gf-alert-disabled:before {
content: "\e621";
content: '\e621';
}
.icon-gf-refresh:before {
content: "\e613";
content: '\e613';
}
.icon-gf-save:before {
content: "\e614";
content: '\e614';
}
.icon-gf-share:before {
content: "\e616";
content: '\e616';
}
.icon-gf-star:before {
content: "\e617";
content: '\e617';
}
.icon-gf-search:before {
content: "\e618";
content: '\e618';
}
.icon-gf-settings:before {
content: "\e615";
content: '\e615';
}
.icon-gf-add:before {
content: "\e619";
content: '\e619';
}
.icon-gf-remove:before {
content: "\e61a";
content: '\e61a';
}
.icon-gf-video:before {
content: "\e61b";
content: '\e61b';
}
.icon-gf-bulk_action:before {
content: "\e61c";
content: '\e61c';
}
.icon-gf-grabber:before {
content: "\e90b";
content: '\e90b';
}
.icon-gf-users:before {
content: "\e622";
content: '\e622';
}
.icon-gf-globe:before {
content: "\e61d";
content: '\e61d';
}
.icon-gf-snapshot:before {
content: "\e61e";
content: '\e61e';
}
.icon-gf-play-grafana-icon:before {
content: "\e629";
content: '\e629';
}
.icon-gf-grafana-icon:before {
content: "\e625";
content: '\e625';
}
.icon-gf-email:before {
content: "\e628";
content: '\e628';
}
.icon-gf-stopwatch:before {
content: "\e626";
content: '\e626';
}
.icon-gf-skull:before {
content: "\e900";
content: '\e900';
}
.icon-gf-probe:before {
content: "\e901";
content: '\e901';
}
.icon-gf-apps:before {
content: "\e902";
content: '\e902';
}
.icon-gf-scale:before {
content: "\e906";
content: '\e906';
}
.icon-gf-pending:before {
content: "\e909";
content: '\e909';
}
.icon-gf-verified:before {
content: "\e90a";
content: '\e90a';
}
.icon-gf-worldping:before {
content: "\e627";
content: '\e627';
}
.icon-gf-grafana_wordmark:before {
content: "\e903";
content: '\e903';
}

View File

@@ -212,7 +212,8 @@
padding-right: 5px;
}
.panel-editor-tabs, .add-panel-widget__icon {
.panel-editor-tabs,
.add-panel-widget__icon {
.gicon-advanced-active {
background-image: url('../img/icons_#{$theme-name}_theme/icon_advanced_active.svg');
}

View File

@@ -291,9 +291,9 @@ select {
//
button,
html input[type="button"],
// 1 input[type="reset"],
input[type="submit"] {
html input[type='button'],
// 1 input[type='reset'],
input[type='submit'] {
-webkit-appearance: button; // 2
cursor: pointer; // 3
}
@@ -334,8 +334,8 @@ input {
// 2. Remove excess padding in IE 8/9/10.
//
input[type="checkbox"],
input[type="radio"] {
input[type='checkbox'],
input[type='radio'] {
box-sizing: border-box; // 1
padding: 0; // 2
}
@@ -346,8 +346,8 @@ input[type="radio"] {
// decrement button to change from `default` to `text`.
//
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
input[type='number']::-webkit-inner-spin-button,
input[type='number']::-webkit-outer-spin-button {
height: auto;
}
@@ -355,7 +355,7 @@ input[type="number"]::-webkit-outer-spin-button {
// Address `appearance` set to `searchfield` in Safari and Chrome.
//
input[type="search"] {
input[type='search'] {
-webkit-appearance: textfield;
}
@@ -365,8 +365,8 @@ input[type="search"] {
// padding (and `textfield` appearance).
//
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
input[type='search']::-webkit-search-cancel-button,
input[type='search']::-webkit-search-decoration {
-webkit-appearance: none;
}

View File

@@ -3,8 +3,7 @@
.#{$fa-css-prefix} {
display: inline-block;
font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base}
FontAwesome; // shortening font declaration
font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased;

View File

@@ -3,8 +3,7 @@
@mixin fa-icon() {
display: inline-block;
font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base}
FontAwesome; // shortening font declaration
font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased;
@@ -12,14 +11,14 @@
}
@mixin fa-icon-rotate($degrees, $rotation) {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
-ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})';
-webkit-transform: rotate($degrees);
-ms-transform: rotate($degrees);
transform: rotate($degrees);
}
@mixin fa-icon-flip($horiz, $vert, $rotation) {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)";
-ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)';
-webkit-transform: scale($horiz, $vert);
-ms-transform: scale($horiz, $vert);
transform: scale($horiz, $vert);

View File

@@ -2,18 +2,13 @@
* -------------------------- */
@font-face {
font-family: "FontAwesome";
src: url("#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}");
src: url("#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}")
format("embedded-opentype"),
url("#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}")
format("woff2"),
url("#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}")
format("woff"),
url("#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}")
format("truetype"),
url("#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular")
format("svg");
font-family: 'FontAwesome';
src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
// src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal;
font-style: normal;

File diff suppressed because it is too large Load Diff

View File

@@ -110,7 +110,7 @@
}
.card-item-label {
margin-left: 8px;
margin-left: 8px;
}
.card-item-sub-name {

View File

@@ -146,7 +146,6 @@ $input-border: 1px solid $input-border-color;
}
}
.gf-form-label + .gf-form-label {
margin-right: $gf-form-margin;
}

View File

@@ -47,7 +47,6 @@
.navbar-button--add-panel,
.navbar-button--star,
.navbar-button--tv,
.navbar-buttons--close {
display: flex;
}
@@ -185,7 +184,7 @@
padding-left: 7px;
}
.navbar-edit__back-btn {
.navbar-edit__back-btn {
background: transparent;
border: 2px solid $text-color;
border-radius: 50%;
@@ -205,5 +204,3 @@
border-color: $text-color-strong;
}
}

View File

@@ -123,7 +123,6 @@
}
.viz-picker {
padding: 0px 20px;
position: relative;
}
@@ -154,7 +153,6 @@
box-shadow: $panel-editor-viz-item-shadow-hover;
background: $panel-editor-viz-item-bg-hover;
border: $panel-editor-viz-item-border-hover;
}
&--current {
@@ -236,4 +234,3 @@
position: relative;
min-width: 200px;
}

View File

@@ -127,7 +127,6 @@ input[type='text'].tight-form-func-param {
color: $text-color-weak;
}
}
}
.query-editor-row__header {
@@ -138,7 +137,6 @@ input[type='text'].tight-form-func-param {
background: $page-bg;
flex-wrap: nowrap;
align-items: center;
}
.query-editor-row__ref-id {
font-weight: $font-weight-semi-bold;
@@ -206,4 +204,3 @@ input[type='text'].tight-form-func-param {
color: $text-muted;
padding-left: 10px;
}

View File

@@ -50,4 +50,3 @@
display: none;
}
}

View File

@@ -15,7 +15,7 @@
border: 1px solid $border-color;
&:before {
content: "";
content: '';
display: block;
position: absolute;
width: 0;
@@ -88,8 +88,7 @@
left: $popover-arrow-size * 2;
}
&.drop-element-attached-top.drop-element-attached-left.drop-target-attached-middle
.drop-content {
&.drop-element-attached-top.drop-element-attached-left.drop-target-attached-middle .drop-content {
margin-top: $popover-arrow-size;
&:before {
@@ -99,8 +98,7 @@
}
}
&.drop-element-attached-top.drop-element-attached-right.drop-target-attached-middle
.drop-content {
&.drop-element-attached-top.drop-element-attached-right.drop-target-attached-middle .drop-content {
margin-top: $popover-arrow-size;
&:before {
@@ -110,8 +108,7 @@
}
}
&.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-middle
.drop-content {
&.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-middle .drop-content {
margin-bottom: $popover-arrow-size;
&:before {
@@ -121,8 +118,7 @@
}
}
&.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-middle
.drop-content {
&.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-middle .drop-content {
margin-bottom: $popover-arrow-size;
&:before {
@@ -133,8 +129,7 @@
}
// Top and bottom corners
&.drop-element-attached-top.drop-element-attached-left.drop-target-attached-bottom
.drop-content {
&.drop-element-attached-top.drop-element-attached-left.drop-target-attached-bottom .drop-content {
margin-top: $popover-arrow-size;
&:before {
@@ -144,8 +139,7 @@
}
}
&.drop-element-attached-top.drop-element-attached-right.drop-target-attached-bottom
.drop-content {
&.drop-element-attached-top.drop-element-attached-right.drop-target-attached-bottom .drop-content {
margin-top: $popover-arrow-size;
&:before {
@@ -155,8 +149,7 @@
}
}
&.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-top
.drop-content {
&.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-top .drop-content {
margin-bottom: $popover-arrow-size;
&:before {
@@ -166,8 +159,7 @@
}
}
&.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-top
.drop-content {
&.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-top .drop-content {
margin-bottom: $popover-arrow-size;
&:before {
@@ -178,8 +170,7 @@
}
// Side corners
&.drop-element-attached-top.drop-element-attached-right.drop-target-attached-left
.drop-content {
&.drop-element-attached-top.drop-element-attached-right.drop-target-attached-left .drop-content {
margin-right: $popover-arrow-size;
&:before {
@@ -189,8 +180,7 @@
}
}
&.drop-element-attached-top.drop-element-attached-left.drop-target-attached-right
.drop-content {
&.drop-element-attached-top.drop-element-attached-left.drop-target-attached-right .drop-content {
margin-left: $popover-arrow-size;
&:before {
@@ -200,8 +190,7 @@
}
}
&.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-left
.drop-content {
&.drop-element-attached-bottom.drop-element-attached-right.drop-target-attached-left .drop-content {
margin-right: $popover-arrow-size;
&:before {
@@ -211,8 +200,7 @@
}
}
&.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-right
.drop-content {
&.drop-element-attached-bottom.drop-element-attached-left.drop-target-attached-right .drop-content {
margin-left: $popover-arrow-size;
&:before {
@@ -224,7 +212,7 @@
}
}
@mixin drop-animation-scale($themePrefix: "drop", $themeName: "default", $attachmentOffset: 0, $easing: "linear") {
@mixin drop-animation-scale($themePrefix: 'drop', $themeName: 'default', $attachmentOffset: 0, $easing: 'linear') {
.#{$themePrefix}-element.#{$themePrefix}-#{$themeName} {
transform: translateZ(0);
transition: opacity 100ms;
@@ -247,20 +235,16 @@
}
}
// Centers and middles
&.#{$themePrefix}-element-attached-bottom.#{$themePrefix}-element-attached-center
.#{$themePrefix}-content {
&.#{$themePrefix}-element-attached-bottom.#{$themePrefix}-element-attached-center .#{$themePrefix}-content {
transform-origin: 50% calc(100% + #{$attachmentOffset});
}
&.#{$themePrefix}-element-attached-top.#{$themePrefix}-element-attached-center
.#{$themePrefix}-content {
&.#{$themePrefix}-element-attached-top.#{$themePrefix}-element-attached-center .#{$themePrefix}-content {
transform-origin: 50% (-$attachmentOffset);
}
&.#{$themePrefix}-element-attached-right.#{$themePrefix}-element-attached-middle
.#{$themePrefix}-content {
&.#{$themePrefix}-element-attached-right.#{$themePrefix}-element-attached-middle .#{$themePrefix}-content {
transform-origin: calc(100% + #{$attachmentOffset}) 50%;
}
&.#{$themePrefix}-element-attached-left.#{$themePrefix}-element-attached-middle
.#{$themePrefix}-content {
&.#{$themePrefix}-element-attached-left.#{$themePrefix}-element-attached-middle .#{$themePrefix}-content {
transform-origin: -($attachmentOffset 50%);
}
// Top and bottom corners

View File

@@ -34,8 +34,7 @@
&:focus {
border-color: $input-border-focus;
outline: none;
$shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
0 0 5px $input-box-shadow-focus;
$shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px $input-box-shadow-focus;
@include box-shadow($shadow);
}
}

View File

@@ -1,11 +1,25 @@
// <3: https://medium.com/@brunn/detecting-autofilled-fields-in-javascript-aed598d25da7
// sass-lint:disable no-empty-rulesets
@keyframes onAutoFillStart { from {/**/} to {/**/}}
@keyframes onAutoFillCancel { from {/**/} to {/**/}}
@keyframes onAutoFillStart {
from {
/**/
}
to {
/**/
}
}
@keyframes onAutoFillCancel {
from {
/**/
}
to {
/**/
}
}
input:-webkit-autofill {
animation-name: onAutoFillStart;
transition: transform 1ms;
}
input:not(:-webkit-autofill) {
animation-name: onAutoFillCancel;
}
}