Skip to content

Commit 1edd255

Browse files
committed
Merge pull request neo4j#2879 from wallin/browser_cleanup
Browser cleanup
2 parents a640ebb + 2775ef5 commit 1edd255

File tree

10 files changed

+42
-18
lines changed

10 files changed

+42
-18
lines changed

community/browser/app/content/guides/movie-graph.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ article.guide
2929
li Notice it gets copied to the editor above ↑
3030
li Click the editor's play button to exectute
3131
li Wait for the query to finish
32-
p.text-center.text-warning WARNING: This adds data to the current database, each time it is run!
32+
p.text-center.text-warning.bg-warning WARNING: This adds data to the current database, each time it is run!
3333
hr
3434
p
3535
small :help
@@ -661,7 +661,7 @@ article.guide
661661
ol
662662
li Nodes can't be deleted if relationships exist
663663
li Delete both nodes and relationships together
664-
p.text-center.text-warning WARNING: This will remove all Person and Movie nodes!
664+
p.text-center.text-warning.bg-warning WARNING: This will remove all Person and Movie nodes!
665665
hr
666666
p
667667
small :help

community/browser/app/content/guides/network-graph.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ article.guide
2626
li Notice it gets copied to the editor above ↑
2727
li Click the editor's play button to exectute
2828
li Wait for the query to finish
29-
p.text-center.text-warning WARNING: This adds data to the current database, each time it is run!
29+
p.text-center.text-warning.bg-warning WARNING: This adds data to the current database, each time it is run!
3030
hr
3131
p
3232
small :help
@@ -280,7 +280,7 @@ article.guide
280280
ol
281281
li Nodes can't be deleted if relationships exist
282282
li Delete both nodes and relationships together
283-
p.text-center.text-warning WARNING: This will remove all Person and Movie nodes!
283+
p.text-center.text-warning.bg-warning WARNING: This will remove all Person and Movie nodes!
284284
hr
285285
p
286286
small :help

community/browser/app/content/help/create.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
article.help
2-
.container
2+
.container-fluid
33
section.row-fluid.summary
44
.summary.col-sm-3
55
h3 CREATE

community/browser/app/scripts/controllers/D3Graph.coffee

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ angular.module('neo4jApp.controllers')
120120
toggleSelection(null)
121121
onCanvasClicked()
122122
)
123+
.on('updated', ->
124+
$rootScope.$broadcast 'graph:changed', graph
125+
)
123126

124127
graphView.resize()
125128
$rootScope.$broadcast 'graph:changed', graph

community/browser/app/styles/help.styl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
padding: 0 4px
2222
p
2323
font-size: 15px
24-
line-height: 23px
24+
line-height: 1.428
2525
color: #666
2626
h1, h2, h3, h4, h5, dt
2727
background none
@@ -49,6 +49,7 @@
4949
pre.code
5050
background: #F3F3F3
5151
cursor: pointer
52+
border: 1px solid #E1E1E8
5253
&:hover
5354
background: lighten(color-link, 80%)
5455
//outline: 2px solid color-link
@@ -58,16 +59,23 @@
5859
font-size 12pt
5960
h1 span
6061
display block
62+
ul, ol
63+
padding-left: 25px
64+
line-height: 1.428
6165
ul
6266
list-style: disc
6367
margin-top: 8px
6468
ul.list-unstyled
6569
list-style: none
6670

6771
ul.big, ol.big
72+
padding-left: 40px
6873
font-size: 18px
6974
li
7075
line-height: 28px
7176
ul.undecorated
77+
padding: 0
7278
list-style: none
7379

80+
.bg-warning
81+
padding: 10px

community/browser/app/styles/inspector.styl

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,37 @@
55

