Browse Source

Rule chain UI: FF fixes

pull/725/head
Igor Kulikov 8 years ago
parent
commit
5cb21afe63
  1. 4
      ui/src/app/components/dashboard.tpl.html
  2. 16
      ui/src/app/rulechain/rulechain.scss
  3. 2
      ui/src/app/rulechain/rulechain.tpl.html

4
ui/src/app/components/dashboard.tpl.html

@ -122,9 +122,9 @@
<md-menu-content id="menu" width="4" ng-mouseleave="$mdCloseMousepointMenu()">
<md-menu-item ng-repeat ="item in vm.widgetContextMenuItems">
<md-button ng-disabled="!item.enabled" ng-click="item.action(vm.widgetContextMenuEvent, widget)">
<span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span>
<md-icon ng-if="item.icon" md-menu-align-target aria-label="{{ item.value | translate }}" class="material-icons">{{item.icon}}</md-icon>
<span translate>{{item.value}}</span>
<span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
</md-menu-content>
@ -137,9 +137,9 @@
<md-menu-content id="menu" width="4" ng-mouseleave="$mdCloseMousepointMenu()">
<md-menu-item ng-repeat ="item in vm.contextMenuItems">
<md-button ng-disabled="!item.enabled" ng-click="item.action(vm.contextMenuEvent)">
<span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span>
<md-icon ng-if="item.icon" md-menu-align-target aria-label="{{ item.value | translate }}" class="material-icons">{{item.icon}}</md-icon>
<span translate>{{item.value}}</span>
<span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
</md-menu-content>

16
ui/src/app/rulechain/rulechain.scss

@ -47,6 +47,7 @@
.md-toolbar-tools {
font-size: 14px;
padding: 0px 6px;
height: 48px;
.md-button.md-icon-button {
margin: 0px;
&.tb-small {
@ -114,8 +115,8 @@
font-size: 14px;
display: flex;
flex-direction: row;
height: 30px;
min-height: 30px;
height: 36px;
min-height: 36px;
&.tb-rulechain {
background-color: #aac7e4;
}
@ -139,6 +140,12 @@
min-width: 100%;
min-height: 100%;
outline: none;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.tb-rule-node, #tb-rule-chain-context-menu .tb-context-menu-header {
@ -164,8 +171,8 @@
flex-direction: row;
min-width: 150px;
max-width: 150px;
min-height: 28px;
max-height: 28px;
min-height: 32px;
max-height: 32px;
padding: 5px 10px;
border-radius: 5px;
background-color: #F15B26;
@ -173,6 +180,7 @@
color: #333;
border: solid 1px #777;
font-size: 12px;
line-height: 16px;
&.tb-rule-node-highlighted:not(.tb-rule-node-invalid) {
box-shadow: 0 0 10px 6px #51cbee;
.tb-node-title {

2
ui/src/app/rulechain/rulechain.tpl.html

@ -125,9 +125,9 @@
<md-divider ng-if="item.divider"></md-divider>
<md-menu-item ng-if="!item.divider">
<md-button ng-disabled="!item.enabled" ng-click="item.action(vm.contextMenuEvent)">
<span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span>
<md-icon ng-if="item.icon" md-menu-align-target aria-label="{{ item.value | translate }}" class="material-icons">{{item.icon}}</md-icon>
<span translate>{{item.value}}</span>
<span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
</div>

Loading…
Cancel
Save