Merge branch 'master' into expandCollapse
|
@ -1,5 +1,5 @@
|
|||
<kbn-agg-table
|
||||
table="table"
|
||||
export-title="vis.title"
|
||||
per-page="editableVis.params.spyPerPage">
|
||||
per-page="spy.params.spyPerPage">
|
||||
</kbn-agg-table>
|
||||
|
|
|
@ -21,8 +21,8 @@ define(function (require) {
|
|||
if (!$scope.vis || !$scope.esResp) {
|
||||
$scope.table = null;
|
||||
} else {
|
||||
if (!$scope.editableVis.params.spyPerPage) {
|
||||
$scope.editableVis.params.spyPerPage = PER_PAGE_DEFAULT;
|
||||
if (!$scope.spy.params.spyPerPage) {
|
||||
$scope.spy.params.spyPerPage = PER_PAGE_DEFAULT;
|
||||
}
|
||||
|
||||
$scope.table = tabifyAggResponse($scope.vis, $scope.esResp, {
|
||||
|
|
100
src/ui/public/styles/fonts.less
Normal file
|
@ -0,0 +1,100 @@
|
|||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: normal;
|
||||
font-weight: 300;
|
||||
src: local('Open Sans Light'), local('OpenSans-Light'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_300.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_300.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_300.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_300.svg#OpenSans') format('svg');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: italic;
|
||||
font-weight: 300;
|
||||
src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_300italic.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_300italic.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_300italic.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_300italic.svg#OpenSans') format('svg');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: local('Open Sans'), local('OpenSans'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_regular.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_regular.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_regular.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_regular.svg#OpenSans') format('svg');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: italic;
|
||||
font-weight: 400;
|
||||
src: local('Open Sans Italic'), local('OpenSans-Italic'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_italic.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_italic.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_italic.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_italic.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('fonts/open_sans/open_sans_v13_latin_600.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_600.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_600.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_600.svg#OpenSans') format('svg');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: italic;
|
||||
font-weight: 600;
|
||||
src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_600italic.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_600italic.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_600italic.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_600italic.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('fonts/open_sans/open_sans_v13_latin_700.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_700.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_700.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_700.svg#OpenSans') format('svg');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: italic;
|
||||
font-weight: 700;
|
||||
src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_700italic.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_700italic.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_700italic.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_700italic.svg#OpenSans') format('svg');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: normal;
|
||||
font-weight: 800;
|
||||
src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_800.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_800.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_800.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_800.svg#OpenSans') format('svg');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Open Sans';
|
||||
font-style: italic;
|
||||
font-weight: 800;
|
||||
src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_800italic.woff2') format('woff2'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_800italic.woff') format('woff'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_800italic.ttf') format('truetype'),
|
||||
url('fonts/open_sans/open_sans_v13_latin_800italic.svg#OpenSans') format('svg');
|
||||
}
|
202
src/ui/public/styles/fonts/open_sans/LICENSE.txt
Normal file
|
@ -0,0 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
1633
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_300.svg
Normal file
After Width: | Height: | Size: 104 KiB |
BIN
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_300.ttf
Normal file
After Width: | Height: | Size: 108 KiB |
1637
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_600.svg
Normal file
After Width: | Height: | Size: 104 KiB |
BIN
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_600.ttf
Normal file
After Width: | Height: | Size: 108 KiB |
1635
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_700.svg
Normal file
After Width: | Height: | Size: 104 KiB |
BIN
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_700.ttf
Normal file
After Width: | Height: | Size: 107 KiB |
1637
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_800.svg
Normal file
After Width: | Height: | Size: 105 KiB |
BIN
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_800.ttf
Normal file
After Width: | Height: | Size: 107 KiB |
1650
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_italic.svg
Normal file
After Width: | Height: | Size: 108 KiB |
1637
src/ui/public/styles/fonts/open_sans/open_sans_v13_latin_regular.svg
Normal file
After Width: | Height: | Size: 105 KiB |
|
@ -8,6 +8,7 @@
|
|||
@import "~ui/styles/variables";
|
||||
@import "~ui/styles/theme/bootstrap";
|
||||
@import "~ui/styles/theme/font-awesome";
|
||||
@import "~ui/styles/fonts";
|
||||
|
||||
|
||||
// Navbar =====================================================================
|
||||
|
|
|
@ -20,8 +20,7 @@
|
|||
//== Typography
|
||||
//
|
||||
//## Font, line-height, and color for body text, headings, and more.
|
||||
|
||||
@font-family-sans-serif: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
@font-family-sans-serif: "Open Sans", "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
@font-family-serif: Georgia, "Times New Roman", Times, serif;
|
||||
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
|
||||
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
|
||||
|
|
|
@ -16,6 +16,7 @@ define(function (require) {
|
|||
var $container = $el.find('.visualize-spy-container');
|
||||
var fullPageSpy = _.get($scope.spy, 'mode.fill', false);
|
||||
$scope.modes = spyModes;
|
||||
$scope.spy.params = $scope.spy.params || {};
|
||||
|
||||
function getSpyObject(name) {
|
||||
name = _.isUndefined(name) ? $scope.spy.mode.name : name;
|
||||
|
|
|
@ -12,8 +12,11 @@ define(function (require) {
|
|||
var settingsPage;
|
||||
var discoverPage;
|
||||
var baseUrl;
|
||||
// var expectedToastMessage = 'Share search: URL selected. Press Ctrl+C to copy.'; pre-Firefox 41
|
||||
var expectedToastMessage = 'Share search: URL copied to clipboard.';
|
||||
// The message changes for Firefox < 41 and Firefox >= 41
|
||||
// var expectedToastMessage = 'Share search: URL selected. Press Ctrl+C to copy.';
|
||||
// var expectedToastMessage = 'Share search: URL copied to clipboard.';
|
||||
// Pass either one.
|
||||
var expectedToastMessage = /Share search: URL (selected. Press Ctrl+C to copy.|copied to clipboard.)/;
|
||||
|
||||
bdd.before(function () {
|
||||
common = new Common(this.remote);
|
||||
|
@ -68,7 +71,6 @@ define(function (require) {
|
|||
|
||||
|
||||
bdd.it('should show the correct formatted URL', function () {
|
||||
// this is a BAD URL which includes the nav bar
|
||||
var expectedUrl = baseUrl
|
||||
+ '/app/kibana?_t=1453775307251#'
|
||||
+ '/discover?_g=(refreshInterval:(display:Off,pause:!f,value:0),time'
|
||||
|
@ -92,7 +94,7 @@ define(function (require) {
|
|||
return headerPage.getToastMessage();
|
||||
})
|
||||
.then(function (toastMessage) {
|
||||
expect(toastMessage).to.be(expectedToastMessage);
|
||||
expect(toastMessage).to.match(expectedToastMessage);
|
||||
})
|
||||
.then(function () {
|
||||
return headerPage.waitForToastMessageGone();
|
||||
|
@ -117,14 +119,13 @@ define(function (require) {
|
|||
});
|
||||
|
||||
// NOTE: This test has to run immediately after the test above
|
||||
// 'shorten URL button should produce a short URL'
|
||||
bdd.it('should show toast message for copy to clipboard', function () {
|
||||
return discoverPage.clickCopyToClipboard()
|
||||
.then(function () {
|
||||
return headerPage.getToastMessage();
|
||||
})
|
||||
.then(function (toastMessage) {
|
||||
expect(toastMessage).to.be(expectedToastMessage);
|
||||
expect(toastMessage).to.match(expectedToastMessage);
|
||||
})
|
||||
.then(function () {
|
||||
return headerPage.waitForToastMessageGone();
|
||||
|
|
|
@ -34,8 +34,5 @@ getUrl.noAuth = function getUrlNoAuth(config, app) {
|
|||
};
|
||||
|
||||
getUrl.baseUrl = function getBaseUrl(config) {
|
||||
config = _.pick(config, function (val, param) {
|
||||
return param !== 'auth' & param !== 'pathname' & param !== 'hash';
|
||||
});
|
||||
return url.format(config);
|
||||
return url.format(_.pick(config, 'protocol', 'hostname', 'port'));
|
||||
};
|
||||
|
|