Skip to content

Commit ae9a098

Browse files
authored
Merge branch 'master' into feature/use-flexbox-for-nodes-list
2 parents df6381c + ae26884 commit ae9a098

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"chai": "^3.2.0",
2626
"copyfiles": "^0.2.1",
2727
"css-loader": "^0.16.0",
28-
"eslint": "^1.2.1",
28+
"eslint": "^6.8.0",
2929
"eslint-loader": "^1.0.0",
3030
"eslint-plugin-react": "^3.3.0",
3131
"file-loader": "^0.8.4",

src/vis-physical/styles.less

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
display: flex;
9999
flex-direction: column;
100100
justify-content: space-between;
101-
width: 200px;
102101
margin-bottom: 20px;
103102
margin-right: 10px;
104103
&:last-child{
@@ -133,7 +132,7 @@
133132
.node-content{
134133
padding: 0 10px;
135134
display: flex;
136-
flex-direction: column-reverse;
135+
flex-wrap: wrap;
137136
background: @gray-darkerr;
138137
border: 2px solid lighten(@gray-darker,8%);
139138
min-height: 500px;
@@ -145,6 +144,7 @@
145144

146145
.container {
147146
//height: 152px;
147+
width: 200px;
148148
margin-bottom: 5px;
149149
margin-top: 5px;
150150
border-radius: 3px;
@@ -189,10 +189,11 @@
189189
background: @gray-darker;
190190
border: 2px solid lighten(@gray-darker,8%);
191191
padding: 15px;
192+
display: flex;
192193
.clear();
193194
}
194195
.node-cluster-content:empty {
195-
display: none;
196+
display: none;
196197
}
197198

198199
.node-cluster-meta{

0 commit comments

Comments
 (0)