From dc63f0ddd04f601f52be4d6d24ceb20329328145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 5 Sep 2014 07:02:59 +0200 Subject: [PATCH] Fixed so white theme looks good with new search and editor panes, Closes #735, and other small fixes and polish --- src/app/controllers/dashboardCtrl.js | 2 + src/app/panels/graph/styleEditor.html | 5 +- src/app/partials/search.html | 4 ++ src/app/partials/submenu.html | 80 +++++++++++------------ src/app/services/templateValuesSrv.js | 6 +- src/css/less/bootswatch.light.less | 5 +- src/css/less/grafana.less | 19 +++--- src/css/less/search.less | 2 +- src/css/less/tables_lists.less | 4 +- src/css/less/variables.dark.less | 7 +- src/css/less/variables.light.less | 11 +++- src/test/specs/templateValuesSrv-specs.js | 9 +++ 12 files changed, 86 insertions(+), 68 deletions(-) diff --git a/src/app/controllers/dashboardCtrl.js b/src/app/controllers/dashboardCtrl.js index 3def3fef30c..8ccbb170d8a 100644 --- a/src/app/controllers/dashboardCtrl.js +++ b/src/app/controllers/dashboardCtrl.js @@ -57,6 +57,8 @@ function (angular, $, config, _) { $scope.checkFeatureToggles(); dashboardKeybindings.shortcuts($scope); + $scope.setWindowTitleAndTheme(); + $scope.emitAppEvent("dashboard-loaded", $scope.dashboard); }; diff --git a/src/app/panels/graph/styleEditor.html b/src/app/panels/graph/styleEditor.html index d26fe1610b8..b8c80473ebd 100644 --- a/src/app/panels/graph/styleEditor.html +++ b/src/app/panels/graph/styleEditor.html @@ -69,14 +69,11 @@
- -
    +
      • -
    -
    • alias or regex
      • diff --git a/src/app/partials/search.html b/src/app/partials/search.html index a414d7bfff1..e5241e9b11e 100644 --- a/src/app/partials/search.html +++ b/src/app/partials/search.html @@ -32,6 +32,8 @@
      No dashboards matching your query were found.
      +
      +
      @@ -40,6 +42,8 @@ {{tag.term}}  ({{tag.count}})
      +
      +
      diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html index 306bb710690..029e11bfd15 100644 --- a/src/app/partials/submenu.html +++ b/src/app/partials/submenu.html @@ -1,49 +1,47 @@
      -
      -
      +
      - - -
        -
      • - VARIABLES -
        • -
      • - {{variable.name}}: -
        • - -
      • -
        • -
      - -
      + +
    -
    -
+
    +
  • + VARIABLES +
    • +
  • + {{variable.name}}: +
    • + +
  • +
    • +
