Commit 4e9c73f660104df544b1cf865cbd911dc6da2ecb
BlankSpaceCIissue manual merge
Showing
2 changed files
with
11 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
... | ... | @@ -175,7 +175,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
175 | 175 | |
176 | 176 | |
177 | 177 | $('#grid-view').empty(); |
178 | - var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}" title = "{{value._Title}}" data-ng-click="openView($event)">' | |
178 | + var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}" title = "{{value._Title}}" class="GridViewDataDivHeight" data-ng-click="openView($event)">' | |
179 | 179 | + '<div class="thumbnail" >' |
180 | 180 | + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >' |
181 | 181 | + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view'); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
... | ... | @@ -1008,10 +1008,18 @@ background-size:cover; |
1008 | 1008 | { |
1009 | 1009 | z-index:11111; |
1010 | 1010 | } |
1011 | - .tinyImg { | |
1011 | + | |
1012 | + .tinyImg { | |
1012 | 1013 | display: block; |
1013 | 1014 | max-width: 230px; |
1014 | 1015 | /*max-height: 95px;*/ |
1015 | 1016 | width: auto; |
1016 | 1017 | height: 95px !important; |
1017 | -} | |
1018 | 1018 | \ No newline at end of file |
1019 | +} | |
1020 | + | |
1021 | + | |
1022 | + .GridViewDataDivHeight | |
1023 | + { | |
1024 | + height:175px; | |
1025 | + } | |
1026 | + | ... | ... |