Skip to content

Commit 3a19f29

Browse files
authored
Change devices and fix several bugs (#119)
1 parent 13f90e2 commit 3a19f29

File tree

117 files changed

+44
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+44
-79
lines changed

templates/react/application/src/components/header/header.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ export default ({ menuToggleEnabled, title, toggleMenu, userMenuItems }) => (
1313
location={'before'}
1414
widget={'dxButton'}
1515
cssClass={'menu-button'}
16-
options={{
17-
icon: 'menu',
18-
stylingMode: 'text',
19-
onClick: toggleMenu
20-
}}
21-
/>
16+
>
17+
<Button icon="menu" stylingMode="text" onClick={toggleMenu} />
18+
</Item>
2219
<Item
2320
location={'before'}
2421
cssClass={'header-title'}

templates/react/application/src/components/user-panel/user-panel.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
.user-panel {
3737
.dx-list-item .dx-icon {
3838
vertical-align: middle;
39-
color: rgba(0, 0, 0, 0.87);
39+
color: $base-text-color;
4040
margin-right: 16px;
4141
}
4242
.dx-rtl .dx-list-item .dx-icon {

templates/react/application/src/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import Button from 'devextreme-react/button';
12
import Drawer from 'devextreme-react/drawer';
23
import ScrollView from 'devextreme-react/scroll-view';
34
import Toolbar, { Item } from 'devextreme-react/toolbar';
@@ -76,17 +77,16 @@ class SideNavInnerToolbar extends React.Component {
7677
onMenuReady={this.menuPatch.onReady}
7778
>
7879
<Toolbar id={'navigation-header'}>
79-
<Item
80-
location={'before'}
81-
cssClass={'menu-button'}
82-
widget={'dxButton'}
83-
visible={minMenuSize !== 0}
84-
options={{
85-
icon: 'menu',
86-
stylingMode: 'text',
87-
onClick: this.toggleMenu
88-
}}
89-
/>
80+
{
81+
minMenuSize !== 0 &&
82+
<Item
83+
location={'before'}
84+
cssClass={'menu-button'}
85+
widget={'dxButton'}
86+
>
87+
<Button icon="menu" stylingMode="text" onClick={this.toggleMenu} />
88+
</Item>
89+
}
9090
<Item location={'before'} cssClass={'header-title'} text={title} />
9191
</Toolbar>
9292
</SideNavigationMenu>

templates/vue/application/src/components/user-panel.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export default {
8989
.user-panel {
9090
.dx-list-item .dx-icon {
9191
vertical-align: middle;
92-
color: rgba(0, 0, 0, 0.87);
92+
color: $base-text-color;
9393
margin-right: 16px;
9494
}
9595
.dx-rtl .dx-list-item .dx-icon {

templates/vue/application/src/layouts/side-nav-inner-toolbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
>
3333
<!-- eslint-enable-->
3434
<dx-toolbar id="navigation-header">
35-
<dx-item location="before" css-class="menu-button">
35+
<dx-item v-if="!isXSmall" location="before" css-class="menu-button">
3636
<!-- eslint-disable vue/no-unused-vars -->
3737
<dx-button
3838
icon="menu"

0 commit comments

Comments
 (0)