From 76fda881197956afa4bac278a9d1e71effae6108 Mon Sep 17 00:00:00 2001 From: Igor Ustyugov Date: Sat, 27 Aug 2016 17:50:50 +0500 Subject: Avatars inside posts --- juick-www/src/main/static/style.css | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'juick-www/src/main/static') diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index a755fe32..524a326e 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -54,13 +54,13 @@ body>header p { color: #000; font-size: 13pt; margin: 12px 0; text-align: center #newmessage .tags { width: 500px; } #newmessage .subm { width: 150px; background: #EEEEE5; } -article { margin: 10px 0 20px 58px; background: #FFF; padding: 12px 13px; } -article>aside { margin: -12px 0 0 -71px; width: 48px; height: 48px; float: left; } +article { margin-bottom: 20px; padding: 20px; line-height: 140%; background: #fff; box-shadow: 0 0 0 1px #ccc; } +article>aside { margin-right: 10px; float: left; } article>aside img { width: 48px; height: 48px; } -article>header.u { overflow: hidden; display: inline-block; width: 460px; } -article>header.t { width: 140px; text-align: right; float: right; } +article>header.u { display: inline-block; width: 630px; } +article header.t { float: right; text-align: right; margin-top: -1px; } article time { color: #999; font-size: 10pt; border-bottom: 1px dotted #999; } -article p { margin: 10px 0 15px 0; } +article p { margin: 5px 0 15px 0; clear: left; } article p.i { text-align: center; } article p.ir { float: right; margin-left: 10px; margin-bottom: 10px; } article p.ir a { cursor: -webkit-zoom-in; cursor: -moz-zoom-in; } @@ -75,6 +75,9 @@ article a.replies { margin-left: 18px; } article footer.comm { margin: 13px 0 0 0; } article textarea { width: 530px; padding: 2px; resize: vertical; vertical-align: top; min-height: 12pt; height: 12pt; border: 0; } article input { width: 50px; margin-left: 6px; vertical-align: top; border: 1px solid #CCC; background: #EEE; color: #999; } +article .tags { margin-top: 3px; } +.msg-tags { margin-top: 5px; } +article .tags>a, .msg-tags>a { display: inline-block; margin-bottom: 5px; margin-right: 5px; padding: 0 10px; background: #e5e5e0; font-size: 10pt; } #yandex_ad_728 { width: 728px; height: 90px; margin: 20px 0; padding: 15px 0; background: #FFF; } .adslot1 { display: inline-block; width: 320px; height: 90px; } @@ -88,21 +91,20 @@ article input { width: 50px; margin-left: 6px; vertical-align: top; border: 1px .msg { margin: 10px 0 20px 0; } .ads { padding: 13px 10px 5px 10px; margin: 8px 0 16px 58px; background: #FFF; } .msgthread { margin-bottom: 0; } -.msg-avatar { float: left; width: 48px; height: 48px; } +.msg-avatar { float: left; width: 48px; height: 48px; margin-right: 10px } .msg-avatar img { width: 48px; height: 48px; vertical-align: top; } -.msg-cont { background: #FFF; margin-left: 58px; padding: 12px 15px; width: 640px; } -.msg-menu { float: right; width: 16px; height: 16px; } +.msg-cont { background: #FFF; margin-left: 58px; margin-bottom: 20px; padding: 20px; width: 640px; line-height: 140%; box-shadow: 0 0 0 1px #ccc; } +.msg-menu { float: right; width: 16px; height: 16px; margin-top: 2.4px; margin-left: 10px; } .msg-menu>a { display: block; width: 16px; height: 16px; vertical-align: top; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAALRQTFRFAAAAldX/ncT/ksj/ltL/nMb/lMn/mcz/l9H/lcr/mZmZmcz/m83/mJiYmZmZmcz/mM7/mpqamsr/l8v/m83/mJiYmM7/l8v/mZmZmcz/mpqamMv/mcz/mM3/ms3/msv/mMv/mMz/mcz/msz/mc3/mMz/mcz/msz/mc3/mcv/mc3/mcv/mcz/mcz/mcz/mcz/mZmZmZmZmcz/mcz/mcz/mcz/mcz/mcz/mcz/mcz/mcz/mZmZiZsGCAAAADx0Uk5TAAwNDhESExQWGC0tLi8yMjQ1NTY4OTk7PDxESktNUVNUd3h5eoGCg4mKmMvMzc7P29zd3uLj7O3u8vT2+A5wCAAAAJFJREFUGBkFwQlCgkAAAMDRxEySkryyzDxSAc+gkvX//2oGAAB42J5COG46AJ+/+SiKxvl1DsyqJyCtZnBXxgDxdxPrHQDZCvvUNIFkalAgtCSXHr1LIqpRt+ifu91zn6hG8YLh7TbEoMAyg8kEsgWaZQzwWDbgvXoG0p83YH7Nx+32a/73AdDZHEIovu4BAMA/t6QMuyHliCkAAAAASUVORK5CYII=") no-repeat; } -.msg-header { overflow: hidden; } -.msg-ts { font-size: small; vertical-align: top; margin: 5px 0; } +.msg-header { /* overflow: hidden; */ } +.msg-ts { font-size: small; vertical-align: top; float: right; } .msg-ts, .msg-ts>a { color: #999; } .msg-place { font-size: small; } .msg-place>a { color: #999; } -.msg-txt { overflow: hidden; margin: 10px 0 12px 0; } +.msg-txt { margin: 10px 0 12px; } .msg-media { text-align: center; } .msg-links { font-size: small; color: #999; margin: 5px 0 0 0; } .msg-comments { overflow: hidden; font-size: small; color: #AAA; text-indent: 10px; margin-top: 10px; } -.msg-comment { margin: 5px 0; } .ta-wrapper { display: inline-block; border: 1px solid #DDD; } .msg-comment textarea { width: 634px; padding: 2px; resize: vertical; vertical-align: top; min-height: 12pt; height: 12pt; border: 0; } .msg-comment .narrow { width: 554px; } @@ -115,7 +117,7 @@ article input { width: 50px; margin-left: 6px; vertical-align: top; border: 1px q:before, q:after { content: "";} q { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; display: block; color: #666; } -#mtoolbar { width: 670px; margin-left: 58px; background: #E5E5DD; border-top: 1px solid #CCC; } +#mtoolbar { width: 680px; margin-left: 58px; background: #E5E5DD; border-top: 1px solid #CCC; } #mtoolbar ul, #mtoolbar a { padding: 5px; } #mtoolbar li { display: inline; } #mtoolbar div { display: inline-block; width: 16px; height: 16px; background: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px; } @@ -242,8 +244,7 @@ q { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; #column { float: none; padding-top: 0; width: auto; margin: 0 10px; } article { margin: 8px; overflow: auto; } - article>aside { margin: 0 10px 0 0; width: 40px; height: 40px; } - article>aside img { width: 40px; height: 40px; } + article>header.u { margin: 0; width: auto; display: block; } article>header.t { float: none; text-align: left; margin: 0; width: auto; display: block; } article p { margin: 10px 0 8px 0; } @@ -255,9 +256,7 @@ q { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; #content textarea { width: 100%; } .msg,.msg-cont { width: auto; min-width: 280px; } - .msg-cont,.ads { margin-left: 0; } - .msg-avatar { margin: 10px 10px 0 10px; width: 40px; height: 40px; } - .msg-avatar img { width: 40px; height: 40px; } + .msg-cont,.ads { margin: 8px; } .msg-comment textarea { width: 100%; } .msg-txt { margin: 8px 0 0 0; } .msg-media { overflow: auto; } -- cgit v1.2.3 From bf2d92ffa9649eda2cf585b6291d353a83301ad7 Mon Sep 17 00:00:00 2001 From: Igor Ustyugov Date: Sat, 27 Aug 2016 17:53:46 +0500 Subject: No border --- juick-www/src/main/static/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'juick-www/src/main/static') diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index 524a326e..98f3a01b 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -54,7 +54,7 @@ body>header p { color: #000; font-size: 13pt; margin: 12px 0; text-align: center #newmessage .tags { width: 500px; } #newmessage .subm { width: 150px; background: #EEEEE5; } -article { margin-bottom: 20px; padding: 20px; line-height: 140%; background: #fff; box-shadow: 0 0 0 1px #ccc; } +article { margin-bottom: 20px; padding: 20px; line-height: 140%; background: #fff; /* box-shadow: 0 0 0 1px #ccc;*/ } article>aside { margin-right: 10px; float: left; } article>aside img { width: 48px; height: 48px; } article>header.u { display: inline-block; width: 630px; } @@ -93,7 +93,7 @@ article .tags>a, .msg-tags>a { display: inline-block; margin-bottom: 5px; margin .msgthread { margin-bottom: 0; } .msg-avatar { float: left; width: 48px; height: 48px; margin-right: 10px } .msg-avatar img { width: 48px; height: 48px; vertical-align: top; } -.msg-cont { background: #FFF; margin-left: 58px; margin-bottom: 20px; padding: 20px; width: 640px; line-height: 140%; box-shadow: 0 0 0 1px #ccc; } +.msg-cont { background: #FFF; margin-left: 58px; margin-bottom: 20px; padding: 20px; width: 640px; line-height: 140%; /* box-shadow: 0 0 0 1px #ccc; */ } .msg-menu { float: right; width: 16px; height: 16px; margin-top: 2.4px; margin-left: 10px; } .msg-menu>a { display: block; width: 16px; height: 16px; vertical-align: top; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAALRQTFRFAAAAldX/ncT/ksj/ltL/nMb/lMn/mcz/l9H/lcr/mZmZmcz/m83/mJiYmZmZmcz/mM7/mpqamsr/l8v/m83/mJiYmM7/l8v/mZmZmcz/mpqamMv/mcz/mM3/ms3/msv/mMv/mMz/mcz/msz/mc3/mMz/mcz/msz/mc3/mcv/mc3/mcv/mcz/mcz/mcz/mcz/mZmZmZmZmcz/mcz/mcz/mcz/mcz/mcz/mcz/mcz/mcz/mZmZiZsGCAAAADx0Uk5TAAwNDhESExQWGC0tLi8yMjQ1NTY4OTk7PDxESktNUVNUd3h5eoGCg4mKmMvMzc7P29zd3uLj7O3u8vT2+A5wCAAAAJFJREFUGBkFwQlCgkAAAMDRxEySkryyzDxSAc+gkvX//2oGAAB42J5COG46AJ+/+SiKxvl1DsyqJyCtZnBXxgDxdxPrHQDZCvvUNIFkalAgtCSXHr1LIqpRt+ifu91zn6hG8YLh7TbEoMAyg8kEsgWaZQzwWDbgvXoG0p83YH7Nx+32a/73AdDZHEIovu4BAMA/t6QMuyHliCkAAAAASUVORK5CYII=") no-repeat; } .msg-header { /* overflow: hidden; */ } -- cgit v1.2.3 From 0865e6196e6570e211bc47d9d52f7e37326bf1ce Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 29 Aug 2016 13:10:08 +0300 Subject: fix tag styling --- juick-www/src/main/static/style.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'juick-www/src/main/static') diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index 98f3a01b..ef5b5799 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -77,7 +77,14 @@ article textarea { width: 530px; padding: 2px; resize: vertical; vertical-align: article input { width: 50px; margin-left: 6px; vertical-align: top; border: 1px solid #CCC; background: #EEE; color: #999; } article .tags { margin-top: 3px; } .msg-tags { margin-top: 5px; } -article .tags>a, .msg-tags>a { display: inline-block; margin-bottom: 5px; margin-right: 5px; padding: 0 10px; background: #e5e5e0; font-size: 10pt; } +article .tags>a, .msg-tags>a { + display: inline-block; + margin-bottom: 5px; + margin-right: 5px; + padding: 0 10px; + border: 1px dotted #ccc; + color: #222; +} #yandex_ad_728 { width: 728px; height: 90px; margin: 20px 0; padding: 15px 0; background: #FFF; } .adslot1 { display: inline-block; width: 320px; height: 90px; } -- cgit v1.2.3 From ce5b0b511ecd5fad82552897239d32ce89e7e590 Mon Sep 17 00:00:00 2001 From: Igor Ustyugov Date: Mon, 29 Aug 2016 16:26:11 +0500 Subject: Comments fix --- juick-www/src/main/java/com/juick/www/PageTemplates.java | 2 +- juick-www/src/main/static/style.css | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'juick-www/src/main/static') diff --git a/juick-www/src/main/java/com/juick/www/PageTemplates.java b/juick-www/src/main/java/com/juick/www/PageTemplates.java index 69b37e9b..788f5667 100644 --- a/juick-www/src/main/java/com/juick/www/PageTemplates.java +++ b/juick-www/src/main/java/com/juick/www/PageTemplates.java @@ -59,7 +59,7 @@ public class PageTemplates { out.print(""); out.print(""); out.println(""); - out.print(""); + out.print(""); out.print(""); if (headers != null) { out.print(headers); diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index ef5b5799..001c3e52 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -100,7 +100,7 @@ article .tags>a, .msg-tags>a { .msgthread { margin-bottom: 0; } .msg-avatar { float: left; width: 48px; height: 48px; margin-right: 10px } .msg-avatar img { width: 48px; height: 48px; vertical-align: top; } -.msg-cont { background: #FFF; margin-left: 58px; margin-bottom: 20px; padding: 20px; width: 640px; line-height: 140%; /* box-shadow: 0 0 0 1px #ccc; */ } +.msg-cont { background: #FFF; margin-bottom: 20px; padding: 20px; width: 640px; line-height: 140%; /* box-shadow: 0 0 0 1px #ccc; */ } .msg-menu { float: right; width: 16px; height: 16px; margin-top: 2.4px; margin-left: 10px; } .msg-menu>a { display: block; width: 16px; height: 16px; vertical-align: top; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAALRQTFRFAAAAldX/ncT/ksj/ltL/nMb/lMn/mcz/l9H/lcr/mZmZmcz/m83/mJiYmZmZmcz/mM7/mpqamsr/l8v/m83/mJiYmM7/l8v/mZmZmcz/mpqamMv/mcz/mM3/ms3/msv/mMv/mMz/mcz/msz/mc3/mMz/mcz/msz/mc3/mcv/mc3/mcv/mcz/mcz/mcz/mcz/mZmZmZmZmcz/mcz/mcz/mcz/mcz/mcz/mcz/mcz/mcz/mZmZiZsGCAAAADx0Uk5TAAwNDhESExQWGC0tLi8yMjQ1NTY4OTk7PDxESktNUVNUd3h5eoGCg4mKmMvMzc7P29zd3uLj7O3u8vT2+A5wCAAAAJFJREFUGBkFwQlCgkAAAMDRxEySkryyzDxSAc+gkvX//2oGAAB42J5COG46AJ+/+SiKxvl1DsyqJyCtZnBXxgDxdxPrHQDZCvvUNIFkalAgtCSXHr1LIqpRt+ifu91zn6hG8YLh7TbEoMAyg8kEsgWaZQzwWDbgvXoG0p83YH7Nx+32a/73AdDZHEIovu4BAMA/t6QMuyHliCkAAAAASUVORK5CYII=") no-repeat; } .msg-header { /* overflow: hidden; */ } @@ -124,11 +124,13 @@ article .tags>a, .msg-tags>a { q:before, q:after { content: "";} q { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; display: block; color: #666; } -#mtoolbar { width: 680px; margin-left: 58px; background: #E5E5DD; border-top: 1px solid #CCC; } +#mtoolbar { width: 680px; background: #E5E5DD; border-top: 1px solid #CCC; } #mtoolbar ul, #mtoolbar a { padding: 5px; } #mtoolbar li { display: inline; } #mtoolbar div { display: inline-block; width: 16px; height: 16px; background: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px; } +#replies .msg-txt { clear: both; margin: 0; padding-top: 10px; } + .newmessage { width: 695px; padding: 2px; resize: vertical; border: 1px solid #DDD; } /* textarea */ .users { width: 100%; margin: 10px 0; } /* table */ -- cgit v1.2.3 From e7e858bf508c04379a7fd46c2f07540659dc8025 Mon Sep 17 00:00:00 2001 From: Igor Ustyugov Date: Mon, 29 Aug 2016 16:32:15 +0500 Subject: wsIncomingReply fix --- juick-www/src/main/static/scripts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'juick-www/src/main/static') diff --git a/juick-www/src/main/static/scripts.js b/juick-www/src/main/static/scripts.js index 3a656364..36b6fc36 100644 --- a/juick-www/src/main/static/scripts.js +++ b/juick-www/src/main/static/scripts.js @@ -92,7 +92,6 @@ function wsIncomingReply(msg) { msgAvatarImg.setAttribute('src', '//i.juick.com/a/' + msg.user.uid + '.png'); msgAvatarLink.appendChild(msgAvatarImg); msgAvatar.appendChild(msgAvatarLink); - li.appendChild(msgAvatar); var msgCont = document.createElement('div'); msgCont.setAttribute('class', 'msg-cont'); @@ -140,8 +139,9 @@ function wsIncomingReply(msg) { msgComment.setAttribute('class', 'msg-comment'); msgComment.style.display = 'none'; msgCont.appendChild(msgMenu); + msgCont.appendChild(msgTimestamp); + msgCont.appendChild(msgAvatar); msgCont.appendChild(msgHeader); - msgCont.appendChild(msgTimestamp); msgCont.appendChild(msgTxt); msgCont.appendChild(msgLinks); msgCont.appendChild(msgComment); -- cgit v1.2.3