Skip to content

Commit

Permalink
Merge pull request elastic#7 from miukimiu/graph-prototype
Browse files Browse the repository at this point in the history
Graph prototype more styles
  • Loading branch information
flash1293 authored Mar 10, 2020
2 parents dadae34 + 6622580 commit 7f238e7
Show file tree
Hide file tree
Showing 15 changed files with 1,418 additions and 783 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,6 @@ export class QueryStringInputUI extends Component<Props, State> {
<div role="search">
<div className="kuiLocalSearchAssistedInput">
<EuiFieldText
compressed
placeholder={
this.props.placeholder ||
i18n.translate('data.query.queryBar.searchInputPlaceholder', {
Expand Down
17 changes: 9 additions & 8 deletions x-pack/legacy/plugins/graph/public/angular/templates/_graph.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import 'src/legacy/ui/public/chrome/variables';
@import "src/legacy/ui/public/chrome/variables";
@import "@elastic/eui/src/components/header/variables";

@mixin gphSvgText() {
font-family: $euiFontFamily;
Expand All @@ -13,13 +14,13 @@
* 1. Calculated px values come from the open/closed state of the global nav sidebar
*/


#graphBasic {
display: flex;
flex-direction: column;
flex: 1;
overflow: hidden;
}
#graphBasic {
display: flex;
flex-direction: column;
height: calc(100vh - #{$euiHeaderChildSize});
width: 100%;
overflow: hidden;
}

.gphGraph__container {
display: flex;
Expand Down
74 changes: 38 additions & 36 deletions x-pack/legacy/plugins/graph/public/angular/templates/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<main id="graphBasic" ng-controller="graphuiPlugin" aria-labelledby="graphHeading">
<!-- Local nav. -->
<kbn-top-nav name="workspacesTopNav" config="topNavMenu">
</kbn-top-nav>
<kbn-top-nav name="workspacesTopNav" config="topNavMenu"> </kbn-top-nav>

<div class="gphGraph__menus" ng-show="menus.showInspect">
<div>
Expand All @@ -11,10 +10,7 @@
i18n-default-message="Inspect"
></div>

<div
class="list-group-item"
ng-if="(workspace !== null)"
>
<div class="list-group-item" ng-if="(workspace !== null)">
<small class="help-block">http://host:port/{{ selectedIndex.name }}/_graph/explore</small>
<ul class="nav nav-tabs">
<li ng-class="{active: spymode === 'request'}">
Expand Down Expand Up @@ -49,39 +45,45 @@
</div>
</div>

<div
graph-app
current-index-pattern="selectedIndex"
on-query-submit="submit"
index-pattern-provider="indexPatternProvider"
redux-store="reduxStore"
confirm-wipe-workspace="confirmWipeWorkspace"
is-loading="loading"
is-initialized="workspaceInitialized || savedWorkspace.id || (workspace && workspace.nodes.length > 0)"
initial-query="initialQuery"
plugin-data-start="pluginDataStart"
core-start="coreStart"
storage="storage"
no-index-patterns="noIndexPatterns"
client-workspace="workspace"
selected-nodes="workspace.selectedNodes"
notify-angular="notifyAngular"
></div>

<div class="gphGraph__container" id="GraphSvgContainer" ng-if="workspaceInitialized || savedWorkspace.id || (workspace && workspace.nodes.length > 0)">
<div class="gphGraph__workspace">
<div
class="gphVisualization"
graph-visualization
nodes="workspace.nodes"
edges="workspace.edges"
edge-click="clickEdge"
node-click="nodeClick"
max-doc-count="workspace.maxDocCount"
client-workspace="workspace"
class="gphGraph__workspace__inner"
graph-app
current-index-pattern="selectedIndex"
on-query-submit="submit"
index-pattern-provider="indexPatternProvider"
redux-store="reduxStore"
confirm-wipe-workspace="confirmWipeWorkspace"
is-loading="loading"
is-initialized="workspaceInitialized || savedWorkspace.id || (workspace && workspace.nodes.length > 0)"
initial-query="initialQuery"
plugin-data-start="pluginDataStart"
core-start="coreStart"
storage="storage"
no-index-patterns="noIndexPatterns"
client-workspace="workspace"
selected-nodes="workspace.selectedNodes"
notify-angular="notifyAngular"
></div>
</div>
<!--end svg container-->

<div
class="gphGraph__visContainer"
id="GraphSvgContainer"
ng-if="workspaceInitialized || savedWorkspace.id || (workspace && workspace.nodes.length > 0)"
>
<div
class="gphVisualization"
graph-visualization
nodes="workspace.nodes"
edges="workspace.edges"
edge-click="clickEdge"
node-click="nodeClick"
max-doc-count="workspace.maxDocCount"
client-workspace="workspace"
redux-store="reduxStore"
notify-angular="notifyAngular"
></div>
</div>
<!--end svg container-->
</div>
</main>
168 changes: 65 additions & 103 deletions x-pack/legacy/plugins/graph/public/components/_app.scss
Original file line number Diff line number Diff line change
@@ -1,129 +1,91 @@
.gphGraph__bar {
margin: 0px $euiSizeS $euiSizeS $euiSizeS;
}

.gphAddData {
position: absolute;
right: 0;
bottom: 0;
height: calc(100% - 116px);
background-color: $euiPageBackgroundColor;
width: $euiSizeXXL * 10;
border-top: 1px solid $euiBorderColor;
z-index: $euiZNavigation;
@import "@elastic/eui/src/components/header/variables";

&__body {
padding: $euiSize;
// variables
$sidebarWidth: $euiSizeXXL * 10;

.euiPanel {
margin-bottom: $euiSize;
}
.euiText {
margin-bottom: $euiSizeXS;
}
}
.gphGraph__workspace,
.gphGraph__workspace__inner {
position: relative;
flex-grow: 1;
display: flex;
flex-direction: column;
}

&__editNodeName + &__editNodeName {
margin-top: $euiSizeS;
}
.gphGraph__visContainer {
position: absolute;
top: 80px;
left: 0;
width: calc(100% - #{$sidebarWidth});
height: 100%;

&__prependIcon {
display: flex;
width: $euiSize * 2;
align-items: center;
justify-content: center;
background: $euiColorLightShade;
border-right: 1px solid $euiBorderColor;
.gphVisualization {
height: 100%;
}
}

&__circleIcon {
display: flex;
width: $euiSizeL;
height: $euiSizeL;
align-items: center;
justify-content: center;
border-radius: 50%;

.gphLegacyIcon {
margin-right: 0;
text-align: center;
display: inline-flex;
width: auto;
font-size: 12px;
}
}
.gphGraph__bar {
padding: 0px $euiSizeS $euiSizeS $euiSizeS;
border-bottom: 1px solid $euiBorderColor;
}

.gphAddData__header {
.gphGraph__mainWrapper {
flex-grow: 1;
display: flex;
border-bottom: 1px solid $euiBorderColor;
padding: $euiSize 0;

&__title {
flex: 1;
padding: 0 $euiSize;
}

&__title,
&__toggleIcon {
padding: 0 $euiSize;
}
flex-direction: column;
}

.gphGraph__openSidebar {
@include euiBottomShadowSmall;
position: absolute;
top: $euiSizeS;
right: $euiSizeXS;
background: $euiColorEmptyShade;
padding: $euiSizeXS;
}

.gphAddData__nodesArea {
.gphGraph__graphWrapper {
background-color: $euiColorEmptyShade;
position: relative;
padding: $euiSize $euiSizeS;
border: $euiBorderThin;
border-radius: $euiBorderRadius;
margin-top: $euiSizeS;
margin-bottom: $euiSize;
}

> span {
margin-right: $euiSizeXS;
.gphGraphSidebar {
background-color: $euiPageBackgroundColor;
width: $sidebarWidth;
border-left: 1px solid $euiBorderColor;
overflow: hidden;

&:last-of-type {
margin-right: 0
}
> * {
width: $sidebarWidth;
}

span + span {
margin-top: $euiSizeXS;
&__header {
display: flex;
border-bottom: 1px solid $euiBorderColor;
padding: $euiSize 0;
}
&__title {
flex: 1;
padding: 0 $euiSize;
}

&:hover,
&:focus {
.gphAddData__nodesArea__delete {
visibility: visible;
opacity: 1;
}
&__title,
&__toggleIcon {
padding: 0 $euiSize;
}

&__delete {
@include euiBottomShadowSmall;
position: absolute;
top: 50%;
right: 0;
margin-right: -$euiSizeS;
margin-top: -$euiSizeM;
background: $euiColorEmptyShade;
padding: $euiSizeXS;
visibility: hidden;
opacity: 0;
&__body {
@include euiScrollBar;
padding-bottom: 0; /* 1 */
flex-grow: 1;
flex-basis: 1px; /* Fixes scrolling for Firefox */
overflow-y: auto;
}
}

.gphAddData__nodesAddList {
box-sizing: border-box;
&__bodyOverflow {
padding: $euiSize;

.gphAddData__circleIcon {
margin-right: $euiSizeS;
> *:last-child {
margin-bottom: $euiSize; /* 1 */
}
}
}

.gphGraph__openSidebar {
@include euiBottomShadowSmall;
background: $euiColorEmptyShade;
padding: $euiSizeXS;
}

1 change: 1 addition & 0 deletions x-pack/legacy/plugins/graph/public/components/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
@import './settings/index';
@import './legacy_icon/index';
@import './field_manager/index';
@import './add_data/index';
Loading

0 comments on commit 7f238e7

Please sign in to comment.