Showing
3 changed files
with
15 additions
and
7 deletions
... | ... | @@ -122,9 +122,9 @@ |
122 | 122 | <md-menu-content id="menu" width="4" ng-mouseleave="$mdCloseMousepointMenu()"> |
123 | 123 | <md-menu-item ng-repeat ="item in vm.widgetContextMenuItems"> |
124 | 124 | <md-button ng-disabled="!item.enabled" ng-click="item.action(vm.widgetContextMenuEvent, widget)"> |
125 | + <span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span> | |
125 | 126 | <md-icon ng-if="item.icon" md-menu-align-target aria-label="{{ item.value | translate }}" class="material-icons">{{item.icon}}</md-icon> |
126 | 127 | <span translate>{{item.value}}</span> |
127 | - <span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span> | |
128 | 128 | </md-button> |
129 | 129 | </md-menu-item> |
130 | 130 | </md-menu-content> |
... | ... | @@ -137,9 +137,9 @@ |
137 | 137 | <md-menu-content id="menu" width="4" ng-mouseleave="$mdCloseMousepointMenu()"> |
138 | 138 | <md-menu-item ng-repeat ="item in vm.contextMenuItems"> |
139 | 139 | <md-button ng-disabled="!item.enabled" ng-click="item.action(vm.contextMenuEvent)"> |
140 | + <span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span> | |
140 | 141 | <md-icon ng-if="item.icon" md-menu-align-target aria-label="{{ item.value | translate }}" class="material-icons">{{item.icon}}</md-icon> |
141 | 142 | <span translate>{{item.value}}</span> |
142 | - <span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span> | |
143 | 143 | </md-button> |
144 | 144 | </md-menu-item> |
145 | 145 | </md-menu-content> | ... | ... |
... | ... | @@ -47,6 +47,7 @@ |
47 | 47 | .md-toolbar-tools { |
48 | 48 | font-size: 14px; |
49 | 49 | padding: 0px 6px; |
50 | + height: 48px; | |
50 | 51 | .md-button.md-icon-button { |
51 | 52 | margin: 0px; |
52 | 53 | &.tb-small { |
... | ... | @@ -114,8 +115,8 @@ |
114 | 115 | font-size: 14px; |
115 | 116 | display: flex; |
116 | 117 | flex-direction: row; |
117 | - height: 30px; | |
118 | - min-height: 30px; | |
118 | + height: 36px; | |
119 | + min-height: 36px; | |
119 | 120 | &.tb-rulechain { |
120 | 121 | background-color: #aac7e4; |
121 | 122 | } |
... | ... | @@ -139,6 +140,12 @@ |
139 | 140 | min-width: 100%; |
140 | 141 | min-height: 100%; |
141 | 142 | outline: none; |
143 | + -webkit-touch-callout: none; | |
144 | + -webkit-user-select: none; | |
145 | + -khtml-user-select: none; | |
146 | + -moz-user-select: none; | |
147 | + -ms-user-select: none; | |
148 | + user-select: none; | |
142 | 149 | } |
143 | 150 | |
144 | 151 | .tb-rule-node, #tb-rule-chain-context-menu .tb-context-menu-header { |
... | ... | @@ -164,8 +171,8 @@ |
164 | 171 | flex-direction: row; |
165 | 172 | min-width: 150px; |
166 | 173 | max-width: 150px; |
167 | - min-height: 28px; | |
168 | - max-height: 28px; | |
174 | + min-height: 32px; | |
175 | + max-height: 32px; | |
169 | 176 | padding: 5px 10px; |
170 | 177 | border-radius: 5px; |
171 | 178 | background-color: #F15B26; |
... | ... | @@ -173,6 +180,7 @@ |
173 | 180 | color: #333; |
174 | 181 | border: solid 1px #777; |
175 | 182 | font-size: 12px; |
183 | + line-height: 16px; | |
176 | 184 | &.tb-rule-node-highlighted:not(.tb-rule-node-invalid) { |
177 | 185 | box-shadow: 0 0 10px 6px #51cbee; |
178 | 186 | .tb-node-title { | ... | ... |
... | ... | @@ -125,9 +125,9 @@ |
125 | 125 | <md-divider ng-if="item.divider"></md-divider> |
126 | 126 | <md-menu-item ng-if="!item.divider"> |
127 | 127 | <md-button ng-disabled="!item.enabled" ng-click="item.action(vm.contextMenuEvent)"> |
128 | + <span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span> | |
128 | 129 | <md-icon ng-if="item.icon" md-menu-align-target aria-label="{{ item.value | translate }}" class="material-icons">{{item.icon}}</md-icon> |
129 | 130 | <span translate>{{item.value}}</span> |
130 | - <span ng-if="item.shortcut" class="tb-alt-text"> {{ item.shortcut | keyboardShortcut }}</span> | |
131 | 131 | </md-button> |
132 | 132 | </md-menu-item> |
133 | 133 | </div> | ... | ... |