From f64385cfc9ef5f1629d4a241694066613c5a0bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 16 Nov 2016 17:53:56 +0100 Subject: [PATCH] ux(tweak): minor polish to date picker styling --- public/app/app.ts | 1 - public/app/core/core.ts | 1 - .../core/directives/grafana_version_check.js | 31 ------------------- public/sass/components/_timepicker.scss | 5 +-- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 public/app/core/directives/grafana_version_check.js diff --git a/public/app/app.ts b/public/app/app.ts index c004bac4177..22431a5110c 100644 --- a/public/app/app.ts +++ b/public/app/app.ts @@ -40,7 +40,6 @@ export class GrafanaApp { init() { var app = angular.module('grafana', []); - app.constant('grafanaVersion', "@grafanaVersion@"); moment.locale(config.bootData.user.locale); diff --git a/public/app/core/core.ts b/public/app/core/core.ts index 8e9f64fd17f..4aa2e7eb64a 100644 --- a/public/app/core/core.ts +++ b/public/app/core/core.ts @@ -6,7 +6,6 @@ import "./directives/dash_class"; import "./directives/confirm_click"; import "./directives/dash_edit_link"; import "./directives/dropdown_typeahead"; -import "./directives/grafana_version_check"; import "./directives/metric_segment"; import "./directives/misc"; import "./directives/ng_model_on_blur"; diff --git a/public/app/core/directives/grafana_version_check.js b/public/app/core/directives/grafana_version_check.js deleted file mode 100644 index bee437b8183..00000000000 --- a/public/app/core/directives/grafana_version_check.js +++ /dev/null @@ -1,31 +0,0 @@ -define([ - '../core_module', -], -function (coreModule) { - 'use strict'; - - coreModule.default.directive('grafanaVersionCheck', function($http, contextSrv) { - return { - restrict: 'A', - link: function(scope, elem) { - if (contextSrv.version === 'master') { - return; - } - - $http({ method: 'GET', url: 'https://grafanarel.s3.amazonaws.com/latest.json' }) - .then(function(response) { - if (!response.data || !response.data.version) { - return; - } - - if (contextSrv.version !== response.data.version) { - elem.append(' ' + - ' ' + - 'New version available: ' + response.data.version + - ''); - } - }); - } - }; - }); -}); diff --git a/public/sass/components/_timepicker.scss b/public/sass/components/_timepicker.scss index 1ecc2c7a166..4046e6496b4 100644 --- a/public/sass/components/_timepicker.scss +++ b/public/sass/components/_timepicker.scss @@ -65,7 +65,8 @@ } .gf-timepicker-component { - margin-bottom: 10px; + padding: $spacer/2 0; + td { padding: 1px; } @@ -73,7 +74,7 @@ @include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl); background-image: none; border: none; - padding: 6px 10px; + padding: 5px 9px; color: $text-color; &.active span { color: $blue;