github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed imported css in SASS file (#22074)

Browse source
This commit is contained in:
Caroline Horn 2018-08-16 16:46:16 -04:00 • committed by GitHub
parent a344624a58
commit 4a1ad350e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core_plugins/kibana/public/dashboard/_index.scss
View file

@ -1,7 +1,7 @@
// External libraries
// SASSTODO: Change from relative path once node-sass includes node_modules in includePaths
@import './../../../../../node_modules/react-grid-layout/css/styles';
@import './../../../../../node_modules/react-resizable/css/styles';
// 'react-grid-layout/css/styles.css';
// 'react-resizable/css/styles.css';
// ... are being imported via JS in grid/dashboard_grid.js
// Temporary hacks
@import 'hacks';

7
src/core_plugins/kibana/public/dashboard/components/_exit_full_screen_button.scss
View file

@ -25,7 +25,7 @@
&:hover,
&:focus {
transition: all $euiAnimSpeedExtraSlow $euiAnimSlightResistance;
z-index: 10 !important; /* 1. */
z-index: 10 !important; /* 1 */
.dshExitFullScreenButton__text {
transition: all $euiAnimSpeedNormal $euiAnimSlightResistance;
@ -38,8 +38,7 @@
display: block;
background-color: shadeOrTint($euiColorPrimary, 25%, 25%);
height: $euiSizeXXL;
// SASSTODO: wait until bundler can inject file names into SASS
// background-image: url("../../../../../ui/images/kibana.svg");
background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 147 51' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%23FFF' fill-rule='evenodd'%3E%3Cpath d='m59.3 36.99v-6.7l2.1-0.2 4 7h4.1l-5-8.8 4.8-7.7h-4l-3.9 6.4-2 0.2v-13.6h-3.6v23.4h3.5zm13 0h3.6v-16.5h-3.6v16.5zm0-19.3h3.6v-3.8h-3.6v3.8zm15.7 2.5c-1.9 0-4.1 1-4.1 1v-7.5h-3.6v23.4s4.3 0.4 6 0.4c5.9 0 8.1-2 8.1-8.9 0-6.2-1.9-8.4-6.4-8.4zm-1.7 14c-0.7 0-2.5-0.1-2.5-0.1v-10s1.9-0.7 3.7-0.7c2.2 0 3.2 1.5 3.2 5.2 0 4-0.7 5.6-4.4 5.6zm23.9-8.6c0-3.8-1.7-5.5-5.7-5.5-3 0-6.6 0.9-6.6 0.9l0.1 2.5s4-0.3 6.2-0.3c1.6 0 2.4 0.6 2.4 2.4v1.2l-4.3 0.4c-3.5 0.3-5.5 1.5-5.5 5 0 3.4 1.7 5.3 4.9 5.3 2.7 0 5.3-1.2 5.3-1.2 1.2 1 2.4 1.2 4.4 1.2l0.1-2.7c-1-0.1-1.4-0.5-1.5-1.5l0.2-7.7zm-3.6 3.7v4.4s-2.2 0.7-4.1 0.7c-1.4 0-2-0.9-2-2.4s0.8-2.2 2.3-2.3l3.8-0.4zm11.7 7.7v-12.8s1.8-0.9 3.7-0.9c2.5 0 2.9 1.6 2.9 4.9v8.8h3.6v-8.9c0-5.4-1.1-8-5.7-8-2.1 0-4.6 1.4-4.6 1.4v-1h-3.6v16.5h3.7zm26.6-11.4c0-3.8-1.7-5.5-5.7-5.5-3 0-6.6 0.9-6.6 0.9l0.1 2.5s4-0.3 6.2-0.3c1.6 0 2.4 0.6 2.4 2.4v1.2l-4.3 0.4c-3.5 0.3-5.5 1.5-5.5 5 0 3.4 1.7 5.3 4.9 5.3 2.7 0 5.3-1.2 5.3-1.2 1.2 1 2.4 1.2 4.4 1.2l0.1-2.7c-1-0.1-1.4-0.5-1.5-1.5l0.2-7.7zm-3.6 3.7v4.4s-2.2 0.7-4.1 0.7c-1.4 0-2-0.9-2-2.4s0.8-2.2 2.3-2.3l3.8-0.4z' fill-rule='nonzero'/%3E%3Cpath d='m0.75002 23.052c6.9088 0 13.402-2.3515 19.066 0.6639l20.184-23.716h-40v47l-1.9774e-14 -25.287c0.25047-0.0054307 0.49816-0.019007 0.75002-0.019007v1.3577z' opacity='.7'/%3E%3Cpath d='m3.9602e-14 44.578l-3.9602e-14 6.4223h40c-2.2378-11.667-9.8136-21.496-20.158-27l-19.842 20.578z' opacity='.7'/%3E%3Cpath d='m3.9035e-14 44.579l-3.9035e-14 6.4209h7.0209l18.979-22.652s-1.2608-1.0527-3.0476-2.2888c-1.3665-0.96307-3.3951-2.0593-3.3951-2.0593l-19.557 20.579z' opacity='.5'/%3E%3Cpath d='m0.75697 19c-0.2542 0-0.50418 0.013566-0.75697 0.018993v27.981l20-23.267c-5.7173-3.0131-12.27-4.7334-19.243-4.7334'/%3E%3C/g%3E%3C/svg%3E%0A");
// These numbers are very specific to the Kibana logo size
width: 92px;
@ -61,7 +60,7 @@
display: inline-block;
height: $euiSizeXXL;
position: absolute;
left: calc(100% + #{$euiSize}); // 1
left: calc(100% + #{$euiSize}); /* 1 */
top: 0px;
bottom: 0px;
white-space: nowrap;

4
src/core_plugins/kibana/public/dashboard/grid/_dashboard_grid.scss
View file

@ -71,6 +71,10 @@
*/
> .react-resizable-handle {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='6' height='6' viewBox='0 0 6 6'%3E%3Cpolygon fill='#{hexToRGB($euiColorDarkShade)}' points='6 6 0 6 0 4.2 4 4.2 4.2 4.2 4.2 0 6 0' /%3E%3C/svg%3E%0A");
&::after {
border: none;
}
}
/**

2
src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js
View file

@ -22,6 +22,8 @@ import PropTypes from 'prop-types';
import _ from 'lodash';
import ReactGridLayout from 'react-grid-layout';
import classNames from 'classnames';
import 'react-grid-layout/css/styles.css';
import 'react-resizable/css/styles.css';
import { PanelUtils } from '../panel/panel_utils';
import { DashboardViewMode } from '../dashboard_view_mode';

1
src/core_plugins/kibana/public/dashboard/index.js
View file

@ -19,7 +19,6 @@
import './dashboard_app';
import './saved_dashboard/saved_dashboards';
import './styles/index.less';
import './dashboard_config';
import uiRoutes from 'ui/routes';
import { toastNotifications } from 'ui/notify';

4
src/core_plugins/kibana/public/dashboard/styles/index.less
View file

@ -1,4 +0,0 @@
// SASSTODO: wait until bundler can inject file names into SASS
.dshExitFullScreenButton__logo {
background-image: url("~ui/images/kibana.svg");
}