Browse Source

#fix of group profile modal to show scroll-bar if member list doesn't fit on window

master
Simon Grim 9 years ago
parent
commit
7339ef71e5
  1. 4
      css/profile.css
  2. 25
      js/interface_common.js
  3. 4
      theme_calm/css/profile.css
  4. 4
      theme_nin/css/style.css
  5. 3
      theme_nin/sass/_profile.sass

4
css/profile.css

@ -281,6 +281,10 @@
} }
*/ */
.profile-modal .members {
overflow-y: auto;
}
h1.profile-name { h1.profile-name {
display: inline; display: inline;
} }

25
js/interface_common.js

@ -171,11 +171,13 @@ function openGroupProfileModalWithNameHandler(groupAlias) {
getFullname(ret.members[i], item.find('.twister-user-full')); getFullname(ret.members[i], item.find('.twister-user-full'));
getBio(ret.members[i], item.find('.bio')); getBio(ret.members[i], item.find('.bio'));
} }
elemFitNextIntoParentHeight(req.modal.content.find('.profile-card'));
} }
}, {modal: modal} }, {modal: modal}
); );
elemFitNextIntoParentHeight(modal.content.find('.profile-card'));
} }
function openUserProfileModalWithNameHandler(username) { function openUserProfileModalWithNameHandler(username) {
@ -201,13 +203,11 @@ function openUserProfileModalWithNameHandler(username) {
button.on('click', userClickFollow); button.on('click', userClickFollow);
} }
elemFitNextIntoParentHeight(modal.content.find('.profile-card'));
var postboard = modal.content.find('.postboard'); var postboard = modal.content.find('.postboard');
var postboardHeight = modal.content.outerHeight() - modal.content.find('.profile-card').outerHeight(); postboard.find('ol').outerHeight(postboard.actual('height')
if (postboardHeight > 0) { // FIXME actually it's here to exclude nin theme - postboard.find('h2').actual('outerHeight', {includeMargin: true}));
postboard.outerHeight(postboardHeight)
.find('ol').outerHeight(postboard.outerHeight() - postboard.find('h2').outerHeight() - 20); // FIXME 20px for margin, need to fix CSS for it
} else
postboard.outerHeight(modal.content.outerHeight());
} }
function openHashtagModalFromSearchHandler(hashtag) { function openHashtagModalFromSearchHandler(hashtag) {
@ -1590,6 +1590,17 @@ function killInterfaceModule(module) {
$('.module.'+module).empty().hide(); $('.module.'+module).empty().hide();
} }
function elemFitNextIntoParentHeight(elem) {
var parent = elem.parent();
var elemNext = elem.nextAll();
var elemNextHeight = parent.actual('height') - elem.actual('outerHeight', {includeMargin: true});
if (elemNextHeight > 0) // FIXME actually it's here because of nin theme's two vertical columns layout of profile modal
elemNext.outerHeight(elemNextHeight);
else
elemNext.outerHeight(parent.actual('outerHeight'));
}
function inputEnterActivator(event) { function inputEnterActivator(event) {
var elemEvent = $(event.target); var elemEvent = $(event.target);
elemEvent.parents(event.data.parentSelector).find(event.data.enterSelector) elemEvent.parents(event.data.parentSelector).find(event.data.enterSelector)

4
theme_calm/css/profile.css

@ -356,6 +356,10 @@
} }
*/ */
.profile-modal .members {
overflow-y: auto;
}
h1.profile-name { h1.profile-name {
display: inline; display: inline;
} }

4
theme_nin/css/style.css

@ -461,6 +461,10 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
padding: 0; padding: 0;
} }
.profile-modal .modal-content .members {
overflow-y: auto;
}
/* line 76, ../sass/_profile.sass */ /* line 76, ../sass/_profile.sass */
.profile-modal h2.profile-screen-name { .profile-modal h2.profile-screen-name {
display: block; display: block;

3
theme_nin/sass/_profile.sass

@ -67,6 +67,9 @@ $modal-postboard-post-height: 100%
margin: 0 margin: 0
padding: 0 padding: 0
.members
overflow-y: auto
.profile-modal .profile-modal
h2.profile-screen-name h2.profile-screen-name
display: block display: block

Loading…
Cancel
Save