Browse Source

hiding of mentions autocomleting if posts before appear, tuning of css

master
Simon Grim 10 years ago
parent
commit
0e37dc7537
  1. 13
      css/style.css
  2. 21
      js/twister_actions.js
  3. 1
      theme_calm/css/style.css
  4. 5
      theme_nin/css/style.css
  5. 4
      theme_nin/sass/style.sass

13
css/style.css

@ -619,6 +619,11 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover
padding: 4px; padding: 4px;
font-size: 13px; font-size: 13px;
} }
.post-area-new textarea:focus {
border: solid 1px rgba( 227, 79, 66, .5 );
}
.mini-profile .post-area-new .mini-profile .post-area-new
{ {
padding: 9px; padding: 9px;
@ -631,8 +636,6 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover
.post-area-new.open textarea .post-area-new.open textarea
{ {
height: 80px; height: 80px;
border: solid 1px rgba( 227, 79, 66, .5 );
box-shadow: 0 0 10px rgba(0, 0, 0, .3 );
} }
textarea.splited-post { textarea.splited-post {
box-shadow: none!important; box-shadow: none!important;
@ -1350,7 +1353,7 @@ ol.toptrends-list {
left: 50%; left: 50%;
height: 80%; height: 80%;
margin-left: -290px; margin-left: -290px;
box-shadow: 0 0 30px rgba( 0, 0, 0, .6 ); box-shadow: 10px 12px 18px 0px rgba(0,0,0, .3);
background: rgba( 255, 255,255, 1.0 ); background: rgba( 255, 255,255, 1.0 );
z-index: 3; z-index: 3;
} }
@ -1644,8 +1647,8 @@ ol.toptrends-list {
position: fixed; position: fixed;
top: 50%; top: 50%;
left: 50%; left: 50%;
background: rgba( 255, 255,255, 1.0 ); background: #fff;
box-shadow: 0 0 30px rgba( 0, 0, 0, .6 ); box-shadow: 10px 12px 18px 0px rgba(0,0,0, .3);
z-index: 5; z-index: 5;
width: 600px; width: 600px;
margin-left:-300px; margin-left:-300px;

21
js/twister_actions.js

@ -30,14 +30,17 @@ function requestRepliedBefore(postLi)
if( reply_n != undefined && reply_k != undefined ) { if( reply_n != undefined && reply_k != undefined ) {
dhtget( reply_n, "post" + reply_k, "s", dhtget( reply_n, "post" + reply_k, "s",
function(postLi, postFromJson) { function(postLi, postFromJson) {
var newStreamPost = postToElem(postFromJson, "related"); if (postFromJson) {
newStreamPost.hide(); postLi.find('textarea').textcomplete('destroy'); // FIXME maybe we need to reset position instead (but curently it's cheaper)
postLi.before(newStreamPost); var newStreamPost = postToElem(postFromJson, "related");
newStreamPost.slideDown("fast"); newStreamPost.hide();
$.MAL.relatedPostLoaded(); postLi.before(newStreamPost);
requestRepliedBefore(newStreamPost); newStreamPost.slideDown("fast");
}, postLi); $.MAL.relatedPostLoaded();
requestRepliedBefore(newStreamPost);
}
}, postLi);
} }
} }
@ -150,7 +153,7 @@ var profilePostsLoading = false;
function requestPost(containerToAppend,username,resource,cbFunc,cbArgs){ function requestPost(containerToAppend,username,resource,cbFunc,cbArgs){
console.log('dhtget '+username+' '+resource); //console.log('dhtget '+username+' '+resource);
dhtget( username, resource, "s", dhtget( username, resource, "s",
function(args, postFromJson) { function(args, postFromJson) {

1
theme_calm/css/style.css

@ -1017,6 +1017,7 @@ textarea.splited-post {
color: rgba( 255, 255, 255, 1 ); color: rgba( 255, 255, 255, 1 );
border-bottom: solid 1px rgba( 69, 71, 77, .1 ); border-bottom: solid 1px rgba( 69, 71, 77, .1 );
margin: 0 0 5px 0; margin: 0 0 5px 0;
padding-left: 10px;
background: #7691ce; background: #7691ce;
border-radius: 2px; border-radius: 2px;
} }

5
theme_nin/css/style.css

@ -1911,6 +1911,8 @@ button.disabled:hover, .mini-profile-actions span.disabled:hover, a.button.disab
right: -10px; right: -10px;
width: 250px; width: 250px;
overflow: hidden; overflow: hidden;
border-bottom: solid 2px #B4C669;
box-shadow: 8px 10px 15px 0px rgba(0,0,0, .3);
} }
/* line 85, ../sass/style.sass */ /* line 85, ../sass/style.sass */
@ -3199,9 +3201,8 @@ ul.dropdown-menu {
margin: 2px 0 0; margin: 2px 0 0;
list-style: none; list-style: none;
background-color: #fff; background-color: #fff;
border: 1px solid rgba(0, 0, 0, 0.2);
border-bottom: solid 2px #B4C669; border-bottom: solid 2px #B4C669;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 8px 10px 10px 0px rgba(0,0,0, .2);
} }
/* line 1105, ../sass/style.sass */ /* line 1105, ../sass/style.sass */

4
theme_nin/sass/style.sass

@ -82,6 +82,8 @@
right: -10px right: -10px
width: 250px width: 250px
overflow: hidden overflow: hidden
border-bottom: solid 2px #B4C669
box-shadow: 8px 10px 15px 0px rgba(0,0,0, .3)
.userMenu-search .dialog-modal:after .userMenu-search .dialog-modal:after
right: auto right: auto
@ -1131,7 +1133,7 @@ ul.dropdown-menu
background-color: #fff background-color: #fff
border: 1px solid rgba(0, 0, 0, 0.2) border: 1px solid rgba(0, 0, 0, 0.2)
border-bottom: solid 2px #B4C669 border-bottom: solid 2px #B4C669
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2) box-shadow: 8px 10px 10px 0px rgba(0,0,0, .2)
li li
> li > a > li > a
padding: 3px 20px padding: 3px 20px

Loading…
Cancel
Save