From 8178c6e5f81dae75478c36339a7755083708a321 Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Mon, 9 Mar 2015 12:21:06 +0500 Subject: [PATCH 1/9] fix of window resize things, set font size to follow button, remove instead detach on modal closing --- css/style.css | 2 ++ js/interface_common.js | 9 +++++---- js/interface_home.js | 1 - theme_calm/css/style.css | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/css/style.css b/css/style.css index 6b5453f..553264a 100644 --- a/css/style.css +++ b/css/style.css @@ -124,10 +124,12 @@ button.follow, button.unfollow, .following-list button.private { background: none; border: solid 1px rgba( 0, 0, 0, .2 ); padding: 3px 15px; + font-size: 12px; } .following-list .public-following { padding: 4px 16px; + font-size: 12px; } .following-list .public-following:hover { diff --git a/js/interface_common.js b/js/interface_common.js index 37519bd..8da5b02 100644 --- a/js/interface_common.js +++ b/js/interface_common.js @@ -48,7 +48,7 @@ function closeModalHandler($this) $modalWindows.fadeOut( "fast", function() { - $modalWindows.detach(); + $modalWindows.remove(); }); $body.css({ "overflow": "auto", @@ -86,7 +86,7 @@ function closePrompt() $modalWindows.fadeOut( "fast", function() { - $modalWindows.detach(); + $modalWindows.remove(); }); $body.css({ "overflow": "auto", @@ -1448,13 +1448,13 @@ function replaceDashboards() { $('.wrapper').addClass('w1200'); $('.userMenu').addClass('w1200'); var wf = $('.module.who-to-follow'); - wf.remove(); + wf.detach(); wf.appendTo($('.dashboard.right')); } else if ($(window).width() < 1200 && $('.wrapper').hasClass('w1200')) { $('.wrapper').removeClass('w1200'); $('.userMenu').removeClass('w1200'); var wf = $('.module.who-to-follow'); - wf.remove(); + wf.detach(); $('.module.mini-profile').after(wf); } @@ -1523,6 +1523,7 @@ function initInterfaceCommon() { $( ".mentions-from-user").bind( "click", openMentionsModal ); replaceDashboards(); + $( window ).resize(replaceDashboards); $('.tox-ctc').on('click', function(){ window.prompt(polyglot.t('copy_to_clipboard'), $(this).attr('data')) diff --git a/js/interface_home.js b/js/interface_home.js index b9e7df2..1504bee 100644 --- a/js/interface_home.js +++ b/js/interface_home.js @@ -149,7 +149,6 @@ var InterfaceFunctions = function() //*********************************************** var interfaceFunctions = new InterfaceFunctions; $( document ).ready( interfaceFunctions.init ); -$( window ).resize(replaceDashboards); //função no window que fixa o header das postagens function fixDiv() diff --git a/theme_calm/css/style.css b/theme_calm/css/style.css index a45c5b2..d81a177 100644 --- a/theme_calm/css/style.css +++ b/theme_calm/css/style.css @@ -135,10 +135,12 @@ button.follow, button.unfollow, .following-list button.private { background: none; border: solid 1px rgba( 0, 0, 0, .2 ); padding: 3px 15px; + font-size: 12px; } .following-list .public-following { padding: 4px 16px; + font-size: 12px; } .following-list .public-following:hover { From 61c329efedbe4dacdaf72b36ae8ed7112afefdfb Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Mon, 9 Mar 2015 21:55:42 +0500 Subject: [PATCH 2/9] deleting posts on unfollowing and exlude user from further getposts calls --- js/interface_home.js | 4 ++++ js/twister_following.js | 23 +++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/js/interface_home.js b/js/interface_home.js index 1504bee..8effe53 100644 --- a/js/interface_home.js +++ b/js/interface_home.js @@ -139,6 +139,10 @@ var InterfaceFunctions = function() }) .on("eventUnfollow", function(e, user) { $(".following-count").text(followingUsers.length-1); + $('.wrapper .postboard .post').each( function() { + if ($(this).find('[data-screen-name="'+user+'"]').length && !$(this).find(".post-retransmited-by").text()) + $( this ).remove(); + }); }); } } diff --git a/js/twister_following.js b/js/twister_following.js index 453fa61..2e50e99 100644 --- a/js/twister_following.js +++ b/js/twister_following.js @@ -86,11 +86,17 @@ TwisterFollowing.prototype = { //activate updating for only one user... i = followingUsers.indexOf(username); - if (i > -1) + if (i > -1) { oneshot = true; - else if (typeof(this.followingsFollowings[username]) !== 'undefined') { - delete this.followingsFollowings[username]; - this.save(); + } else { + if (typeof(this.followingsFollowings[username]) !== 'undefined') { + delete this.followingsFollowings[username]; + this.save(); + } + if (username in _idTrackerMap) + delete _idTrackerMap[username]; + if (username in _lastHaveMap) + delete _lastHaveMap[username]; return; } } @@ -105,6 +111,15 @@ TwisterFollowing.prototype = { if (updated) this.save(); + for (var user in _idTrackerMap) { + if (followingUsers.indexOf(user) < 0) + delete _idTrackerMap[user]; + } + for (var user in _lastHaveMap) { + if (followingUsers.indexOf(user) < 0) + delete _lastHaveMap[user]; + } + for (; i < followingUsers.length; i++) { var ctime = new Date().getTime() / 1000; From 33bea37ae0403c511acffe8cb3e86002f73c2d4b Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Tue, 10 Mar 2015 22:23:28 +0500 Subject: [PATCH 3/9] improve of timeline updates, fix of follow button event handler --- js/interface_common.js | 6 ++---- js/interface_home.js | 12 +++++++++-- js/mobile_abstract.js | 6 +++--- js/twister_actions.js | 4 ++-- js/twister_following.js | 5 +++-- js/twister_timeline.js | 45 +++++++++++++++++++++++++++-------------- 6 files changed, 50 insertions(+), 28 deletions(-) diff --git a/js/interface_common.js b/js/interface_common.js index 8da5b02..028c180 100644 --- a/js/interface_common.js +++ b/js/interface_common.js @@ -590,7 +590,7 @@ function toggleFollowButton(username, toggleUnfollow, bindFunc) { .unbind("click") .bind("click", (function(e) { - userClickFollow; + userClickFollow(e); if (this.bindFunc) this.bindFunc; @@ -855,9 +855,8 @@ function replyTextKeypress(e) { tweetAction.click(); } } - }else if( !$.Options.keyEnterToSend() ){ + } else if( !$.Options.keyEnterToSend() ){ if (e.keyCode === 13 && (e.metaKey || e.ctrlKey)) { - $this.val($this.val().trim()); if( !tweetAction.hasClass("disabled") ) { tweetAction.click(); @@ -1367,7 +1366,6 @@ var postSubmit = function(e, oldLastPostId) if($this.closest('.post-area,.post-reply-content')){ $('.post-area-new').removeClass('open').find('textarea').blur(); }; - setTimeout('requestTimelineUpdate("latest",postsPerRefresh,followingUsers,promotedPostsOnly)', 1000); $replyText.data("unicodeConversionStack", []); $replyText.data("disabledUnicodeRules", []); } diff --git a/js/interface_home.js b/js/interface_home.js index 8effe53..ff8b208 100644 --- a/js/interface_home.js +++ b/js/interface_home.js @@ -14,11 +14,19 @@ var InterfaceFunctions = function() this.init = function() { $( ".wrapper .postboard-news").click(function() { - requestTimelineUpdate("latest",postsPerRefresh,followingUsers,promotedPostsOnly);}); + var newPosts = parseInt($(".userMenu .menu-news").text()); + if (!newPosts) + newPosts = postsPerRefresh; + requestTimelineUpdate("latest",newPosts,followingUsers,promotedPostsOnly); + }); // Add refresh posts for home link in menu $( ".userMenu-home.current a").click(function() { - requestTimelineUpdate("latest",postsPerRefresh,followingUsers,promotedPostsOnly);}); + var newPosts = parseInt($(".userMenu .menu-news").text()); + if (!newPosts) + newPosts = postsPerRefresh; + requestTimelineUpdate("latest",newPosts,followingUsers,promotedPostsOnly); + }); $( ".promoted-posts-only").click(function() { promotedPostsOnly = !promotedPostsOnly; diff --git a/js/mobile_abstract.js b/js/mobile_abstract.js index 2e8bced..3346188 100644 --- a/js/mobile_abstract.js +++ b/js/mobile_abstract.js @@ -104,9 +104,9 @@ var MAL = function() newTweetsBarMenu.addClass("show"); if ($.Options.getShowDesktopNotifPostsOpt() === 'enable') { - this.showDesktopNotif(false, polyglot.t('You got')+' '+polyglot.t("new_posts", newPosts)+' '+polyglot.t('in postboard')+'.', false,'twister_notification_new_posts', $.Options.getShowDesktopNotifPostsTimerOpt(), function() { - requestTimelineUpdate("latest",postsPerRefresh,followingUsers,promotedPostsOnly); - }, false) + this.showDesktopNotif(false, polyglot.t('You got')+' '+polyglot.t('new_posts', newPosts)+' '+polyglot.t('in postboard')+'.', false,'twister_notification_new_posts', $.Options.getShowDesktopNotifPostsTimerOpt(), (function() { + requestTimelineUpdate('latest',this,followingUsers,promotedPostsOnly); + }).bind(newPosts), false) } } else { newTweetsBar.hide(); diff --git a/js/twister_actions.js b/js/twister_actions.js index b0cb36e..dfbeb7d 100644 --- a/js/twister_actions.js +++ b/js/twister_actions.js @@ -224,7 +224,6 @@ function requestPostRecursively(containerToAppend,username,resource,count,useGet } } - function newPostMsg(msg, $postOrig) { if( lastPostId != undefined ) { var params = [defaultScreenName, lastPostId + 1, msg] @@ -236,6 +235,7 @@ function newPostMsg(msg, $postOrig) { function(arg, ret) { incLastPostId(); }, null, function(arg, ret) { var msg = ("message" in ret) ? ret.message : ret; alert(polyglot.t("ajax_error", { error: msg })); }, null); + setTimeout('requestTimelineUpdate("latest",1,["'+defaultScreenName+'"],promotedPostsOnly)', 1000); } else { alert(polyglot.t("Internal error: lastPostId unknown (following yourself may fix!)")); } @@ -256,7 +256,7 @@ function newRtMsg($postOrig) { function(arg, ret) { incLastPostId(); }, null, function(arg, ret) { var msg = ("message" in ret) ? ret.message : ret; alert(polyglot.t("ajax_error", { error: msg })); }, null); - setTimeout('requestTimelineUpdate("latest",postsPerRefresh,followingUsers,promotedPostsOnly)', 1000); + setTimeout('requestTimelineUpdate("latest",1,["'+defaultScreenName+'"],promotedPostsOnly)', 1000); } else { alert(polyglot.t("Internal error: lastPostId unknown (following yourself may fix!)")); } diff --git a/js/twister_following.js b/js/twister_following.js index 2e50e99..60ee65a 100644 --- a/js/twister_following.js +++ b/js/twister_following.js @@ -366,6 +366,7 @@ function updateFollowing(cbFunc, cbArg) { // it is safe to call this even if username is already in followingUsers. // may also be used to set/clear publicFollow. function follow(user, publicFollow, cbFunc, cbArg) { + //console.log('we are following @'+user); if( followingUsers.indexOf(user) < 0 ) { followingUsers.push(user); twisterFollowingO.update(user); @@ -380,6 +381,7 @@ function follow(user, publicFollow, cbFunc, cbArg) { // unfollow a single user function unfollow(user, cbFunc, cbArg) { + //console.log('we are not following @'+user+' anymore'); var i = followingUsers.indexOf(user); if( i >= 0 ) { followingUsers.splice(i,1); @@ -696,8 +698,7 @@ function userClickFollow(e) { e.stopPropagation(); e.preventDefault(); - var $this = $(this); - var $userInfo = $this.closest("[data-screen-name]"); + var $userInfo = $(e.target).closest("[data-screen-name]"); var username = $userInfo.attr("data-screen-name"); if(!defaultScreenName) diff --git a/js/twister_timeline.js b/js/twister_timeline.js index 3ebbf02..23aaa05 100644 --- a/js/twister_timeline.js +++ b/js/twister_timeline.js @@ -79,6 +79,7 @@ function requestObj(users, mode, count, getspam) this.mode = mode; // 'latest', 'latestFirstTime' or 'older' this.count = count; this.getspam = getspam; + this.updateReportNewPosts = (users.toString() === defaultScreenName || mode === 'older') ? false : true; // getRequest method returns the list parameter expected by getposts rpc this.getRequest = function() { @@ -111,10 +112,17 @@ function requestObj(users, mode, count, getspam) // doneReportProcessing is called after an getposts response is processed // mode changing may require a new request (to fill gaps) this.doneReportProcessing = function(receivedCount) { - if( this.mode == 'latest') this.mode = 'fillgap'; - if( this.mode == 'latestFirstTime') this.mode = 'done'; - if( this.mode == 'older') this.mode = 'done'; - if( receivedCount < this.count ) this.mode = 'done'; + if (receivedCount === this.count) { + this.mode = 'done'; + } else { + if (this.mode === 'latest' || this.mode === 'latestFirstTime') { + this.mode = 'fillgap'; + } else if (this.mode === 'fillgap') { + this.mode = 'older'; + } else if (this.mode === 'older') + this.mode = 'done'; + } + //console.log('we got '+receivedCount+' posts from requested '+this.count+', status of processing is "'+this.mode+'"'); } } @@ -197,25 +205,36 @@ function processReceivedPosts(req, posts) } req.reportProcessedPost(post["userpost"]["n"],post["userpost"]["k"], streamPostAppended); } - req.doneReportProcessing(posts.length); + req.doneReportProcessing(p2a); + + if (req.updateReportNewPosts) { + _newPostsPending = 0; // FIXME maybe we need updating here instead this zeroing + $.MAL.reportNewPosts(_newPostsPending); + } - //if the count of posts less then 5.... - if( req.mode == "done" && p2a > 5) { + //if the count of recieved posts less then or equals to requested... + if (req.mode === 'done') { timelineLoaded = true; $.MAL.postboardLoaded(); _refreshInProgress = false; - $(window).scroll(); } else { //we will request more older post... - req.count += postsPerRefresh; - req.mode = 'older'; - requestGetposts(req); + req.count -= p2a; + if (req.count > 0) { + //console.log('we are requesting '+req.count+' more posts...'); + requestGetposts(req); + } else { + timelineLoaded = true; + $.MAL.postboardLoaded(); + _refreshInProgress = false; + } } } // request timeline update for a given list of users function requestTimelineUpdate(mode, count, timelineUsers, getspam) { + //console.log(mode+' timeline update request: '+count+' posts for following users - '+timelineUsers); if( _refreshInProgress || !defaultScreenName) return; $.MAL.postboardLoading(); @@ -226,10 +245,6 @@ function requestTimelineUpdate(mode, count, timelineUsers, getspam) } else { console.log("requestTimelineUpdate: not following any users"); } - if( mode == "latest" || mode == "latestFirstTime" ) { - _newPostsPending = 0; - $.MAL.reportNewPosts(0); - } } // getlasthave is called every second to check if followed users have posted anything new From 64e85c36010e5e97e7fda04d177b92d46faeaab0 Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Tue, 10 Mar 2015 23:36:09 +0500 Subject: [PATCH 4/9] deleting user self-retwisted posts when unfollow, fix of follow button placement in who-to-follow, workaround checks of in TwisterFollowing.update --- css/style.css | 9 +++++---- js/interface_home.js | 3 ++- js/twister_following.js | 22 ++++++++++++---------- theme_calm/css/style.css | 9 +++++---- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/css/style.css b/css/style.css index 553264a..6f0dd96 100644 --- a/css/style.css +++ b/css/style.css @@ -145,9 +145,9 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover } .follow-suggestions .follow, .follow-suggestions .unfollow { - display: block; - position: relative; - left: 50%; + display: inline-block; + float: right; + margin-right: 10px; } /************************************* @@ -702,7 +702,8 @@ textarea.splited-post { .twister-user { clear: both; - padding-bottom: 10px; + overflow: hidden; + padding-bottom: 4px; margin-top: 4px; border-bottom: solid 1px rgba( 69, 71, 77, .1 ); border-top: solid 1px rgba( 69, 71, 77, .1 ); diff --git a/js/interface_home.js b/js/interface_home.js index ff8b208..436cca1 100644 --- a/js/interface_home.js +++ b/js/interface_home.js @@ -148,7 +148,8 @@ var InterfaceFunctions = function() .on("eventUnfollow", function(e, user) { $(".following-count").text(followingUsers.length-1); $('.wrapper .postboard .post').each( function() { - if ($(this).find('[data-screen-name="'+user+'"]').length && !$(this).find(".post-retransmited-by").text()) + if ($(this).find('[data-screen-name="'+user+'"]').length + && (!$(this).find(".post-retransmited-by").text() || $(this).find(".post-retransmited-by").text() == '@'+user)) $( this ).remove(); }); }); diff --git a/js/twister_following.js b/js/twister_following.js index 60ee65a..71308c4 100644 --- a/js/twister_following.js +++ b/js/twister_following.js @@ -93,9 +93,9 @@ TwisterFollowing.prototype = { delete this.followingsFollowings[username]; this.save(); } - if (username in _idTrackerMap) + if (typeof _idTrackerMap !== 'undefined' && username in _idTrackerMap) delete _idTrackerMap[username]; - if (username in _lastHaveMap) + if (typeof _lastHaveMap !== 'undefined' && username in _lastHaveMap) delete _lastHaveMap[username]; return; } @@ -111,14 +111,16 @@ TwisterFollowing.prototype = { if (updated) this.save(); - for (var user in _idTrackerMap) { - if (followingUsers.indexOf(user) < 0) - delete _idTrackerMap[user]; - } - for (var user in _lastHaveMap) { - if (followingUsers.indexOf(user) < 0) - delete _lastHaveMap[user]; - } + if (typeof _idTrackerMap !== 'undefined') + for (var user in _idTrackerMap) { + if (followingUsers.indexOf(user) < 0) + delete _idTrackerMap[user]; + } + if (typeof _lastHaveMap !== 'undefined') + for (var user in _lastHaveMap) { + if (followingUsers.indexOf(user) < 0) + delete _lastHaveMap[user]; + } for (; i < followingUsers.length; i++) { var ctime = new Date().getTime() / 1000; diff --git a/theme_calm/css/style.css b/theme_calm/css/style.css index d81a177..3b69a14 100644 --- a/theme_calm/css/style.css +++ b/theme_calm/css/style.css @@ -166,9 +166,9 @@ button.unfollow:hover { } .follow-suggestions .follow, .follow-suggestions .unfollow { - display: block; - position: relative; - left: 50%; + display: inline-block; + float: right; + margin-right: 10px; } /************************************* @@ -892,7 +892,8 @@ textarea.splited-post { .twister-user { clear: both; - padding-bottom: 10px; + overflow: hidden; + padding-bottom: 4px; margin-top: 4px; border-bottom: solid 1px rgba( 69, 71, 77, .1 ); border-top: solid 1px rgba( 69, 71, 77, .1 ); From dd9f6bcc63d13086b4b63c936974406467e2282b Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Tue, 10 Mar 2015 23:55:29 +0500 Subject: [PATCH 5/9] deleting all user retwisted posts when unfollow --- js/interface_home.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/interface_home.js b/js/interface_home.js index 436cca1..6edd06a 100644 --- a/js/interface_home.js +++ b/js/interface_home.js @@ -148,8 +148,8 @@ var InterfaceFunctions = function() .on("eventUnfollow", function(e, user) { $(".following-count").text(followingUsers.length-1); $('.wrapper .postboard .post').each( function() { - if ($(this).find('[data-screen-name="'+user+'"]').length - && (!$(this).find(".post-retransmited-by").text() || $(this).find(".post-retransmited-by").text() == '@'+user)) + if (($(this).find('[data-screen-name="'+user+'"]').length && !$(this).find(".post-retransmited-by").text()) + || $(this).find(".post-retransmited-by").text() == '@'+user) $( this ).remove(); }); }); From 473fdb8c24ab882d8304bf031d6371830bc5355e Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Wed, 11 Mar 2015 00:07:56 +0500 Subject: [PATCH 6/9] deleted notification of mention that is appearing too late --- js/twister_newmsgs.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/twister_newmsgs.js b/js/twister_newmsgs.js index 9b499db..a143198 100644 --- a/js/twister_newmsgs.js +++ b/js/twister_newmsgs.js @@ -98,10 +98,12 @@ function requestMentionsCount() { if( _newMentionsUpdated ) { _newMentionsUpdated = false; - $.MAL.soundNotifyMentions(); + if ( _newMentions ) { + $.MAL.soundNotifyMentions(); - if ($.Options.getShowDesktopNotifMentionsOpt() === 'enable') { - $.MAL.showDesktopNotif(false, polyglot.t('You got')+' '+polyglot.t('new_mentions', _newMentions)+'.', false,'twister_notification_new_mentions', $.Options.getShowDesktopNotifMentionsTimerOpt(), function(){$.MAL.showMentions(defaultScreenName)}, false) + if ($.Options.getShowDesktopNotifMentionsOpt() === 'enable') { + $.MAL.showDesktopNotif(false, polyglot.t('You got')+' '+polyglot.t('new_mentions', _newMentions)+'.', false,'twister_notification_new_mentions', $.Options.getShowDesktopNotifMentionsTimerOpt(), function(){$.MAL.showMentions(defaultScreenName)}, false) + } } } From bded3079ef6d069ff1133f5537e87560c92820b6 Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Thu, 12 Mar 2015 23:36:43 +0500 Subject: [PATCH 7/9] tweaking of CSS for login and following pages in original theme --- css/style.css | 97 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 86 insertions(+), 11 deletions(-) diff --git a/css/style.css b/css/style.css index 6f0dd96..de446d6 100644 --- a/css/style.css +++ b/css/style.css @@ -526,9 +526,8 @@ button.follow:hover, button.unfollow:hover, .following-list button.private:hover { color: #e34f42; cursor: pointer; - font-size: 14px; + font-size: 12px; display: inline-block; - width: 70px; transition: all .2s linear; } .mini-profile-actions ul @@ -1251,9 +1250,74 @@ ol.toptrends-list { float: right; margin-right: 18px; } + /************************************* -**************************** POPUP MODAL +************* LOGIN PAGE ************* **************************************/ + +.login .module { + display: block; + width: 720px; + padding: 32px 40px; + margin: 8px auto; +} + +.login .module p { + margin-bottom: 5px; +} + +.login .module input { + padding: 5px 10px; + background: #f3f3f3; + border: solid 1px #dcdcdc; + transition: box-shadow 0.3s, border 0.3s; + font-size: 14px; +} + +.login .module input:focus, .login .module select:focus { + background: #fff; + transition: background-color 100ms linear; + border: solid 1px rgba( 227, 79, 66, .5 ); + box-shadow: 0 0 10px rgba(0, 0, 0, .3 ); +} + +.login .module select { + height: 30px; + padding: 3px 30px 3px 10px; + margin: 0; + border: 1px solid #ccc; + font-size: 14px; +} + +.login .module span.availability { + margin-left: 10px; + color: #45474d; +} + +.with-nickname, .import-secret-key, .create-user { + margin-top: 10px; +} + +.login .module:nth-child(2) div , +.login .module:nth-child(3) div:nth-child(2), +.login .secret-key-import, +.login .username-import { + margin-top: 20px; + margin-bottom: 20px; + margin-left: 16px; +} + +.login .create-user, +.login .import-secret-key { + display: block; + margin-left: auto; + margin-right: 16px; +} + +/************************************* +************* POPUP MODAL ************ +**************************************/ + .modal-blackout { position: fixed; @@ -1831,11 +1895,11 @@ ol.toptrends-list { .following ol.following-list > li{ width: 425px; - height: 150px; + height: 160px; margin: 5px; padding: 8px; float: left; - border: 0; + border: solid 1px rgba( 69, 71, 77, .1 ); background: #fff; } @@ -1844,21 +1908,32 @@ ol.toptrends-list { } .following ol.following-list > li:hover{ - background: #fefef1; + border: solid 1px rgba( 227, 79, 66, .5 ); +} + +.following-list .mini-screen-name { + position: absolute; + top: 32px; } .following-list .following-config { + width: 100%; position: absolute; - left: 30%; - top: 69px; + top: 64px; + text-align: center; +} + +.following-list .following-config button +{ + display: inline-block; } .following-list .mini-profile-actions { position: absolute; top: 0; - right: 0; + right: 8px; z-index: 10; } @@ -1867,8 +1942,8 @@ ol.toptrends-list { font: 12px "Open Sans", sans-serif; display: block; position: absolute; - top: 110px; - right: 10px; + top: 120px; + right: 8px; } /* Autocomplite*/ From 7b851f4cd8ad98d02ba2f249486fdee68c513aea Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Fri, 13 Mar 2015 02:25:05 +0500 Subject: [PATCH 8/9] tweaking of CSS for login in nin theme, tweaking a bit CSS of all themes --- css/style.css | 40 ++++++++++++++++----- following.html | 2 +- login.html | 2 +- theme_calm/css/style.css | 59 ++++++++++++++++++++++++------ theme_nin/css/style.css | 73 ++++++++++++++++++++++++++++++++++++++ theme_nin/sass/_login.sass | 55 ++++++++++++++++++++++++++++ theme_nin/sass/style.sass | 3 ++ 7 files changed, 214 insertions(+), 20 deletions(-) create mode 100644 theme_nin/sass/_login.sass diff --git a/css/style.css b/css/style.css index de446d6..9025cb3 100644 --- a/css/style.css +++ b/css/style.css @@ -1175,14 +1175,14 @@ ol.toptrends-list { border: solid 1px rgba( 69, 71, 77, .05 ); padding: 10px; } -.singleBlock h2 +.singleBlock h2, .header-bold { font-weight: bold; line-height: 40px; color: rgba( 255, 255, 255, 1 ); font-variant: small-caps; border-bottom: solid 1px rgba( 69, 71, 77, .1 ); - margin: 15px 0 0 0; + margin: 0px 0px 12px 0px; padding-left: 5px; background: #e34f42; } @@ -1255,11 +1255,18 @@ ol.toptrends-list { ************* LOGIN PAGE ************* **************************************/ +.login .header-bold { + display: block; + width: 720px; + margin: 0px auto 12px auto; +} + .login .module { display: block; width: 720px; padding: 32px 40px; margin: 8px auto; + background: #fff; } .login .module p { @@ -1729,8 +1736,9 @@ ol.toptrends-list { } /************************************* -****************** LOADER ************ +**************** LOADER ************** **************************************/ + .postboard-loading { text-align: right; @@ -1847,18 +1855,21 @@ ol.toptrends-list { } /************************************* -****************** OPTIONS *********** +**************** OPTIONS ************* **************************************/ .options .module { - margin: 5px; - padding: 15px; + display: block; + width: 720px; + padding: 32px 40px; + margin: 8px auto; + background: #fff; } .options .container { - margin: 5px 0px 5px 10px; + margin: 8px 0px 8px 16px; } .options .label-h { @@ -1886,7 +1897,20 @@ ol.toptrends-list { -ms-transition: height 1s linear; } -/* Following page */ +/************************************* +*********** FOLLOWING PAGE *********** +**************************************/ + +.following .postboard-loading +{ + text-align: center; +} + +.following .header-bold { + display: block; + width: 100%; + margin: 0px auto 12px auto; +} .following-list { diff --git a/following.html b/following.html index 1395473..28e128a 100644 --- a/following.html +++ b/following.html @@ -146,7 +146,7 @@
-

Following

+

Following