dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Layout improvements.

Browse Source
This commit is contained in:
Igor Kulikov 2017-10-24 11:48:37 +03:00
parent c66b06b8f7
commit d623a0ee64
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/src/app/components/details-sidenav.scss
View File

@ -45,15 +45,12 @@ md-sidenav.tb-sidenav-details {
width: 100% !important; width: 100% !important;
max-width: 100% !important; max-width: 100% !important;
z-index: 59 !important; z-index: 59 !important;
@media (min-width: $layout-breakpoint-sm) { @media (min-width: $layout-breakpoint-gt-sm) {
width: 80% !important; width: 80% !important;
} }
@media (min-width: $layout-breakpoint-md) { @media (min-width: $layout-breakpoint-gt-md) {
width: 65% !important; width: 65% !important;
} }
@media (min-width: $layout-breakpoint-lg) {
width: 45% !important;
}
tb-dashboard { tb-dashboard {
md-content { md-content {
background-color: $primary-hue-3; background-color: $primary-hue-3;

2
ui/src/app/components/react/json-form-ace-editor.jsx
View File

@ -120,7 +120,7 @@ class ThingsboardAceEditor extends React.Component {
name={this.props.form.title} name={this.props.form.title}
value={this.state.value} value={this.state.value}
readOnly={this.props.form.readonly} readOnly={this.props.form.readonly}
editorProps={{$blockScrolling: true}} editorProps={{$blockScrolling: Infinity}}
enableBasicAutocompletion={true} enableBasicAutocompletion={true}
enableSnippets={true} enableSnippets={true}
enableLiveAutocompletion={true} enableLiveAutocompletion={true}

6
ui/src/scss/constants.scss
View File

@ -37,3 +37,9 @@ $layout-breakpoint-sm: 960px !default;
$layout-breakpoint-md: 1280px !default; $layout-breakpoint-md: 1280px !default;
$layout-breakpoint-xmd: 1600px !default; $layout-breakpoint-xmd: 1600px !default;
$layout-breakpoint-lg: 1920px !default; $layout-breakpoint-lg: 1920px !default;
$layout-breakpoint-gt-xs: 601px !default;
$layout-breakpoint-gt-sm: 961px !default;
$layout-breakpoint-gt-md: 1281px !default;
$layout-breakpoint-gt-xmd: 1601px !default;
$layout-breakpoint-gt-lg: 1921px !default;