Merge pull request #6212 from simianhacker/icon-fixes

Adding colors and fixing spacing
elastic · Feb 11, 2016 · 4f3b315 · 4f3b315
2 parents 958dabf + ca9ef6a
commit 4f3b315
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 12 deletions.
diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.less b/src/ui/public/chrome/directives/app_switcher/app_switcher.less
@@ -4,11 +4,15 @@
 // as - App Switcher
 @as-open-width: 160px;
 @as-closed-width: 53px;
-@app-icon-height: 30px;
+@app-icon-height: 38px;
 @transition-time: .35s;
 @transition-delay: .25s;
 @app-links-wrapper-background: #3caed2;
 
+@firstLinkColor: #E4BB51;
+@secondLinkColor: #8AC336;
+@thirdLinkColor: #59C6C5;
+
 body { overflow-x: hidden; }
 
 .app-links-wrapper {
@@ -79,6 +83,7 @@ body { overflow-x: hidden; }
     height: @app-icon-height;
     line-height:  24px;
 
+
     > a {
       display: block;
       height: 100%;
@@ -102,7 +107,8 @@ body { overflow-x: hidden; }
       }
 
       > img {
-        height: 20px;
+        height: 18px;
+        margin-top: 8px;
       }
     }
 
@@ -139,6 +145,27 @@ body { overflow-x: hidden; }
       }
     }
 
+    &:nth-child(1) {
+      background-color: @firstLinkColor;
+      &:hover {
+        background-color: lighten(@firstLinkColor, 5%);
+      }
+    }
+
+    &:nth-child(2) {
+      background-color: @secondLinkColor;
+      &:hover {
+        background-color: lighten(@secondLinkColor, 5%);
+      }
+    }
+
+    &:nth-child(3) {
+      background-color: @thirdLinkColor;
+      &:hover {
+        background-color: lighten(@thirdLinkColor, 5%);
+      }
+    }
+
   }
 
 }
diff --git a/src/ui/public/config/_delayed_updater.js b/src/ui/public/config/_delayed_updater.js
@@ -1,7 +1,9 @@
 import _ from 'lodash';
 import angular from 'angular';
 import ConfigValsProvider from 'ui/config/_vals';
-export default function DelayedUpdaterFactory(Private, $rootScope, Promise, Notifier) {
+import Notifier from 'ui/notify/notifier';
+
+export default function DelayedUpdaterFactory(Private, $rootScope, Promise) {
   var notify = new Notifier();
 
   var vals = Private(ConfigValsProvider);

diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js
@@ -6,16 +6,16 @@ import ConfigValsProvider from 'ui/config/_vals';
 import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
-var module = uiModules.get('kibana/config', [
-  'kibana/notify'
-]);
+import Notifier from 'ui/notify/notifier';
+
+var module = uiModules.get('kibana/config');
 
 uiRoutes.addSetupWork(function (config) {
   return config.init();
 });
 
 // service for delivering config variables to everywhere else
-module.service('config', function (Private, Notifier, kbnVersion, kbnIndex, $rootScope, buildNum) {
+module.service('config', function (Private, kbnVersion, kbnIndex, $rootScope, buildNum) {
   var config = this;
 
   var defaults = Private(ConfigDefaultsProvider);

diff --git a/src/ui/public/courier/data_source/doc_source.js b/src/ui/public/courier/data_source/doc_source.js
@@ -3,6 +3,8 @@ import CourierDataSourceDocSendToEsProvider from 'ui/courier/data_source/_doc_se
 import CourierDataSourceAbstractProvider from 'ui/courier/data_source/_abstract';
 import CourierFetchRequestDocProvider from 'ui/courier/fetch/request/doc';
 import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc';
+import 'ui/es';
+import 'ui/storage';
 
 export default function DocSourceFactory(Private, Promise, es, sessionStorage) {
   var sendToEs = Private(CourierDataSourceDocSendToEsProvider);

diff --git a/src/ui/public/courier/fetch/_notifier.js b/src/ui/public/courier/fetch/_notifier.js
@@ -1,4 +1,6 @@
-export default function CourierFetchNotifier(Notifier) {
+import Notifier from 'ui/notify/notifier';
+
+export default function CourierFetchNotifier() {
   return new Notifier({
     location: 'Courier Fetch'
   });

diff --git a/src/ui/public/courier/fetch/request/_error_handler.js b/src/ui/public/courier/fetch/request/_error_handler.js
@@ -1,6 +1,7 @@
 import CourierErrorHandlersProvider from 'ui/courier/_error_handlers';
+import Notifier from 'ui/notify/notifier';
 
-export default function RequestErrorHandlerFactory(Private, Notifier) {
+export default function RequestErrorHandlerFactory(Private) {
   var errHandlers = Private(CourierErrorHandlersProvider);
 
   var notify = new Notifier({

diff --git a/src/ui/public/state_management/state.js b/src/ui/public/state_management/state.js
@@ -3,9 +3,10 @@ import rison from 'ui/utils/rison';
 import applyDiff from 'ui/utils/diff_object';
 import qs from 'ui/utils/query_string';
 import EventsProvider from 'ui/events';
+import Notifier from 'ui/notify/notifier';
 
 
-export default function StateProvider(Notifier, Private, $rootScope, $location) {
+export default function StateProvider(Private, $rootScope, $location) {
   var Events = Private(EventsProvider);
 
   _.class(State).inherits(Events);
@@ -147,4 +148,3 @@ export default function StateProvider(Notifier, Private, $rootScope, $location)
   return State;
 
 };
-
diff --git a/src/ui/public/timefilter/timefilter.js b/src/ui/public/timefilter/timefilter.js
@@ -3,12 +3,14 @@ import angular from 'angular';
 import moment from 'moment';
 import dateMath from 'ui/utils/dateMath';
 import 'ui/state_management/global_state';
+import 'ui/config';
 import EventsProvider from 'ui/events';
 import UtilsDiffTimePickerValsProvider from 'ui/utils/diff_time_picker_vals';
 import TimefilterLibDiffTimeProvider from 'ui/timefilter/lib/diff_time';
 import TimefilterLibDiffIntervalProvider from 'ui/timefilter/lib/diff_interval';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
+
 uiRoutes
 .addSetupWork(function (timefilter) {
   return timefilter.init();
@@ -111,4 +113,3 @@ uiModules
 
   return new Timefilter();
 });
-