Skip to content

Commit

Permalink
Merge branch 'dev' of lhausermann/the-graph
Browse files Browse the repository at this point in the history
  • Loading branch information
@forresto
forresto committed Jan 20, 2015
2 parents 70885fe + 6cedd5d commit 6075888
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 105 deletions.
2 changes: 2 additions & 0 deletions the-graph/the-graph.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
selectedNodesHash[this.selectedNodes[i].id] = true;
}
this.selectedNodesHash = selectedNodesHash;
this.fire('nodes', this.selectedNodes);
},
selectedNodesHashChanged: function () {
if (!this.graphView) { return; }
Expand All @@ -177,6 +178,7 @@
selectedEdgesChanged: function () {
if (!this.graphView) { return; }
this.graphView.setSelectedEdges(this.selectedEdges);
this.fire('edges', this.selectedEdges);
},
animatedEdgesChanged: function () {
if (!this.graphView) { return; }
Expand Down
1 change: 1 addition & 0 deletions the-graph/the-graph.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@
html = html +'/>';

return React.DOM.g({
className: this.props.className,
dangerouslySetInnerHTML:{__html: html}
});
}
Expand Down
50 changes: 25 additions & 25 deletions themes/default/the-graph.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,42 +206,42 @@ path {
/* marching ants for animated edges */

@-webkit-keyframes heartbeats {
0% { stroke-width: (var-edge-width * 4); }
10% { stroke-width: (var-edge-width * 6); }
30% { stroke-width: (var-edge-width * 4); }
40% { stroke-width: (var-edge-width * 6); }
60% { stroke-width: (var-edge-width * 4); }
0% { stroke-width: (var-edge-width * 2); }
10% { stroke-width: (var-edge-width * 4); }
30% { stroke-width: (var-edge-width * 2); }
40% { stroke-width: (var-edge-width * 4); }
60% { stroke-width: (var-edge-width * 2); }
}
@-moz-keyframes heartbeats {
0% { stroke-width: (var-edge-width * 4); }
10% { stroke-width: (var-edge-width * 6); }
30% { stroke-width: (var-edge-width * 4); }
40% { stroke-width: (var-edge-width * 6); }
60% { stroke-width: (var-edge-width * 4); }
0% { stroke-width: (var-edge-width * 2); }
10% { stroke-width: (var-edge-width * 4); }
30% { stroke-width: (var-edge-width * 2); }
40% { stroke-width: (var-edge-width * 4); }
60% { stroke-width: (var-edge-width * 2); }
}
@-o-keyframes heartbeats {
0% { stroke-width: (var-edge-width * 4); }
10% { stroke-width: (var-edge-width * 6); }
30% { stroke-width: (var-edge-width * 4); }
40% { stroke-width: (var-edge-width * 6); }
60% { stroke-width: (var-edge-width * 4); }
0% { stroke-width: (var-edge-width * 2); }
10% { stroke-width: (var-edge-width * 4); }
30% { stroke-width: (var-edge-width * 2); }
40% { stroke-width: (var-edge-width * 4); }
60% { stroke-width: (var-edge-width * 2); }
}
@keyframes heartbeats {
0% { stroke-width: (var-edge-width * 4); }
10% { stroke-width: (var-edge-width * 6); }
30% { stroke-width: (var-edge-width * 4); }
40% { stroke-width: (var-edge-width * 6); }
60% { stroke-width: (var-edge-width * 4); }
0% { stroke-width: (var-edge-width * 2); }
10% { stroke-width: (var-edge-width * 4); }
30% { stroke-width: (var-edge-width * 2); }
40% { stroke-width: (var-edge-width * 4); }
60% { stroke-width: (var-edge-width * 2); }
}
.edge.animated .edge-bg {
stroke-linecap: round;
stroke-width: (var-edge-width * 4);
stroke-width: (var-edge-width * 2);
stroke: var-selection-box-border;

-webkit-animation: heartbeats 1s linear infinite;
-moz-animation: heartbeats 1s linear infinite;
-o-animation: heartbeats 1s linear infinite;
animation: heartbeats 1s linear infinite;
-webkit-animation: heartbeats 4s linear infinite;
-moz-animation: heartbeats 4s linear infinite;
-o-animation: heartbeats 4s linear infinite;
animation: heartbeats 4s linear infinite;
}


Expand Down
80 changes: 40 additions & 40 deletions themes/the-graph-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,63 +182,63 @@
}
@-webkit-keyframes heartbeats {
0% {
stroke-width: 12px;
stroke-width: 6px;
}
10% {
stroke-width: 18px;
stroke-width: 12px;
}
30% {
stroke-width: 12px;
stroke-width: 6px;
}
40% {
stroke-width: 18px;
stroke-width: 12px;
}
60% {
stroke-width: 12px;
stroke-width: 6px;
}
}
@-moz-keyframes heartbeats {
0% {
stroke-width: 12px;
stroke-width: 6px;
}
10% {
stroke-width: 18px;
stroke-width: 12px;
}
30% {
stroke-width: 12px;
stroke-width: 6px;
}
40% {
stroke-width: 18px;
stroke-width: 12px;
}
60% {
stroke-width: 12px;
stroke-width: 6px;
}
}
@-o-keyframes heartbeats {
0% {
stroke-width: 12px;
stroke-width: 6px;
}
10% {
stroke-width: 18px;
stroke-width: 12px;
}
30% {
stroke-width: 12px;
stroke-width: 6px;
}
40% {
stroke-width: 18px;
stroke-width: 12px;
}
60% {
stroke-width: 12px;
stroke-width: 6px;
}
}
.the-graph-dark .edge.animated .edge-bg {
stroke-linecap: round;
stroke-width: 12px;
stroke-width: 6px;
stroke: #e6e6e6;
-webkit-animation: heartbeats 1s linear infinite;
-moz-animation: heartbeats 1s linear infinite;
-o-animation: heartbeats 1s linear infinite;
animation: heartbeats 1s linear infinite;
-webkit-animation: heartbeats 4s linear infinite;
-moz-animation: heartbeats 4s linear infinite;
-o-animation: heartbeats 4s linear infinite;
animation: heartbeats 4s linear infinite;
}
.the-graph-dark text {
font-family: "SourceCodePro", "Source Code Pro", Helvetica, Arial, sans-serif;
Expand Down Expand Up @@ -723,69 +723,69 @@
}
@-moz-keyframes heartbeats {
0% {
stroke-width: 12px;
stroke-width: 6px;
}
10% {
stroke-width: 18px;
stroke-width: 12px;
}
30% {
stroke-width: 12px;
stroke-width: 6px;
}
40% {
stroke-width: 18px;
stroke-width: 12px;
}
60% {
stroke-width: 12px;
stroke-width: 6px;
}
}
@-webkit-keyframes heartbeats {
0% {
stroke-width: 12px;
stroke-width: 6px;
}
10% {
stroke-width: 18px;
stroke-width: 12px;
}
30% {
stroke-width: 12px;
stroke-width: 6px;
}
40% {
stroke-width: 18px;
stroke-width: 12px;
}
60% {
stroke-width: 12px;
stroke-width: 6px;
}
}
@-o-keyframes heartbeats {
0% {
stroke-width: 12px;
stroke-width: 6px;
}
10% {
stroke-width: 18px;
stroke-width: 12px;
}
30% {
stroke-width: 12px;
stroke-width: 6px;
}
40% {
stroke-width: 18px;
stroke-width: 12px;
}
60% {
stroke-width: 12px;
stroke-width: 6px;
}
}
@keyframes heartbeats {
0% {
stroke-width: 12px;
stroke-width: 6px;
}
10% {
stroke-width: 18px;
stroke-width: 12px;
}
30% {
stroke-width: 12px;
stroke-width: 6px;
}
40% {
stroke-width: 18px;
stroke-width: 12px;
}
60% {
stroke-width: 12px;
stroke-width: 6px;
}
}
Loading

0 comments on commit 6075888

Please sign in to comment.