Commit 15683ca164319e80896a2d4ff314f889679198d6
1 parent
27d0ad0c
Showing
2 changed files
with
13 additions
and
11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -297,6 +297,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 297 | 297 | $rootScope.shapestyle = function (id) { |
| 298 | 298 | |
| 299 | 299 | document.getElementById('modelbackground').style.display = "none"; |
| 300 | + document.getElementById('modeleditstyle').style.display = "none"; | |
| 300 | 301 | |
| 301 | 302 | $rootScope.shapestyleOpacity = $("#" + id).css('opacity'); |
| 302 | 303 | $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color'); |
| ... | ... | @@ -319,15 +320,17 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 319 | 320 | } |
| 320 | 321 | |
| 321 | 322 | $rootScope.enableAnnotationToolBar = function () { |
| 322 | - | |
| 323 | + | |
| 323 | 324 | document.getElementById('modelbackground').style.display = "block"; |
| 324 | - $("#editshapestyle").modal('show'); | |
| 325 | + //$("#editshapestyle").modal('show'); | |
| 326 | + document.getElementById('modeleditstyle').style.display = "block"; | |
| 325 | 327 | |
| 326 | 328 | } |
| 327 | 329 | |
| 328 | 330 | $rootScope.disableAnnotationToolBar = function () { |
| 329 | 331 | |
| 330 | 332 | document.getElementById('modelbackground').style.display = "none"; |
| 333 | + document.getElementById('modeleditstyle').style.display = "none"; | |
| 331 | 334 | |
| 332 | 335 | } |
| 333 | 336 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
| ... | ... | @@ -55,19 +55,18 @@ |
| 55 | 55 | display: none; |
| 56 | 56 | } |
| 57 | 57 | .customTooltip { |
| 58 | - background-color: #fff !important; | |
| 59 | - color: #000 !important; | |
| 58 | + background: #333 !important; | |
| 59 | + color: #fff !important; | |
| 60 | 60 | opacity: 0.9 !important; |
| 61 | - | |
| 62 | 61 | } |
| 63 | 62 | |
| 64 | 63 | |
| 65 | 64 | |
| 66 | 65 | |
| 67 | 66 | .custom-tooltip { |
| 68 | - background-color: #fff; | |
| 67 | + background-color: #333; | |
| 69 | 68 | border: 0 none; |
| 70 | - color: #000; | |
| 69 | + color: #fff !important; | |
| 71 | 70 | left: -52px; |
| 72 | 71 | opacity: 0.9; |
| 73 | 72 | padding: 7px; |
| ... | ... | @@ -83,9 +82,9 @@ |
| 83 | 82 | } |
| 84 | 83 | |
| 85 | 84 | .custom-tooltip1 { |
| 86 | - background-color: #fff; | |
| 85 | + background-color: #333; | |
| 87 | 86 | border: 0 none; |
| 88 | - color: #000; | |
| 87 | + color: #fff !important; | |
| 89 | 88 | left: 52px; |
| 90 | 89 | opacity: 0.9; |
| 91 | 90 | padding: 7px; |
| ... | ... | @@ -101,9 +100,9 @@ |
| 101 | 100 | } |
| 102 | 101 | |
| 103 | 102 | .custom-tooltip2 { |
| 104 | - background-color: #fff; | |
| 103 | + background-color: #333; | |
| 105 | 104 | border: 0 none; |
| 106 | - color: #000; | |
| 105 | + color: #fff !important; | |
| 107 | 106 | right: 10px; |
| 108 | 107 | opacity: 0.9; |
| 109 | 108 | padding: 7px; | ... | ... |