66
.inspector-footer
77
// background-color: #EEF1F8
8-
font-size: 10px
8+
font-size: 12px
99
// width: 100%
1010
.inspector-footer-row > ul
1111
// min-height: 28px
1212
// padding: 5px 9px 5px 10px
1313
li
1414
vertical-align: middle
1515
li.pair
16-
font-size: 10px
16+
font-size: 12px
1717
.key
1818
float: left
1919
color: darken(inspector-font-color, 30%)
2020
.value
2121
padding-left: 3px
2222
overflow: hidden
23+
float: left
2324

2425
.class-name
25-
font-size: 10px
26+
font-size: 12px
2627

2728
.inspector-icon
2829
.fa
2930
margin-right: 5px
3031
margin-left: 3px
3132

32-
.colors, .node-sizes, .arrow-widths
33+
.colors, .node-sizes, .arrow-widths, .attributes
3334
ul.list-inline > li
3435
padding-left: 1px
36+
line-height: 0
37+
.colors, .node-sizes, .arrow-widths
38+
li
3539
a
3640
background-color: #aaa
3741
display: inline-block;
@@ -48,7 +52,7 @@
4852
user-select: none
4953
display: inline-block
5054
padding: 1px 6px
51-
font-size: 10px
55+
font-size: 12px
5256
line-height: 12px
5357
color: #9195A0;
5458
border: 1px solid #9195A0;

community/browser/app/styles/legend.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
.legend
66
background-color: #EEF1F8
7-
border-bottom: 1px solid #DFE5F0
7+
display: table-row
88

99
.label
1010
user-select: none

community/browser/app/styles/main.styl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ svg
4242
display: block
4343
width: 100%
4444
overflow: hidden
45+
border-top: 1px solid #dfe5f0
46+
border-bottom: 1px solid #e7e9eb
4547

4648
[play-topic], [help-topic], a[target]
4749
&:before
@@ -107,13 +109,12 @@ table.json-object
107109
height: middlebar-height
108110
line-height: middlebar-height
109111
color: rgb(120, 129, 133)
110-
border-top: 1px solid #E7E9EB
111-
padding-left: horizontal-padding
112112
font-size: 13px
113113
position: relative
114114
background-color: #FFF
115115
.status
116116
float: left
117+
padding-left: horizontal-padding
117118
[class*="fa-"]
118119
margin-right: 6px
119120

@@ -162,8 +163,6 @@ table.json-object
162163
.result
163164
background-color: #F8F9FB
164165
.status-bar
165-
absolute: bottom 0
166-
width: 100%
167166
.btn-group
168167
absolute: bottom 0 right 32px
169168
.view-result
@@ -174,12 +173,16 @@ table.json-object
174173
position: absolute
175174
overflow-y: scroll
176175
.view-result-graph
176+
display: table
177+
width: 100%
177178
height: 100%
179+
> *
180+
display: table-row
178181
svg
179182
height: 100%
180183
.graph-contents
181-
height: 100%
182184
position: relative
185+
height: 100%
183186
.legend
184187
max-height: none;
185188

@@ -315,7 +318,6 @@ select
315318
position: absolute
316319
right: 0
317320
text-align: center
318-
text-shadow: 0 2px 0px #E7E9EB
319321

320322
.update-button
321323
position:absolute

community/browser/app/styles/stream.styl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747

4848
.view-result-graph
4949
background-color: #F9FBFD
50+
display: table
51+
width: 100%
52+
height: 100%
53+
> *
54+
display: table-row
5055
svg
5156
height: 400px
5257
width: 100%
@@ -57,6 +62,7 @@
5762
.graph-contents
5863
position: relative
5964
overflow: hidden
65+
height: 100%
6066

6167
.view-result-table
6268
border-top: 1px solid #fff

community/browser/lib/visualization/components/visualization.coffee

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ neo.viz = (el, measureSize, graph, layout, style) ->
9393

9494
force.update(graph, [layoutDimension, layoutDimension])
9595
viz.resize()
96+
viz.trigger('updated')
9697

9798
viz.resize = ->
9899
size = measureSize()

0 commit comments

Comments
 (0)