+ + + +
diff --git a/src/app/services/templateValuesSrv.js b/src/app/services/templateValuesSrv.js index 4293f567195..a4e79c1ca34 100644 --- a/src/app/services/templateValuesSrv.js +++ b/src/app/services/templateValuesSrv.js @@ -120,10 +120,8 @@ function (angular, _, kbn) { break; default: allValue = '{'; - _.each(variable.options, function(option) { - allValue += option.text + ','; - }); - allValue = allValue.substring(0, allValue.length - 1) + '}'; + allValue += _.pluck(variable.options, 'text').join(','); + allValue += '}'; } variable.options.unshift({text: 'All', value: allValue}); diff --git a/src/css/less/bootswatch.light.less b/src/css/less/bootswatch.light.less index ac45149221d..5675d605cbd 100644 --- a/src/css/less/bootswatch.light.less +++ b/src/css/less/bootswatch.light.less @@ -159,8 +159,9 @@ div.subnav { li.active > a, li.active > a:hover { border-color: transparent; - background-color: @blue; - color: @white; + background-color: transparent; + border-bottom: 2px solid @blue; + color: @blue } li.disabled > a { diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 5f0ba02e9af..d6c4d38f618 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -334,23 +334,22 @@ select.grafana-target-segment-input { ::-webkit-scrollbar-button:horizontal:increment:active { background-image: none; } ::-webkit-scrollbar-button:vertical:decrement:active { background-image: none; } ::-webkit-scrollbar-button:vertical:increment:active {background-image: none; } - -::-webkit-scrollbar-track-piece { background-color: grayDark; } +::-webkit-scrollbar-track-piece { background-color: transparent; } ::-webkit-scrollbar-thumb:vertical { height: 50px; - background: -webkit-gradient(linear, left top, right top, color-stop(0%, #3a3a3a), color-stop(100%, #222222)); - border: 1px solid #0d0d0d; - border-top: 1px solid #666666; - border-left: 1px solid #666666; + background: -webkit-gradient(linear, left top, right top, color-stop(0%, @scrollbarBackground), color-stop(100%, @scrollbarBackground2)); + border: 1px solid @scrollbarBorder; + border-top: 1px solid @scrollbarBorder; + border-left: 1px solid @scrollbarBorder; } ::-webkit-scrollbar-thumb:horizontal { width: 50px; - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #3a3a3a), color-stop(100%, #222222)); - border: 1px solid #1f1f1f; - border-top: 1px solid #666666; - border-left: 1px solid #666666; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @scrollbarBackground), color-stop(100%, @scrollbarBackground2)); + border: 1px solid @scrollbarBorder; + border-top: 1px solid @scrollbarBorder; + border-left: 1px solid @scrollbarBorder; } diff --git a/src/css/less/search.less b/src/css/less/search.less index 7302d7ea7a7..11a03fd0f4c 100644 --- a/src/css/less/search.less +++ b/src/css/less/search.less @@ -44,7 +44,7 @@ } .search-result-item:nth-child(odd) { - background-color: lighten(@grayDarker, 2%); + background-color: @grafanaListAccent; } .search-result-item { diff --git a/src/css/less/tables_lists.less b/src/css/less/tables_lists.less index 57cc6dce56c..faa9069ffb8 100644 --- a/src/css/less/tables_lists.less +++ b/src/css/less/tables_lists.less @@ -2,7 +2,7 @@ width: 100%; tr:nth-child(odd) td { - background-color: lighten(@grayDarker, 2%); + background-color: @grafanaListAccent; } td { @@ -39,7 +39,7 @@ max-width: 450px; li:nth-child(odd) { - background-color: lighten(@grayDarker, 2%); + background-color: @grafanaListAccent; } li { diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less index 34863951190..605a1672c47 100644 --- a/src/css/less/variables.dark.less +++ b/src/css/less/variables.dark.less @@ -88,13 +88,18 @@ // Lists @grafanaListBackground: transparent; -@grafanaListAccent: @grayDark; +@grafanaListAccent: lighten(@grayDarker, 2%); @grafanaListBorderTop: @grayDark; @grafanaListBorderBottom: @black; @grafanaListHighlight: @blue; @grafanaListHighlightContrast: #4F4F4F; @grafanaListMainLinkColor: @linkColor; +// Scrollbars +@scrollbarBackground: #3a3a3a; +@scrollbarBackground2: #3a3a3a; +@scrollbarBorder: black; + // Tables // ------------------------- @tableBackground: transparent; // overall background-color diff --git a/src/css/less/variables.light.less b/src/css/less/variables.light.less index 54f217e125b..b7cdc5a6271 100644 --- a/src/css/less/variables.light.less +++ b/src/css/less/variables.light.less @@ -38,7 +38,7 @@ @submenuBorder: @white; // Tabs -@fullEditBorder: @white; +@fullEditBorder: @grayLighter; // Graphite Target Editor @grafanaTargetBorder: @submenuBackground; @@ -96,7 +96,7 @@ // Lists @grafanaListBackground: transparent; -@grafanaListAccent: #f9f9f9; +@grafanaListAccent: @grayLighter; @grafanaListBorderTop: #eee; @grafanaListBorderBottom: #efefef; @grafanaListHighlight: @blue; @@ -111,6 +111,11 @@ @tableBackgroundHover: #E8F8FD; // for hover @tableBorder: #ddd; // table and cell border +// Scrollbars +@scrollbarBackground: @grayLighter; +@scrollbarBackground2: @grayLighter; +@scrollbarBorder: @grayLight; + // Buttons // ------------------------- @btnBackground: @grayLighter; @@ -186,7 +191,7 @@ // Input placeholder text color // ------------------------- -@placeholderText: @gray; +@placeholderText: @grayLight; // Hr border color diff --git a/src/test/specs/templateValuesSrv-specs.js b/src/test/specs/templateValuesSrv-specs.js index d0825a2239c..3e3f34a8249 100644 --- a/src/test/specs/templateValuesSrv-specs.js +++ b/src/test/specs/templateValuesSrv-specs.js @@ -208,7 +208,16 @@ define([ }); }); + describeUpdateVariable('with include all glob no values', function(ctx) { + ctx.setup(function() { + ctx.variable = { type: 'query', query: 'apps.*', name: 'test', includeAll: true, allFormat: 'glob' }; + ctx.queryResult = []; + }); + it('should add empty glob', function() { + expect(ctx.variable.options[0].value).to.be('{}'); + }); + }); });