Skip to content

Commit 96b0344

Browse files
TreeView ContextMenu Integration demo: add requested changes after designer review (DevExpress#30295)
1 parent 4da4561 commit 96b0344

File tree

12 files changed

+51
-45
lines changed

12 files changed

+51
-45
lines changed

apps/demos/Demos/TreeView/ContextMenuIntegration/Angular/app/app.component.css

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@
1111
::ng-deep .log-container {
1212
padding: 20px;
1313
margin-left: 20px;
14-
font-size: 115%;
15-
font-weight: bold;
14+
font-weight: 600;
1615
background-color: rgba(191, 191, 191, 0.15);
17-
height: 100%;
1816
}
1917

20-
::ng-deep .log-container .dx-icon-clock {
21-
position: relative;
22-
top: 1px;
18+
::ng-deep .log-container > div:first-child {
19+
display: flex;
20+
align-items: center;
21+
margin-bottom: 10px;
2322
}
2423

25-
::ng-deep #log {
26-
margin-top: 10px;
24+
::ng-deep .log-container .dx-icon-clock {
25+
font-size: var(--dx-font-size-icon);
2726
}
2827

2928
::ng-deep #log .dx-empty-message {

apps/demos/Demos/TreeView/ContextMenuIntegration/Angular/app/app.component.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
</dx-tree-view>
1010

1111
<div class="log-container">
12-
<div><i class="icon dx-icon-clock"></i>&nbsp;Operations log:</div>
12+
<div>
13+
<i class="icon dx-icon-clock"></i>
14+
<span>&nbsp;Operations log:</span>
15+
</div>
1316
<dx-list
1417
id="log"
1518
[width]="400"

apps/demos/Demos/TreeView/ContextMenuIntegration/React/App.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ const App = () => {
7070
/>
7171
<div className="log-container">
7272
<div>
73-
<i className="icon dx-icon-clock"></i>&nbsp;Operations log:
73+
<i className="icon dx-icon-clock"></i>
74+
<span>&nbsp;Operations log:</span>
7475
</div>
7576
<List
7677
id="log"

apps/demos/Demos/TreeView/ContextMenuIntegration/React/styles.css

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@
1111
.log-container {
1212
padding: 20px;
1313
margin-left: 20px;
14-
font-size: 115%;
15-
font-weight: bold;
14+
font-weight: 600;
1615
background-color: rgba(191, 191, 191, 0.15);
17-
height: 100%;
1816
}
1917

20-
.log-container .dx-icon-clock {
21-
position: relative;
22-
top: 1px;
18+
.log-container > div:first-child {
19+
display: flex;
20+
align-items: center;
21+
margin-bottom: 10px;
2322
}
2423

25-
#log {
26-
margin-top: 10px;
24+
.log-container .dx-icon-clock {
25+
font-size: var(--dx-font-size-icon);
2726
}
2827

2928
#log .dx-empty-message {

apps/demos/Demos/TreeView/ContextMenuIntegration/ReactJs/App.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ const App = () => {
6363
/>
6464
<div className="log-container">
6565
<div>
66-
<i className="icon dx-icon-clock"></i>&nbsp;Operations log:
66+
<i className="icon dx-icon-clock"></i>
67+
<span>&nbsp;Operations log:</span>
6768
</div>
6869
<List
6970
id="log"

apps/demos/Demos/TreeView/ContextMenuIntegration/ReactJs/styles.css

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@
1111
.log-container {
1212
padding: 20px;
1313
margin-left: 20px;
14-
font-size: 115%;
15-
font-weight: bold;
14+
font-weight: 600;
1615
background-color: rgba(191, 191, 191, 0.15);
17-
height: 100%;
1816
}
1917

20-
.log-container .dx-icon-clock {
21-
position: relative;
22-
top: 1px;
18+
.log-container > div:first-child {
19+
display: flex;
20+
align-items: center;
21+
margin-bottom: 10px;
2322
}
2423

25-
#log {
26-
margin-top: 10px;
24+
.log-container .dx-icon-clock {
25+
font-size: var(--dx-font-size-icon);
2726
}
2827

2928
#log .dx-empty-message {

apps/demos/Demos/TreeView/ContextMenuIntegration/Vue/App.vue

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
@item-context-menu="treeViewItemContextMenu"
1010
/>
1111
<div class="log-container">
12-
<div><i class="icon dx-icon-clock"/>&nbsp;Operations log:</div>
12+
<div>
13+
<i class="icon dx-icon-clock"/>
14+
<span>&nbsp;Operations log:</span>
15+
</div>
1316
<DxList
1417
id="log"
1518
show-scrollbar="always"
@@ -97,19 +100,18 @@ function contextMenuItemClick(e) {
97100
padding: 20px;
98101
margin-left: 20px;
99102
background-color: rgba(191, 191, 191, 0.15);
100-
font-size: 115%;
101-
font-weight: bold;
103+
font-weight: 600;
102104
position: relative;
103-
height: 100%;
104105
}
105106
106-
.log-container .dx-icon-clock {
107-
position: relative;
108-
top: 1px;
107+
.log-container > div:first-child {
108+
display: flex;
109+
align-items: center;
110+
margin-bottom: 10px;
109111
}
110112
111-
#log {
112-
margin-top: 10px;
113+
.log-container .dx-icon-clock {
114+
font-size: var(--dx-font-size-icon);
113115
}
114116
115117
#log .dx-empty-message {

apps/demos/Demos/TreeView/ContextMenuIntegration/jQuery/index.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
<div class="form">
1818
<div id="treeview"></div>
1919
<div class="log-container">
20-
<div><i class="icon dx-icon-clock"></i>&nbsp;Operations log:</div>
20+
<div>
21+
<i class="icon dx-icon-clock"></i>
22+
<span>&nbsp;Operations log:</span>
23+
</div>
2124
<div id="log"></div>
2225
</div>
2326
<div id="contextMenu"></div>

apps/demos/Demos/TreeView/ContextMenuIntegration/jQuery/styles.css

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@
1111
.log-container {
1212
padding: 20px;
1313
margin-left: 20px;
14-
font-size: 115%;
15-
font-weight: bold;
14+
font-weight: 600;
1615
background-color: rgba(191, 191, 191, 0.15);
17-
height: 100%;
1816
}
1917

20-
.log-container .dx-icon-clock {
21-
position: relative;
22-
top: 1px;
18+
.log-container > div:first-child {
19+
display: inline-flex;
20+
align-items: center;
21+
margin-bottom: 10px;
2322
}
2423

25-
#log {
26-
margin-top: 10px;
24+
.log-container .dx-icon-clock {
25+
font-size: var(--dx-font-size-icon);
2726
}
2827

2928
#log .dx-empty-message {
-90 Bytes
Loading

0 commit comments

Comments
 (0)