uptime app icon, mobile header size removed

elastic · Jan 30, 2019 · bdd551c · bdd551c
1 parent 46c25f4
commit bdd551c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/src/ui/public/chrome/directives/header_global_nav/_header_global_nav.scss b/src/ui/public/chrome/directives/header_global_nav/_header_global_nav.scss
@@ -1,6 +1,4 @@
-// Size variables
-$euiHeaderNavSize: $euiSizeXL + $euiSize;
-$euiHeaderNavSizeMobile: $euiHeaderNavSize * .75;
+@import '@elastic/eui/src/components/header/variables';
 
 .header-global-wrapper {
   width: 100%;
@@ -10,30 +8,18 @@ $euiHeaderNavSizeMobile: $euiHeaderNavSize * .75;
 }
 
 .header-global-wrapper + .app-wrapper:not(.hidden-chrome) {
-  top: $euiHeaderNavSize;
-  left: $euiHeaderNavSize;
+  top: $euiHeaderChildSize;
+  left: $euiHeaderChildSize;
 
   // HOTFIX: Temporary fix for flyouts not inside portals
   // SASSTODO: Find an actual solution
   .euiFlyout {
-    top: $euiHeaderNavSize;
+    top: $euiHeaderChildSize;
   }
 }
 
 // Mobile header is smaller
-@include euiBreakpoint('xs') {
-  .header-global-wrapper + .app-wrapper:not(.hidden-chrome) {
-    top: $euiHeaderNavSizeMobile;
-    left: 0;
-
-    .euiFlyout {
-      top: $euiHeaderNavSizeMobile;
-    }
-  }
-}
-
-// Mobile header is smaller
-@include euiBreakpoint('s') {
+@include euiBreakpoint('xs', 's') {
   .header-global-wrapper + .app-wrapper:not(.hidden-chrome) {
     left: 0;
   }

diff --git a/x-pack/plugins/gis/public/_main.scss b/x-pack/plugins/gis/public/_main.scss
@@ -8,12 +8,6 @@
   overflow: hidden;
 }
 
-@include euiBreakpoint('xs') {
-  #gis-plugin {
-    height: calc(100vh - #{$euiHeaderChildSizeMobile});
-  }
-}
-
 #react-gis-root {
   flex-grow: 1;
   display: flex;

diff --git a/x-pack/plugins/uptime/index.ts b/x-pack/plugins/uptime/index.ts
@@ -23,6 +23,7 @@ export const uptime = (kibana: any) =>
           description: 'The description text that will be shown to users in Kibana',
         }),
         icon: 'plugins/uptime/icons/heartbeat_white.svg',
+        euiIconType: 'uptimeApp',
         title: 'Uptime',
         main: 'plugins/uptime/app',
         order: 8900,