Commit 8005c88349ed1f25789a81becee76a3a14f39196
1 parent
66eaa830
ADAMImagesBug
Showing
3 changed files
with
5 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/Web.config
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | </location> | 22 | </location> |
| 23 | <system.webServer>. | 23 | <system.webServer>. |
| 24 | 24 | ||
| 25 | - <!--<rewrite> | 25 | + <rewrite> |
| 26 | <rules> | 26 | <rules> |
| 27 | <rule name="AngularJS Routes" stopProcessing="true"> | 27 | <rule name="AngularJS Routes" stopProcessing="true"> |
| 28 | <match url=".*" /> | 28 | <match url=".*" /> |
| @@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
| 34 | <action type="Rewrite" url="/" /> | 34 | <action type="Rewrite" url="/" /> |
| 35 | </rule> | 35 | </rule> |
| 36 | </rules> | 36 | </rules> |
| 37 | - </rewrite>--> | 37 | + </rewrite> |
| 38 | <staticContent> | 38 | <staticContent> |
| 39 | 39 | ||
| 40 | <remove fileExtension=".mp3" /> | 40 | <remove fileExtension=".mp3" /> |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
| @@ -548,7 +548,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -548,7 +548,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
| 548 | 548 | ||
| 549 | 549 | ||
| 550 | //$("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height()); | 550 | //$("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height()); |
| 551 | - var jspContentHeight = $('.jsPanel-content').css('overflow','auto !important').height(); | 551 | + $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important') |
| 552 | + var jspContentHeight = $('.jsPanel-content').height(); | ||
| 552 | 553 | ||
| 553 | } | 554 | } |
| 554 | 555 |
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
| @@ -310,7 +310,7 @@ h3.jsPanel-title{ | @@ -310,7 +310,7 @@ h3.jsPanel-title{ | ||
| 310 | .jsPanel-hdr.jsPanel-theme-success{ color: #fff; font-family: Open Sans, Helvetica,tahoma,arial,verdana,sans-serif; font-weight: bold; font-size:15px; background: #818D43; height:20px;} | 310 | .jsPanel-hdr.jsPanel-theme-success{ color: #fff; font-family: Open Sans, Helvetica,tahoma,arial,verdana,sans-serif; font-weight: bold; font-size:15px; background: #818D43; height:20px;} |
| 311 | .jsPanel-hdr.jsPanel-theme-success h3{ color: #fff;font-size:20px;font-weight: bold } | 311 | .jsPanel-hdr.jsPanel-theme-success h3{ color: #fff;font-size:20px;font-weight: bold } |
| 312 | .jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; font-weight: bold} | 312 | .jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; font-weight: bold} |
| 313 | -.jsPanel-content.jsPanel-theme-success { background: none repeat scroll 0 0 #ffffff; color: #000000; font-family: tahoma,arial,verdana,sans-serif; outline: 1px solid #bbb;background-color:#222222; overflow-y: auto !important; } | 313 | +.jsPanel-content.jsPanel-theme-success { background: none repeat scroll 0 0 #ffffff; color: #000000; font-family: tahoma,arial,verdana,sans-serif; outline: 1px solid #bbb;background-color:#222222; } |
| 314 | .jsPanel-ftr.jsPanel-theme-success{} | 314 | .jsPanel-ftr.jsPanel-theme-success{} |
| 315 | .jsPanel-theme-successt .ui-icon-gripsmall-diagonal-se{ color: #000; } | 315 | .jsPanel-theme-successt .ui-icon-gripsmall-diagonal-se{ color: #000; } |
| 316 | 316 |