diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp index 25bcdf5972e208e0daea7d41c9b7b8f8941e0654..fe8925356c481f048f6e255fa5fb31b6319b847e 100644 --- a/KAA-JSP/build/web/catalog.jsp +++ b/KAA-JSP/build/web/catalog.jsp @@ -398,7 +398,6 @@ %> <br> - <div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;"> <div class="popup-head"> <div class="popup-head-left">{{receiver}}</div> @@ -406,6 +405,10 @@ <div style="clear: both"></div> </div> <div class="popup-messages">Tes</div> + <div class="popup-input"> + <input type="text" style="height: 100%" name="chat" class="auto-style1" hidefocus="hidefocus" /> + </div> + </div> <!-- <div ng-app="chatApp" ng-controller="chatController"> diff --git a/KAA-JSP/build/web/css/style.css b/KAA-JSP/build/web/css/style.css index 0dc33db910e7bff23a4886c5da53cff7cc3bb478..b9ac050343e238a609c528ef23c3a5a4f26856c4 100644 --- a/KAA-JSP/build/web/css/style.css +++ b/KAA-JSP/build/web/css/style.css @@ -47,10 +47,15 @@ .popup-box .popup-messages { - height: 100%; + height: 78%; overflow-y: scroll; } - + +.popup-box .popup-input +{ + bottom: 0px; +} + body { align: center; } diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp index 25bcdf5972e208e0daea7d41c9b7b8f8941e0654..fe8925356c481f048f6e255fa5fb31b6319b847e 100644 --- a/KAA-JSP/web/catalog.jsp +++ b/KAA-JSP/web/catalog.jsp @@ -398,7 +398,6 @@ %> <br> - <div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;"> <div class="popup-head"> <div class="popup-head-left">{{receiver}}</div> @@ -406,6 +405,10 @@ <div style="clear: both"></div> </div> <div class="popup-messages">Tes</div> + <div class="popup-input"> + <input type="text" style="height: 100%" name="chat" class="auto-style1" hidefocus="hidefocus" /> + </div> + </div> <!-- <div ng-app="chatApp" ng-controller="chatController"> diff --git a/KAA-JSP/web/css/style.css b/KAA-JSP/web/css/style.css index 0dc33db910e7bff23a4886c5da53cff7cc3bb478..b9ac050343e238a609c528ef23c3a5a4f26856c4 100644 --- a/KAA-JSP/web/css/style.css +++ b/KAA-JSP/web/css/style.css @@ -47,10 +47,15 @@ .popup-box .popup-messages { - height: 100%; + height: 78%; overflow-y: scroll; } - + +.popup-box .popup-input +{ + bottom: 0px; +} + body { align: center; }