Skip to content

C
chat_webview
Commit 20fd1044 by Lee Munkyeong
Options

conflict対応。

parent bbe64164
Showing with 14 additions and 50 deletions
public_new/chat_make_room.html
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<a href="#" class="w-100" id="rootGroupBtnForMakeRoom"> <a href="#" class="w-100" id="rootGroupBtnForMakeRoom">
<div class="chat_item d-flex flex-row align-items-center"> <div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thubnail"> <div class="thumbnail">
<img src="icon/icon_prev_top.png" alt="トップグループに戻る" /> <img src="icon/icon_prev_top.png" alt="トップグループに戻る" />
</div> </div>
</div> </div>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<a href="#" class="w-100" id="parentGroupBtnForMakeRoom"> <a href="#" class="w-100" id="parentGroupBtnForMakeRoom">
<div class="chat_item d-flex flex-row align-items-center"> <div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thubnail"> <div class="thumbnail">
<img src="icon/icon_prev.png" alt="上位グループに戻る" /> <img src="icon/icon_prev.png" alt="上位グループに戻る" />
</div> </div>
</div> </div>
......
public_new/css/chat.css
...@@ -96,80 +96,53 @@ input[name="tab_item"] { ...@@ -96,80 +96,53 @@ input[name="tab_item"] {
background: aliceblue; background: aliceblue;
} }
/* サムネイル画像 */ /* サムネイル画像 */
<<<<<<< HEAD
.chat_item_l .thumbnail { .chat_item_l .thumbnail {
=======
.chat_item_l .thubnail {
>>>>>>> origin/develop_createRoom_UI
width: 50px; width: 50px;
height: 50px; height: 50px;
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
margin: 0 auto; margin: 0 auto;
} }
<<<<<<< HEAD
.chat_item_l .thumbnail img{ .chat_item_l .thumbnail img{
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.chat_item_l .thumbnail4 img { .chat_item_l .thumbnail4 img {
=======
.chat_item_l .thubnail img{
width: 50px;
height: 50px;
}
.chat_item_l .thubnail4 img {
>>>>>>> origin/develop_createRoom_UI
width: 25px; width: 25px;
height: 25px; height: 25px;
float: left; float: left;
} }
<<<<<<< HEAD
.chat_item_l .thumbnail3 .img_wrap:nth-child(1) { .chat_item_l .thumbnail3 .img_wrap:nth-child(1) {
=======
.chat_item_l .thubnail3 .img_wrap:nth-child(1) {
>>>>>>> origin/develop_createRoom_UI
width: 25px; width: 25px;
height: 50px; height: 50px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
float: left; float: left;
} }
<<<<<<< HEAD
.chat_item_l .thumbnail3 .img_wrap:nth-child(1) img { .chat_item_l .thumbnail3 .img_wrap:nth-child(1) img {
=======
.chat_item_l .thubnail3 .img_wrap:nth-child(1) img {
>>>>>>> origin/develop_createRoom_UI
width: 50px; width: 50px;
height: 50px; height: 50px;
position: absolute; position: absolute;
left: -12px; left: -12px;
} }
<<<<<<< HEAD
.chat_item_l .thumbnail3 .img_wrap:nth-child(2) { .chat_item_l .thumbnail3 .img_wrap:nth-child(2) {
=======
.chat_item_l .thubnail3 .img_wrap:nth-child(2) {
>>>>>>> origin/develop_createRoom_UI
width: 25px; width: 25px;
height: 25px; height: 25px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
float: left; float: left;
} }
<<<<<<< HEAD
.chat_item_l .thumbnail3 .img_wrap:nth-child(2) img, .chat_item_l .thumbnail3 .img_wrap:nth-child(3) img { .chat_item_l .thumbnail3 .img_wrap:nth-child(2) img, .chat_item_l .thumbnail3 .img_wrap:nth-child(3) img {
width: 25px; width: 25px;
height: 30px; height: 30px;
} }
.chat_item_l .thumbnail3 .img_wrap:nth-child(3) { .chat_item_l .thumbnail3 .img_wrap:nth-child(3) {
=======
.chat_item_l .thubnail3 .img_wrap:nth-child(2) img, .chat_item_l .thubnail3 .img_wrap:nth-child(3) img {
width: 25px;
height: 30px;
}
.chat_item_l .thubnail3 .img_wrap:nth-child(3) {
>>>>>>> origin/develop_createRoom_UI
width: 25px; width: 25px;
height: 25px; height: 25px;
position: relative; position: relative;
...@@ -177,32 +150,23 @@ input[name="tab_item"] { ...@@ -177,32 +150,23 @@ input[name="tab_item"] {
float: left; float: left;
} }
<<<<<<< HEAD
.chat_item_l .thumbnail2 .img_wrap:nth-child(1) { .chat_item_l .thumbnail2 .img_wrap:nth-child(1) {
=======
.chat_item_l .thubnail2 .img_wrap:nth-child(1) {
>>>>>>> origin/develop_createRoom_UI
width: 25px; width: 25px;
height: 50px; height: 50px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
float: left; float: left;
} }
<<<<<<< HEAD
.chat_item_l .thumbnail2 .img_wrap:nth-child(2) { .chat_item_l .thumbnail2 .img_wrap:nth-child(2) {
=======
.chat_item_l .thubnail2 .img_wrap:nth-child(2) {
>>>>>>> origin/develop_createRoom_UI
width: 25px; width: 25px;
height: 50px; height: 50px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
<<<<<<< HEAD
.chat_item_l .thumbnail2 .img_wrap img { .chat_item_l .thumbnail2 .img_wrap img {
=======
.chat_item_l .thubnail2 .img_wrap img {
>>>>>>> origin/develop_createRoom_UI
width: 50px; width: 50px;
height: 50px; height: 50px;
position: absolute; position: absolute;
......
public_new/template/template_make_room_confirm_user_list.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<li class="d-flex align-items-center"> <li class="d-flex align-items-center">
<div class="chat_item d-flex flex-row align-items-center w-100"> <div class="chat_item d-flex flex-row align-items-center w-100">
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thubnail"> <div class="thumbnail">
<div class="img_wrap"><img src="{{profileImage}}" onError="this.src='./img/noImage.png'"/></div> <div class="img_wrap"><img src="{{profileImage}}" onError="this.src='./img/noImage.png'"/></div>
</div> </div>
</div> </div>
......
public_new/template/template_make_room_group_list.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupForMakeRoom({{id}});"> <a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupForMakeRoom({{id}});">
<div class="chat_item d-flex flex-row align-items-center"> <div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thubnail"> <div class="thumbnail">
<img src="icon/icon_folder.png" alt="フォルダ" /> <img src="icon/icon_folder.png" alt="フォルダ" />
</div> </div>
</div> </div>
......
public_new/template/template_make_room_group_user_list.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</div> </div>
</div> </div>
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thubnail"> <div class="thumbnail">
<div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"/></div> <div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"/></div>
</div> </div>
</div> </div>
......
public_new/template/template_make_room_user_list.html
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
</div> </div>
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thubnail"> <div class="thumbnail">
<div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'" /></div> <div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'" /></div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment