ADAM / AIAHTML5

Commit f4b355e29f3edfb7696049f55464e36da40ee060

Authored by Nikita Kulshreshtha
2 parents bfd2774f 2153d8dc

Merge branch 'annotationimageborder' into Develop

Inline Side-by-side
Showing 4 changed files with 34 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @f4b355e
... ... @@ -418,7 +418,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
418 418 document.getElementById('modeleditstyle').style.display = "none";
419 419  
420 420 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
421   - $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
  421 + $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
422 422 $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
423 423 $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
424 424 var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
... ...
400-SOURCECODE/AIAHTML5.Web/content/images/blank-shapes.png 0 → 100644
View file @f4b355e

1.63 KB
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @f4b355e
... ... @@ -839,9 +839,14 @@
839 839 </div>
840 840  
841 841 <div class="marginTopBtm10">
842   - <div class="well well-sm no-margin-btm">
843   - <img id="imgOpacity" class="img-rounded img-responsive imgopacity" alt="..." src="content/images/blank-shape.jpg">
844   - </div>
  842 +
  843 + <div class="well well-sm no-margin-btm blankshapediv">
  844 + <div class="outlinediv">
  845 + <div id="imgOpacity" class="fullcolordiv imgopacity">
  846 + </div>
  847 + </div>
  848 + </div>
  849 +
845 850 </div>
846 851 </div>
847 852 <div class="modal-footer">
... ... @@ -1406,7 +1411,7 @@
1406 1411 if (opacity) value += ', ' + opacity;
1407 1412 if (typeof console === 'object') {
1408 1413 console.log(value);
1409   - $("#imgOpacity").parent().css("background-color", value);
  1414 + $("#imgOpacity").css("background-color", value);
1410 1415  
1411 1416 }
1412 1417 },
... ... @@ -1451,7 +1456,7 @@
1451 1456 step: .1,
1452 1457 slide: function (event, ui) {
1453 1458  
1454   - $(".marginTopBtm10 img.imgopacity").css("opacity", ui.value);
  1459 + $(".marginTopBtm10 .imgopacity").css("opacity", ui.value);
1455 1460 // $("#slider-value").html(ui.value);
1456 1461  
1457 1462 }
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @f4b355e
... ... @@ -876,4 +876,26 @@ cursor:pointer;
876 876 pointer-events:none;
877 877 opacity:0.6;
878 878  
879   -}
880 879 \ No newline at end of file
  880 +}
  881 +
  882 +.blankshapediv
  883 +{
  884 +background-image: url("../../../../../content/images/blank-shapes.png");
  885 +}
  886 +.outlinediv
  887 +{
  888 + border:1px solid black;
  889 + width: 72%;
  890 + margin-left: auto;
  891 + margin-right: auto;
  892 + height: 98px;
  893 + border-radius: 50%;
  894 + }
  895 +.fullcolordiv
  896 + {
  897 + position:relative;
  898 + width:100%;
  899 + height:100%;
  900 + background:#fff;
  901 + border-radius: 50%;
  902 + }
881 903 \ No newline at end of file
... ...