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

UI: Minor fixes.

Browse Source
This commit is contained in:
Igor Kulikov 2017-10-26 18:19:44 +03:00
parent f7ec6f15bd
commit c0bf3e72ef
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/app/components/menu-link.tpl.html
View File

@ -17,6 +17,6 @@
--> -->
<md-button <md-button
ui-sref-active-eq="tb-active" ui-sref="{{section.state}}"> ui-sref-active-eq="tb-active" ui-sref="{{section.state}}">
<md-icon ng-show="{{section.icon != null}}" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon> <md-icon ng-show="section.icon != null" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon>
{{section.name | translate}} {{section.name | translate}}
</md-button> </md-button>

4
ui/src/app/components/menu-toggle.tpl.html
View File

@ -20,8 +20,8 @@
class="md-button-toggle" class="md-button-toggle"
aria-controls="docs-menu-{{section.name | nospace}}" layout="row" aria-controls="docs-menu-{{section.name | nospace}}" layout="row"
aria-expanded="{{sectionActive()}}"> aria-expanded="{{sectionActive()}}">
<md-icon ng-show="{{section.icon != null}}" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon> <md-icon ng-show="section.icon != null" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon>
{{section.name | translate}} <span flex>{{section.name | translate}}</span>
<span aria-hidden="true" <span aria-hidden="true"
class=" pull-right fa fa-chevron-down md-toggle-icon" class=" pull-right fa fa-chevron-down md-toggle-icon"
ng-class="{'tb-toggled' : sectionActive()}"></span> ng-class="{'tb-toggled' : sectionActive()}"></span>

12
ui/src/app/components/side-menu.scss
View File

@ -55,7 +55,7 @@
} }
.tb-side-menu .md-button { .tb-side-menu .md-button {
display: block; display: flex;
border-radius: 0; border-radius: 0;
color: inherit; color: inherit;
cursor: pointer; cursor: pointer;
@ -66,8 +66,14 @@
padding: 0px 16px; padding: 0px 16px;
text-align: left; text-align: left;
text-decoration: none; text-decoration: none;
white-space: normal; white-space: nowrap;
text-overflow: ellipsis;
width: 100%; width: 100%;
span {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
} }
.tb-side-menu tb-menu-link span.md-toggle-icon { .tb-side-menu tb-menu-link span.md-toggle-icon {
@ -77,8 +83,10 @@
.tb-side-menu ng-md-icon { .tb-side-menu ng-md-icon {
margin-right: 8px; margin-right: 8px;
margin-left: 0px;
} }
.tb-side-menu md-icon { .tb-side-menu md-icon {
margin-right: 8px; margin-right: 8px;
margin-left: 0px;
} }

8
ui/src/scss/main.scss
View File

@ -274,6 +274,14 @@ pre.tb-highlight {
md-toolbar { md-toolbar {
z-index: 0; z-index: 0;
} }
md-toolbar.md-table-toolbar.md-default-theme:not(.md-menu-toolbar).md-default .md-button[disabled],
md-toolbar.md-table-toolbar:not(.md-menu-toolbar).md-default .md-button[disabled] {
color: rgba(0,0,0,0.38);
}
md-toolbar.md-default-theme:not(.md-menu-toolbar) .md-button[disabled] md-icon,
md-toolbar:not(.md-menu-toolbar) .md-button[disabled] md-icon {
color: rgba(0,0,0,.28);
}
span.no-data-found { span.no-data-found {
position: relative; position: relative;
height: calc(100% - 57px); height: calc(100% - 57px);