ADAM / AIAHTML5

Commit 1d126740186feaeecde12a7669f33c016618d251

Authored by Nikita Kulshreshtha
2 parents 1a963976 ad26f250

Merge branch 'spriteIconImages' into Develop

Inline Side-by-side
Showing 3 changed files with 19 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @1d12674
... ... @@ -70,13 +70,13 @@
70 70 <!--</div>-->
71 71 <div class="tools pull-left" style="top:44px;">
72 72 <div class="toggle-icon toggleBar toggleHeadingButton" id="sideBarToggle" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div>
73   - <div class="">
74   - <div class="col-sm-6"><button onclick="hidePins(event)" id="hidePinBtn" class="btn btn-black btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Hide Pins"> <img src="../../../content/images/aa/LeftMenu/hide-pin.png" alt=""></button> </div>
75   - <div class="col-sm-6"><button class="btn btn-black btn-sm pull-right tooltip-custom" id="selectedPin" onclick="showSelectedPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show Selected Pins"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt=""></button></div>
76   - <div class="col-sm-6"><button class="btn btn-primary btn-sm marginTop5 tooltip-custom" id="allPinBtn" onclick="showAllPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show All Pins in System(s)"><img src="../../../content/images/aa/LeftMenu/all-pin.png" alt=""></button></div>
  73 + <div class="sprit-icon">
  74 + <div class="col-sm-6"><button onclick="hidePins(event)" id="hidePinBtn" class="btn btn-black btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Hide Pins"></button> </div>
  75 + <div class="col-sm-6"><button class="btn btn-black btn-sm pull-right tooltip-custom" id="selectedPin" onclick="showSelectedPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show Selected Pins"></button></div>
  76 + <div class="col-sm-6"><button class="btn btn-primary btn-sm marginTop5 tooltip-custom" id="allPinBtn" onclick="showAllPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show All Pins in System(s)"></button></div>
77 77 <div class="col-sm-6">
78 78 <div class="custom-tooltip">Select System</div>
79   - <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="../../../content/images/aa/LeftMenu/icon-highlight.png" alt="" ></button>
  79 + <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"></button>
80 80 <ul class="dropdown-menu" aria-labelledby="dropdownMenu221" id="bodySystemList">
81 81 <li><a id="0" href="#" title="Current Structure" onclick="showSelectedSystemPins(event)">All</a></li>
82 82 <li role="separator" class="divider"></li>
... ... @@ -93,9 +93,8 @@
93 93 <li class="disabledSelectedSystem"><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li>
94 94 <li class="disabledSelectedSystem"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li>
95 95 </ul>
96   -
97   - </div>
98   - <div class="col-sm-12" data-toggle="tooltip" data-placement="top" title="Show/Hide Structure Name Boxes"><button onclick="showHideAnnotation(event)" class="btn btn-black btn-sm marginTop5 btn-block"> <img src="../../../content/images/aa/LeftMenu/comment-box.png" alt=""></button> </div>
  96 + </div>
  97 + <div class="col-sm-12" data-toggle="tooltip" data-placement="top" title="Show/Hide Structure Name Boxes"><button onclick="showHideAnnotation(event)" class="btn btn-black btn-sm marginTop5 btn-block" id="comment-box"></button> </div>
99 98 </div>
100 99 <div class="pips-slider" style="margin-top:125px">
101 100 <h3>Zoom <i class="fa fa-search-plus"></i></h3>
... ...
400-SOURCECODE/AIAHTML5.Web/content/images/aa/LeftMenu/icon-sprit.png 0 → 100644
View file @1d12674

1.7 KB
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @1d12674
... ... @@ -517,7 +517,7 @@ pointer-events: auto;
517 517 position: absolute;
518 518 top: 110px;
519 519 left: 100px;
520   - z-index: 99999;
  520 + z-index: 9;
521 521 -moz-transition: left 0.5s ease;
522 522 transition: left 0.5s ease;
523 523 background: url(../../../../../content/images/icon-sidebar.png) no-repeat 0;
... ... @@ -1070,4 +1070,14 @@ color:#ffffff !important;
1070 1070 pointer-events:none;
1071 1071 }
1072 1072  
1073   -.pl-12{padding-left:12px;}
1074 1073 \ No newline at end of file
  1074 +.pl-12{padding-left:12px;}
  1075 +
  1076 +
  1077 +/*sprit images*/
  1078 +.sprit-icon button{background-image:url("/../../../content/images/aa/LeftMenu/icon-sprit.png"); background-repeat:no-repeat; width:38px; height:32px;}
  1079 +.sprit-icon button:active{background-image:url("/../../../content/images/aa/LeftMenu/icon-sprit.png"); background-repeat:no-repeat; width:38px; height:32px;}
  1080 +#hidePinBtn{background-position:10px 5px;}
  1081 +#selectedPin{background-position:15px -24px;}
  1082 +#allPinBtn{background-position:12px -105px;}
  1083 +#dropdownMenu221{background-position:10px -49px;}
  1084 +#comment-box{background-position:28px -73px; width:80px;}
1075 1085 \ No newline at end of file
... ...