twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-03-13 05:51:03 +00:00
Code Issues Projects Releases Wiki Activity

fix of window resize things, set font size to follow button, remove instead detach on modal closing

Browse Source
This commit is contained in:
Simon Grim 2015-03-09 12:21:06 +05:00
parent b7876a71dc
commit 8178c6e5f8
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/style.css
View File

@ -124,10 +124,12 @@ button.follow, button.unfollow, .following-list button.private {
background: none; background: none;
border: solid 1px rgba( 0, 0, 0, .2 ); border: solid 1px rgba( 0, 0, 0, .2 );
padding: 3px 15px; padding: 3px 15px;
font-size: 12px;
} }
.following-list .public-following { .following-list .public-following {
padding: 4px 16px; padding: 4px 16px;
font-size: 12px;
} }
.following-list .public-following:hover { .following-list .public-following:hover {

9
js/interface_common.js
View File

@ -48,7 +48,7 @@ function closeModalHandler($this)
$modalWindows.fadeOut( "fast", function() $modalWindows.fadeOut( "fast", function()
{ {
$modalWindows.detach(); $modalWindows.remove();
}); });
$body.css({ $body.css({
"overflow": "auto", "overflow": "auto",
@ -86,7 +86,7 @@ function closePrompt()
$modalWindows.fadeOut( "fast", function() $modalWindows.fadeOut( "fast", function()
{ {
$modalWindows.detach(); $modalWindows.remove();
}); });
$body.css({ $body.css({
"overflow": "auto", "overflow": "auto",
@ -1448,13 +1448,13 @@ function replaceDashboards() {
$('.wrapper').addClass('w1200'); $('.wrapper').addClass('w1200');
$('.userMenu').addClass('w1200'); $('.userMenu').addClass('w1200');
var wf = $('.module.who-to-follow'); var wf = $('.module.who-to-follow');
wf.remove(); wf.detach();
wf.appendTo($('.dashboard.right')); wf.appendTo($('.dashboard.right'));
} else if ($(window).width() < 1200 && $('.wrapper').hasClass('w1200')) { } else if ($(window).width() < 1200 && $('.wrapper').hasClass('w1200')) {
$('.wrapper').removeClass('w1200'); $('.wrapper').removeClass('w1200');
$('.userMenu').removeClass('w1200'); $('.userMenu').removeClass('w1200');
var wf = $('.module.who-to-follow'); var wf = $('.module.who-to-follow');
wf.remove(); wf.detach();
$('.module.mini-profile').after(wf); $('.module.mini-profile').after(wf);
} }
@ -1523,6 +1523,7 @@ function initInterfaceCommon() {
$( ".mentions-from-user").bind( "click", openMentionsModal ); $( ".mentions-from-user").bind( "click", openMentionsModal );
replaceDashboards(); replaceDashboards();
$( window ).resize(replaceDashboards);
$('.tox-ctc').on('click', function(){ $('.tox-ctc').on('click', function(){
window.prompt(polyglot.t('copy_to_clipboard'), $(this).attr('data')) window.prompt(polyglot.t('copy_to_clipboard'), $(this).attr('data'))

1
js/interface_home.js
View File

@ -149,7 +149,6 @@ var InterfaceFunctions = function()
//*********************************************** //***********************************************
var interfaceFunctions = new InterfaceFunctions; var interfaceFunctions = new InterfaceFunctions;
$( document ).ready( interfaceFunctions.init ); $( document ).ready( interfaceFunctions.init );
$( window ).resize(replaceDashboards);
//função no window que fixa o header das postagens //função no window que fixa o header das postagens
function fixDiv() function fixDiv()

2
theme_calm/css/style.css
View File

@ -135,10 +135,12 @@ button.follow, button.unfollow, .following-list button.private {
background: none; background: none;
border: solid 1px rgba( 0, 0, 0, .2 ); border: solid 1px rgba( 0, 0, 0, .2 );
padding: 3px 15px; padding: 3px 15px;
font-size: 12px;
} }
.following-list .public-following { .following-list .public-following {
padding: 4px 16px; padding: 4px 16px;
font-size: 12px;
} }
.following-list .public-following:hover { .following-list .public-following:hover {