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

Annotations: More fixes to the angular annotation editors (#33303)

Browse Source 
* Annotations: Fixed angular editor issues

* More angular annotation fixes

* removed console.log
This commit is contained in:
Torkel Ödegaard
2021-04-23 14:06:30 +02:00
committed by GitHub
parent 37f7b91a6b
commit b6cfb65e40
11 changed files with 84 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
public/sass/_variables.dark.generated.scss
View File

@@ -55,7 +55,6 @@ $gray-4: #d8d9da;
$gray-5: #ececec;
$gray-6: #f4f5f8;
$input-black: #0b0c0e;
$white: #ffffff;
$layer0: #111217;
@@ -209,14 +208,14 @@ $btn-active-box-shadow: 0px 0px 4px rgba(255, 120, 10, 0.5);
// Forms
// -------------------------
$input-bg: $input-black;
$input-bg-disabled: $dark-6;
$input-bg: #111217;
$input-bg-disabled: rgba(201, 209, 217, 0.07);
$input-color: #c7d0d9;
$input-color: rgb(201, 209, 217);
$input-border-color: rgba(201, 209, 217, 0.15);
$input-box-shadow: none;
$input-border-focus: #5794f2;
$input-box-shadow-focus: $blue-light !default;
$input-border-focus: #6E9FFF;
$input-box-shadow-focus: #6E9FFF !default;
$input-color-placeholder: rgba(201, 209, 217, 0.40);
$input-label-bg: #22252b;
$input-color-select-arrow: $white;
@@ -272,14 +271,14 @@ $tab-border-color: $dark-9;
// Form states and alerts
// -------------------------
$warning-text-color: $warn;
$error-text-color: #e84d4d;
$success-text-color: #12d95a;
$warning-text-color: #F8D06B;
$error-text-color: #FF5286;
$success-text-color: #6CCF8E;
$alert-error-bg: linear-gradient(90deg, $red-base, $red-shade);
$alert-success-bg: linear-gradient(90deg, $green-base, $green-shade);
$alert-warning-bg: linear-gradient(90deg, $red-base, $red-shade);
$alert-info-bg: linear-gradient(100deg, $blue-base, $blue-shade);
$alert-error-bg: #D10E5C;
$alert-success-bg: #1A7F4B;
$alert-warning-bg: #F5B73D;
$alert-info-bg: #F5B73D;
// Tooltips and popovers
// -------------------------
@@ -378,7 +377,7 @@ $panel-editor-viz-item-shadow: 0 0 8px $dark-10;
$panel-editor-viz-item-border: 1px solid $dark-10;
$panel-editor-viz-item-shadow-hover: 0 0 4px $blue-light;
$panel-editor-viz-item-border-hover: 1px solid $blue-light;
$panel-editor-viz-item-bg: $input-black;
$panel-editor-viz-item-bg: $input-bg;
$panel-editor-tabs-line-color: #e3e3e3;
$panel-editor-viz-item-bg-hover: darken($blue-base, 46%);

16
public/sass/_variables.light.generated.scss
View File

@@ -58,7 +58,6 @@ $layer1: #fff;
$layer2: #F4F5F5;
$divider: rgba(36, 41, 46, 0.12);
$border0: rgba(36, 41, 46, 0.12);
$border1: rgba(36, 41, 46, 0.30);
@@ -268,14 +267,14 @@ $tab-border-color: $gray-5;
// Form states and alerts
// -------------------------
$warning-text-color: lighten($orange, 10%);
$error-text-color: $red-shade;
$success-text-color: lighten($green-base, 10%);
$warning-text-color: #BD4B00;
$error-text-color: #CF0E5B;
$success-text-color: #1A7F4B;
$alert-error-bg: linear-gradient(90deg, $red-base, $red-shade);
$alert-success-bg: linear-gradient(90deg, $green-base, $green-shade);
$alert-warning-bg: linear-gradient(90deg, $red-base, $red-shade);
$alert-info-bg: linear-gradient(100deg, $blue-base, $blue-shade);
$alert-error-bg: #E0226E;
$alert-success-bg: #1A7F4B;
$alert-warning-bg: #E56F00;
$alert-info-bg: #E56F00;
// Tooltips and popovers
$tooltipBackground: #F4F5F5;
@@ -397,3 +396,4 @@ $vertical-resize-handle-dots-hover: $gray-2;
// Calendar
$calendar-bg-days: $white;
$calendar-bg-now: $gray-6;

6
public/sass/base/_code.scss
View File

@@ -39,6 +39,12 @@ pre {
background-color: $code-tag-bg;
padding: 10px;
&.pre--no-style {
background: transparent;
border: none;
padding: 0px;
}
// Make prettyprint styles more spaced out for readability
&.prettyprint {
margin-bottom: $line-height-base;

15
public/sass/components/_alerts.scss
View File

@@ -9,10 +9,9 @@
padding: 15px 20px;
margin-bottom: $space-xs;
text-shadow: 0 2px 0 rgba(255, 255, 255, 0.5);
background: $alert-error-bg;
border-left: 3px solid $alert-error-bg;
background: $layer2;
position: relative;
color: $white;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
border-radius: $border-radius;
display: flex;
flex-direction: row;
@@ -23,20 +22,20 @@
// -------------------------
.alert-success {
background: $alert-success-bg;
border-color: $alert-success-bg;
}
.alert-danger,
.alert-error {
background: $alert-error-bg;
border-color: $alert-error-bg;
}
.alert-info {
background: $alert-info-bg;
border-color: $alert-info-bg;
}
.alert-warning {
background: $alert-warning-bg;
border-color: $alert-warning-bg;
}
.page-alert-list {
@@ -54,6 +53,7 @@
background: none;
display: flex;
align-items: center;
.fa {
align-self: flex-end;
font-size: 21px;
@@ -71,6 +71,7 @@
align-items: center;
justify-content: center;
width: 35px;
.fa {
font-size: 21px;
}

2
public/sass/components/_dashboard_settings.scss
View File

@@ -71,7 +71,7 @@
&.active {
@include left-brand-border-gradient();
background: $page-bg;
background: $panel-bg;
}
.gicon {