From 05a5a66e2fbbf67d731d46ec7c7e29b677418341 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 5 Jun 2020 04:53:57 -0400 Subject: [PATCH] Chore: spelling - theme (#24434) * Chore: spelling - theme * Chore: drop phantomjs comments * Chore: remove old phantomjs hack Co-authored-by: Dominik Prokop --- public/sass/_variables.dark.generated.scss | 2 +- public/sass/_variables.light.generated.scss | 2 +- public/sass/components/_drop.scss | 2 +- public/sass/components/_navs.scss | 2 +- public/sass/components/_panel_graph.scss | 4 ---- public/sass/components/_panel_singlestat.scss | 2 +- public/sass/components/_toggle_button_group.scss | 2 +- public/vendor/flot/jquery.flot.gauge.js | 6 +++--- public/vendor/flot/jquery.flot.selection.js | 4 ++-- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss index 3e3a4de4edd..0165d38ca67 100644 --- a/public/sass/_variables.dark.generated.scss +++ b/public/sass/_variables.dark.generated.scss @@ -391,7 +391,7 @@ $logs-color-unkown: $gray-2; // toggle-group $button-toggle-group-btn-active-bg: linear-gradient(90deg, #eb7b18, #d44a3a); $button-toggle-group-btn-active-shadow: inset 0 0 4px $black; -$button-toggle-group-btn-seperator-border: 1px solid $dark-2; +$button-toggle-group-btn-separator-border: 1px solid $dark-2; $vertical-resize-handle-bg: $dark-10; $vertical-resize-handle-dots: $gray-1; diff --git a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss index 76eb04a2bce..41b770d7d6e 100644 --- a/public/sass/_variables.light.generated.scss +++ b/public/sass/_variables.light.generated.scss @@ -384,7 +384,7 @@ $logs-color-unkown: $gray-5; // toggle-group $button-toggle-group-btn-active-bg: $brand-primary; $button-toggle-group-btn-active-shadow: inset 0 0 4px $white; -$button-toggle-group-btn-seperator-border: 1px solid $gray-6; +$button-toggle-group-btn-separator-border: 1px solid $gray-6; $vertical-resize-handle-bg: $gray-4; $vertical-resize-handle-dots: $gray-3; diff --git a/public/sass/components/_drop.scss b/public/sass/components/_drop.scss index 6fced0dec6f..609638593e0 100644 --- a/public/sass/components/_drop.scss +++ b/public/sass/components/_drop.scss @@ -29,7 +29,7 @@ $easing: cubic-bezier(0, 0, 0.265, 1); box-sizing: border-box; } -.drop-popopver-close { +.drop-popover-close { position: absolute; top: -5px; right: 0; diff --git a/public/sass/components/_navs.scss b/public/sass/components/_navs.scss index 950d65b4fa6..545b93d6d39 100644 --- a/public/sass/components/_navs.scss +++ b/public/sass/components/_navs.scss @@ -15,7 +15,7 @@ display: block; } -// Redeclare pull classes because of specifity +// Redeclare pull classes because of specificity .nav > .pull-right { float: right; } diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss index 4d72732b8fd..df6bd3e6b18 100644 --- a/public/sass/components/_panel_graph.scss +++ b/public/sass/components/_panel_graph.scss @@ -320,16 +320,12 @@ top: 50%; left: 8px; transform: translateX(-50%) translateY(-50%) rotate(-90deg); - // this is needed for phantomsjs 2.1 - -webkit-transform: translateX(-50%) translateY(-50%) rotate(-90deg); } .right-yaxis-label { top: 50%; right: 8px; transform: translateX(50%) translateY(-50%) rotate(90deg); - // this is needed for phantomsjs 2.1 - -webkit-transform: translateX(50%) translateY(-50%) rotate(90deg); } .axisLabel { diff --git a/public/sass/components/_panel_singlestat.scss b/public/sass/components/_panel_singlestat.scss index df8cbd0c037..d80a72cf40a 100644 --- a/public/sass/components/_panel_singlestat.scss +++ b/public/sass/components/_panel_singlestat.scss @@ -26,6 +26,6 @@ padding-right: 20px; } -#flotGagueValue0 { +#flotGaugeValue0 { font-weight: $font-weight-semi-bold; //please dont hurt me for this! } diff --git a/public/sass/components/_toggle_button_group.scss b/public/sass/components/_toggle_button_group.scss index 25a410c632a..62e5c85ea36 100644 --- a/public/sass/components/_toggle_button_group.scss +++ b/public/sass/components/_toggle_button_group.scss @@ -9,7 +9,7 @@ font-weight: $font-weight-semi-bold; font-size: $font-size-sm; border-radius: 0; - border-right: $button-toggle-group-btn-seperator-border; + border-right: $button-toggle-group-btn-separator-border; &.active { background: $button-toggle-group-btn-active-bg; diff --git a/public/vendor/flot/jquery.flot.gauge.js b/public/vendor/flot/jquery.flot.gauge.js index c6c1933a06d..760354cecd4 100644 --- a/public/vendor/flot/jquery.flot.gauge.js +++ b/public/vendor/flot/jquery.flot.gauge.js @@ -482,7 +482,7 @@ drawText( cellLayout.cx, cellLayout.y + cellLayout.cellMargin + layout.labelMargin + cellLayout.offsetY, - "flotGagueLabel" + i, + "flotGaugeLabel" + i, gaugeOptionsi.label.formatter ? gaugeOptionsi.label.formatter(item.label, item.data[0][1]) : text, gaugeOptionsi.label); } @@ -502,7 +502,7 @@ drawText( cellLayout.cx, cellLayout.cy - (gaugeOptionsi.value.font.size / 2), - "flotGagueValue" + i, + "flotGaugeValue" + i, gaugeOptionsi.value.formatter ? gaugeOptionsi.value.formatter(item.label, item.data[0][1]) : text, gaugeOptionsi.value); } @@ -550,7 +550,7 @@ cellLayout.cy + ((layout.thresholdLabelMargin + (layout.thresholdLabelFontSize / 2) + layout.radius) * Math.sin(toRad(a))), - "flotGagueThresholdValue" + i, + "flotGaugeThresholdValue" + i, gaugeOptionsi.threshold.label.formatter ? gaugeOptionsi.threshold.label.formatter(value) : value, gaugeOptionsi.threshold.label, a); diff --git a/public/vendor/flot/jquery.flot.selection.js b/public/vendor/flot/jquery.flot.selection.js index 10a11ffa9d6..14ea8607212 100644 --- a/public/vendor/flot/jquery.flot.selection.js +++ b/public/vendor/flot/jquery.flot.selection.js @@ -360,10 +360,10 @@ The plugin allso adds the following methods to the plot object: // grafana addition // In L114 this plugin is overrinding document.onselectstart handler to prevent default or custom behaviour // Then this patch is being restored during mouseup event. But, mouseup handler is unbound when this plugin is destroyed - // and the overriden onselectstart handler is not restored. The problematic behaviour surfaces when flot is re-rendered + // and the overridden onselectstart handler is not restored. The problematic behaviour surfaces when flot is re-rendered // as a consequence of panel's model update. When i.e. options are applied via onBlur // event on some input which results in flot re-render. The mouseup handler should be called to resture the original handlers - // but by the time the document mouseup event occurs, the event handler is no longer there, so onselectstart is permanently overriden. + // but by the time the document mouseup event occurs, the event handler is no longer there, so onselectstart is permanently overridden. // To fix that we are making sure that the overrides are reverted when this plugin is destroyed, the same way as they would // via mouseup event handler (L138)