简柏林 / thingskit · Commits

Commit 5cb21afe63cdf2b72ed1c170ef64001da3b53a97

Authored by Igor Kulikov
1 parent 8e3989c9

Rule chain UI: FF fixes

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