Browse Source

seams to work with defualt theme and calm theme

master
Julian Steinwachs 10 years ago
parent
commit
c09e4199f3
  1. 6
      js/interface_common.js
  2. 1
      theme_nin/css/style.css
  3. 2
      theme_nin/sass/style.sass

6
js/interface_common.js

@ -162,6 +162,7 @@ function newHashtagModal(hashtag) { @@ -162,6 +162,7 @@ function newHashtagModal(hashtag) {
return hashtagModalContent;
}
/*
function openHashtagModal(e)
{
e.stopPropagation();
@ -176,6 +177,7 @@ function openHashtagModalFromSearch(hashtag) @@ -176,6 +177,7 @@ function openHashtagModalFromSearch(hashtag)
{
window.location.hash = '#hashtag?hashtag=' + encodeURIComponent(hashtag);
}
*/
function openHashtagModalFromSearchHandler(hashtag)
{
@ -395,7 +397,7 @@ function watchHashChange(e) @@ -395,7 +397,7 @@ function watchHashChange(e)
//console.log(prevhashdata);
if(prevhashstring.length>0){
if(prevhashstring.length>0 && prevhashstring!=undefined){
$('.modal-back').css('display','inline');
$('.modal-back').on('click', function(){
window.location.hash = '#' + prevhashstring;
@ -1425,7 +1427,7 @@ function initInterfaceCommon() { @@ -1425,7 +1427,7 @@ function initInterfaceCommon() {
$replyText.on("keyup", replyTextKeypress );
$( ".open-profile-modal").bind( "click", openProfileModal );
$( ".open-hashtag-modal").bind( "click", openHashtagModal );
//$( ".open-hashtag-modal").bind( "click", openHashtagModal );
//$( ".open-following-modal").bind( "click", openFollowingModal );
$( ".userMenu-connections a").bind( "click", openMentionsModal );
$( ".mentions-from-user").bind( "click", openMentionsModal );

1
theme_nin/css/style.css

File diff suppressed because one or more lines are too long

2
theme_nin/sass/style.sass

@ -1097,4 +1097,4 @@ ul.dropdown-menu @@ -1097,4 +1097,4 @@ ul.dropdown-menu
transition: all 200ms
@import _responsive
@import _responsive

Loading…
Cancel
Save