diff --git a/package.json b/package.json index 14da878ee882f..bd363bccc7b88 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "url": "https://github.com/elastic/kibana.git" }, "dependencies": { - "@elastic/eui": "0.0.35", + "@elastic/eui": "^0.0.37", "@elastic/filesaver": "1.1.2", "@elastic/numeral": "2.3.1", "@elastic/ui-ace": "0.2.3", diff --git a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap index 0a552ed38776c..242748049e614 100644 --- a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap +++ b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap @@ -20,7 +20,7 @@ Array [ > diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_700.ttf b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.ttf similarity index 75% rename from src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_700.ttf rename to src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.ttf index 974a7c5edd7f1..11aec0f49e405 100644 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_700.ttf and b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.ttf differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff new file mode 100644 index 0000000000000..2523e953cb971 Binary files /dev/null and b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff2 b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff2 new file mode 100644 index 0000000000000..2b04b15bb70ad Binary files /dev/null and b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_700.woff2 differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.eot b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.eot new file mode 100644 index 0000000000000..1a8b1160df0f4 Binary files /dev/null and b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.eot differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_regular.svg b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.svg similarity index 52% rename from src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_regular.svg rename to src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.svg index 052c59fff03dc..78eb653a75e60 100644 --- a/src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_regular.svg +++ b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.svg @@ -331,1307 +331,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_regular.ttf b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.ttf similarity index 74% rename from src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_regular.ttf rename to src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.ttf index 0dae9c3bbc0b5..9d4e8e526d7eb 100644 Binary files a/src/ui/public/assets/fonts/open_sans/open_sans_v13_latin_regular.ttf and b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.ttf differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff new file mode 100644 index 0000000000000..e495e6f010c94 Binary files /dev/null and b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff differ diff --git a/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff2 b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff2 new file mode 100644 index 0000000000000..c8050c25f8c90 Binary files /dev/null and b/src/ui/public/assets/fonts/open_sans/open_sans_v15_latin_regular.woff2 differ diff --git a/src/ui/ui_render/views/chrome.jade b/src/ui/ui_render/views/chrome.jade index fde8ab04a6d8c..b449c101b99ed 100644 --- a/src/ui/ui_render/views/chrome.jade +++ b/src/ui/ui_render/views/chrome.jade @@ -16,30 +16,40 @@ html(lang='en') font-style: normal; font-weight: 300; src: local('Open Sans Light'), local('OpenSans-Light'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_300.woff2') format('woff2'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_300.woff') format('woff'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_300.ttf') format('truetype'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_300.svg#OpenSans') format('svg'); + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_300.woff2') format('woff2'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_300.woff') format('woff'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_300.ttf') format('truetype'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_300.svg#OpenSans') format('svg'); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 400; src: local('Open Sans'), local('OpenSans'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_regular.woff2') format('woff2'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_regular.woff') format('woff'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_regular.ttf') format('truetype'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_regular.svg#OpenSans') format('svg'); + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_regular.woff2') format('woff2'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_regular.woff') format('woff'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_regular.ttf') format('truetype'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_regular.svg#OpenSans') format('svg'); + } + @font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_600.woff2') format('woff2'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_600.woff') format('woff'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_600.ttf') format('truetype'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_600.svg#OpenSans') format('svg'); } @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 700; src: local('Open Sans Bold'), local('OpenSans-Bold'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_700.woff2') format('woff2'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_700.woff') format('woff'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_700.ttf') format('truetype'), - url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v13_latin_700.svg#OpenSans') format('svg'); + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_700.woff2') format('woff2'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_700.woff') format('woff'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_700.ttf') format('truetype'), + url('#{kibanaPayload.basePath}/ui/fonts/open_sans/open_sans_v15_latin_700.svg#OpenSans') format('svg'); } //- Favicons (generated from http://realfavicongenerator.net/) diff --git a/yarn.lock b/yarn.lock index f56648477b312..7330d5601e6ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,9 +87,9 @@ version "0.0.0" uid "" -"@elastic/eui@0.0.35": - version "0.0.35" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-0.0.35.tgz#61dfebb8d1c0c652e9872aeecd270e7ca150b7e1" +"@elastic/eui@^0.0.37": + version "0.0.37" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-0.0.37.tgz#c7cbbcd8c451917e745949ed169caf7b1e9efdbe" dependencies: brace "^0.10.0" classnames "^2.2.5" @@ -107,6 +107,7 @@ prop-types "^15.6.0" react-ace "^5.5.0" react-color "^2.13.8" + react-input-autosize "^2.2.1" serve "^6.3.1" tabbable "^1.1.0" uuid "^3.1.0" @@ -9324,7 +9325,7 @@ react-grid-layout@^0.16.2: react-draggable "3.x" react-resizable "1.x" -react-input-autosize@^2.1.2: +react-input-autosize@^2.1.2, react-input-autosize@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8" dependencies: