Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/webapp/WEB-INF/views/display/MainGnbContentsPopupForm.html

@@ -215,11 +215,11 @@
 		brandCdIdx = $("#tabTable" + tabTableRow + " #brandListTd" + callbackBrandTr + " >ul").size()
 
 		for (let i = 0; i < result.length; i++) {
-			html += '<ul id="brandUl' + brandCdIdx + '" class="item ui-state-default brandClass" style="min-height:80px;">';
+			html += '<ul id="brandUl' + brandCdIdx + '" class="item ui-state-default brandClass" style="min-height:80px;max-height:80px;">';
 			html += '	<input type="hidden" name="brandGroupNo" value="' + result[i].brandGroupNo + '">';
 			html += '	<input type="hidden" name="imgPath1" value="' + result[i].logoFileNm + '">';
 			html += '	<li class="img">';
-			html += '		<img style="height:100%;" src="' + uploadGoodsUrl + "/" + result[i].logoFileNm + '" onerror="this.src=\'/image/no.png\';"/>';
+			html += '		<img style="height:65px;" src="' + uploadGoodsUrl + "/" + result[i].logoFileNm + '" onerror="this.src=\'/image/no.png\';"/>';
 			html += '	</li>';
 			html += '	<li class="cont">';
 			html += '		<ul>';
@@ -668,13 +668,13 @@
 			html += '			<div class="sortableWrap" data-unit="7" style="overflow-y:scroll;">';
 			html += '				<div class="itemWrap ui-sortable" id="brandListTd1" data-id="1">';
 			for(let k=0; k<g1cdArr.length; k++){
-				html += '<ul id="brandUl' + k + '" class="item ui-state-default brandClass" style="min-height:80px;">';
+				html += '<ul id="brandUl' + k + '" class="item ui-state-default brandClass" style="min-height:80px;max-height:80px;">';
 				html += '	<input type="hidden" name="brandGroupNo" value="' + g1cdArr[k] + '">';
 				html += '	<li class="img">';
 				if(gagajf.isNull(g1imgArr)){
-					html += '		<img style="height:100%;" src="" onerror="this.src=\'/image/no.png\';"/>';
+					html += '		<img style="height:65px;" src="" onerror="this.src=\'/image/no.png\';"/>';
 				}else{
-					html += '		<img style="height:100%;" src="' + uploadGoodsUrl + "/" + g1imgArr[k] + '" onerror="this.src=\'/image/no.png\';"/>';
+					html += '		<img style="height:65px;" src="' + uploadGoodsUrl + "/" + g1imgArr[k] + '" onerror="this.src=\'/image/no.png\';"/>';
 				}
 				html += '	</li>';
 				html += '	<li class="cont">';
@@ -699,13 +699,13 @@
 			html += '			<div class="sortableWrap" data-unit="7" style="overflow-y:scroll;">';
 			html += '				<div class="itemWrap ui-sortable" id="brandListTd2" data-id="2">';
 			for(let m=0; m<g2cdArr.length; m++){
-				html += '<ul id="brandUl' + m + '" class="item ui-state-default brandClass" style="min-height:80px;">';
+				html += '<ul id="brandUl' + m + '" class="item ui-state-default brandClass" style="min-height:80px;max-height:80px;">';
 				html += '	<input type="hidden" name="brandGroupNo" value="' + g2cdArr[m] + '">';
 				html += '	<li class="img">';
 				if(gagajf.isNull(g2imgArr)){
-					html += '		<img style="height:100%;" src="" onerror="this.src=\'/image/no.png\';"/>';
+					html += '		<img style="height:65px;" src="" onerror="this.src=\'/image/no.png\';"/>';
 				}else{
-					html += '		<img style="height:100%;" src="' + uploadGoodsUrl + "/" + g2imgArr[m] + '" onerror="this.src=\'/image/no.png\';"/>';
+					html += '		<img style="height:65px;" src="' + uploadGoodsUrl + "/" + g2imgArr[m] + '" onerror="this.src=\'/image/no.png\';"/>';
 				}
 				html += '	</li>';
 				html += '	<li class="cont">';
@@ -730,13 +730,13 @@
 			html += '			<div class="sortableWrap" data-unit="7" style="overflow-y:scroll;">';
 			html += '				<div class="itemWrap ui-sortable" id="brandListTd3" data-id="3">';
 			for(let n=0; n<g3cdArr.length; n++){
-				html += '<ul id="brandUl' + n + '" class="item ui-state-default brandClass" style="min-height:80px;">';
+				html += '<ul id="brandUl' + n + '" class="item ui-state-default brandClass" style="min-height:80px;max-height:80px;">';
 				html += '	<input type="hidden" name="brandGroupNo" value="' + g3cdArr[n] + '">';
 				html += '	<li class="img">';
 				if(gagajf.isNull(g3imgArr)){
-					html += '		<img style="height:100%;" src="" onerror="this.src=\'/image/no.png\';"/>';
+					html += '		<img style="height:65px;" src="" onerror="this.src=\'/image/no.png\';"/>';
 				}else{
-					html += '		<img style="height:100%;" src="' + uploadGoodsUrl + "/" + g3imgArr[n] + '" onerror="this.src=\'/image/no.png\';"/>';
+					html += '		<img style="height:65px;" src="' + uploadGoodsUrl + "/" + g3imgArr[n] + '" onerror="this.src=\'/image/no.png\';"/>';
 				}
 				html += '	</li>';
 				html += '	<li class="cont">';