Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#156 fix splitter handle #157

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a3181dd
extend-graph-navigation - initial extension of graph/graphcontainer c…
Dec 22, 2018
c7ff270
extend-graph-navigation - fix merge conflict, need to get upstream ma…
Dec 26, 2018
232cf16
extend-graph-navigation - fix merge conflicts WRT upstream master
Dec 26, 2018
c298c24
extend-graph-navigation - add new entity related actions
Jan 2, 2019
ecdf7db
extend-graph-navigation - addl changes related to entity related redu…
Jan 2, 2019
b21dfe1
extend-graph-navigation - graph and graph container related changes
Jan 2, 2019
cedc7f3
extend-graph-navigation - updating tests so as to wrap GraphContainer…
Jan 2, 2019
ce55021
Merge branch 'master' into feature/extend-graph-navigation
Jan 2, 2019
b09ace2
extend-graph-navigation - adding use of splitter to graph container, …
Jan 2, 2019
8fbaf88
extend-graph-navigation - clean-up home component, re-center headers
Jan 2, 2019
e563cb2
Merge branch 'master' into feature/extend-graph-navigation
Jan 4, 2019
8a5f5c6
extend-graph-navigation - incorporating review feedback and some gene…
Jan 7, 2019
bc8206a
Merge branch 'feature/extend-graph-navigation' of https://github.com/…
Jan 7, 2019
2cf0085
Merge branch 'master' into feature/extend-graph-navigation
Jan 7, 2019
efc670b
extend-graph-navigation - merge fixes, updated alpha channel in logo …
Jan 7, 2019
4fca129
extend-graph-navigation - get recursive navigation working with entit…
Jan 8, 2019
e460a0f
extend-graph-navigation - fixing broken test cases which somehow stil…
Jan 8, 2019
8cdd591
Merge remote-tracking branch 'upstream/master'
Jan 11, 2019
b4ce614
fix-notifier-tests by changing from looking for an autogenerated CSS …
Jan 11, 2019
98f3b41
Merge branch 'master' into bug/fix-notifier-tests
Jan 11, 2019
d475805
Merge remote-tracking branch 'upstream/master'
Jan 11, 2019
03be1a9
Merge branch 'bug/fix-notifier-tests'
Jan 11, 2019
14f73c0
Merge remote-tracking branch 'upstream/master'
Feb 1, 2019
45ddbb5
Merge remote-tracking branch 'upstream/master'
Feb 6, 2019
9ba0f04
Merge remote-tracking branch 'upstream/master'
Feb 11, 2019
1ed65fd
Merge remote-tracking branch 'upstream/master'
Feb 13, 2019
a495ef2
Merge remote-tracking branch 'upstream/master'
Feb 15, 2019
bfa6e6f
Merge remote-tracking branch 'upstream/master'
Feb 21, 2019
b819f70
Merge remote-tracking branch 'upstream/master'
Feb 28, 2019
7d63d04
Merge remote-tracking branch 'upstream/master'
Mar 1, 2019
edfe9b4
Merge remote-tracking branch 'upstream/master'
Mar 20, 2019
6b51006
Merge remote-tracking branch 'upstream/master'
Mar 25, 2019
b4f4870
Merge remote-tracking branch 'upstream/master'
Mar 25, 2019
439b1bf
Merge remote-tracking branch 'upstream/master'
Mar 27, 2019
5649993
#153 - fix issue of incorrectly styled splitter handle
Mar 27, 2019
9717608
#156 - rather than using custom react-splitter-layout fork, upgrade t…
Apr 2, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"react-redux": "^5.1.1",
"react-router-dom": "^4.3.1",
"react-scripts": "2.1.8",
"react-splitter-layout": "^3.0.1",
"react-splitter-layout": "^4.0.0",
"react-test-renderer": "^16.6.3",
"redux": "^4.0.1",
"redux-mock-store": "^1.5.3",
Expand Down
2 changes: 1 addition & 1 deletion app/public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"sizes": "32x32 24x24 16x16",
"type": "image/x-icon"
}
],
Expand Down
1 change: 1 addition & 0 deletions app/src/components/graph/GraphContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { withRouter } from 'react-router-dom';
import { withStyles } from '@material-ui/core/styles';
import CircularProgress from '@material-ui/core/CircularProgress';
import SplitterLayout from 'react-splitter-layout';
import '../../shared/reactSplitterLayoutWithOverrides.css';

import "./Graph.css";
import Graph from './Graph';
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/home/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class Home extends React.Component {
</div>
<div className={classes.container}>
<TextField
label='Search string...'
label='Search string or QSL...'
className={classes.textField}
fullWidth
margin='normal'
Expand Down
6 changes: 0 additions & 6 deletions app/src/components/results/Results.css

This file was deleted.

3 changes: 1 addition & 2 deletions app/src/components/results/Results.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ import SearchIcon from '@material-ui/icons/Search';
import IconButton from '@material-ui/core/IconButton';
import InputAdornment from '@material-ui/core/InputAdornment';
import SplitterLayout from 'react-splitter-layout';
import '../../shared/reactSplitterLayoutWithOverrides.css';

import { ENTER_KEYCODE } from '../../config/appConfig';
import ResultList from './ResultList';
import EntityDetails from '../entityDetails/EntityDetails';
import * as queryActions from '../../actions/queryActions';
import { getQueryParam } from '../../utils/url';

import './Results.css';

const styles = theme => ({
progress: {
margin: theme.spacing.unit * 2
Expand Down
Binary file added app/src/shared/grabIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions app/src/shared/reactSplitterLayoutWithOverrides.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
.splitter-layout {
position: absolute;
display: flex;
flex-direction: row;
width: 100%;
height: 100%;
overflow: hidden;
}

.splitter-layout .layout-pane {
position: relative;
flex: 0 0 auto;
overflow: auto;
}

.splitter-layout .layout-pane.layout-pane-primary {
flex: 1 1 auto;
}

.splitter-layout > .layout-splitter {
flex: 0 0 auto;
width: 12px;
height: 100%;
cursor: col-resize;
background-color: #ccc;
background-image: url("grabIcon.png");
background-position: center;
background-repeat: no-repeat;
}

.splitter-layout .layout-splitter:hover {
background-color: #bbb;
}

.splitter-layout.layout-changing {
cursor: col-resize;
}

.splitter-layout.layout-changing > .layout-splitter {
background-color: #aaa;
}

.splitter-layout.splitter-layout-vertical {
flex-direction: column;
}

.splitter-layout.splitter-layout-vertical.layout-changing {
cursor: row-resize;
}

.splitter-layout.splitter-layout-vertical > .layout-splitter {
width: 100%;
height: 4px;
cursor: row-resize;
}
Loading