ADAM / AIAHTML5

Commit 572a617873981fdc6681aab4da6585d1c8cf312d

Authored by Nikita Kulshreshtha
2 parents 75b53e7c fe4d0db1

Merge branch 'Bug_8771_mod_symbol' into Develop

Inline Side-by-side
Showing 4 changed files with 3 additions and 2 deletions
300-PROTOTYPES/20160726/welcome.html
  View file @572a617
... ... @@ -555,7 +555,7 @@
555 555 <div class="">
556 556 <div class="col-sm-6">
557 557 <h5 class="font13 bolder">Modesty Setting</h5>
558   - <!--<img src="img/adam-leaf.png" alt="">-->
  558 + <img src="img/adam-leaf.png" alt="" class="pull-left marginR5">
559 559 <div class="radio">
560 560 <label>
561 561 <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
... ...
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @572a617
... ... @@ -144,6 +144,7 @@
144 144 <Content Include="content\images\ca\thumbnails\ca_tni_3402.jpg" />
145 145 <Content Include="content\images\ca\thumbnails\ca_tni_3403.jpg" />
146 146 <Content Include="content\images\ca\thumbnails\ca_tni_3404.jpg" />
  147 + <Content Include="content\images\common\adam-leaf.png" />
147 148 <Content Include="content\images\common\annotation-tool-bar\blank-shape.jpg" />
148 149 <Content Include="content\images\common\annotation-tool-bar\pattern-2burn.jpg" />
149 150 <Content Include="content\images\common\annotation-tool-bar\pattern-3burn.jpg" />
... ...
400-SOURCECODE/AIAHTML5.Web/content/images/common/adam-leaf.png 0 → 100644
View file @572a617

4.35 KB
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @572a617
... ... @@ -423,7 +423,7 @@
423 423 <div class="">
424 424 <div class="col-sm-6">
425 425 <h5 class="font13 bolder">Modesty Setting</h5>
426   - <!--<img src="img/adam-leaf.png" alt="">-->
  426 + <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5">
427 427 <div class="radio">
428 428 <label>
429 429 <input type="radio" ng-checked="isModestyOn" ng-model="formsetting.modesty" value="Y" name="modestyRadios" id="modon" ng-click="ChangeModesty(formsetting,'Y')">
... ...