Browse Source

back button binding is now in html, seams more robust

master
Julian Steinwachs 10 years ago
parent
commit
3266426eaa
  1. 2
      home.html
  2. 10
      js/interface_common.js
  3. 238
      theme_nin/css/style.css
  4. 1
      theme_nin/js/theme_option.js
  5. 16
      theme_nin/sass/style.sass

2
home.html

@ -330,7 +330,7 @@
<div class="modal-header"> <div class="modal-header">
<h3></h3> <h3></h3>
<span id="closeModal" class="modal-close cancel">&times;</span> <span id="closeModal" class="modal-close cancel">&times;</span>
<span class="modal-back">&lt;</span> <span class="modal-back" onClick="history.back();">&lt;</span>
<span class="mark-all-as-read"></span> <span class="mark-all-as-read"></span>
</div> </div>
<div class="modal-content"></div> <div class="modal-content"></div>

10
js/interface_common.js

@ -413,14 +413,14 @@ function watchHashChange(e)
var prevhashstring=prevurlsplit[1]; var prevhashstring=prevurlsplit[1];
if(prevurlsplit[0]==newurlsplit[0] && prevhashstring!=undefined && prevhashstring.length>0 ){ if(prevurlsplit[0]==newurlsplit[0] && prevhashstring!=undefined && prevhashstring.length>0 ){
$('.modal-back').css('display','inline'); $('.modal-back').css('display','inline');
$('.modal-back').on('click', function(e){ //$('.modal-back').on('click', function(e){
e.stopPropagation(); //e.stopPropagation();
e.preventDefault(); //e.preventDefault();
//window.location.hash = '#' + prevhashstring; //window.location.hash = '#' + prevhashstring;
history.back(1); //window.history.go(-1);
}); //});
} else { } else {
$('.modal-back').css('display','none'); $('.modal-back').css('display','none');
} }

238
theme_nin/css/style.css

@ -56,7 +56,7 @@
font-style: normal; font-style: normal;
} }
/* line 64, ../sass/_fonts.sass */ /* line 64, ../sass/_fonts.sass */
[class^="icon-"]:before, [class*=" icon-"]:before, .extend-icon:before, .userMenu li.userMenu-config > a:before, .post-context span:before, .post-reply:before, .post-propagate:before, .post-favorite:before, .post .show-more:before, .mini-profile-actions span:before, ul.userMenu-search-profiles button:before, ul.userMenu-search-profiles .modal-back:before, .mini-profile-indicators .userMenu-connections a:before, .mini-profile-indicators .userMenu-messages a:before, .mini-profile-indicators .userMenu-user a:before, .twister-user-remove:before, .refresh-users:before, .prompt-close:before, .modal-close:before, .mark-all-as-read:before, .modal-back:before, .icon-down-after:after { [class^="icon-"]:before, [class*=" icon-"]:before, .extend-icon:before, .userMenu li.userMenu-config > a:before, .post-context span:before, .post-reply:before, .post-propagate:before, .post-favorite:before, .post .show-more:before, .mini-profile-actions span:before, ul.userMenu-search-profiles button:before, .mini-profile-indicators .userMenu-connections a:before, .mini-profile-indicators .userMenu-messages a:before, .mini-profile-indicators .userMenu-user a:before, .twister-user-remove:before, .refresh-users:before, .modal-close:before, .mark-all-as-read:before, .modal-back:before, .icon-down-after:after {
font-family: "fontello"; font-family: "fontello";
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@ -115,13 +115,13 @@
/* '' */ /* '' */
/* line 115, ../sass/_fonts.sass */ /* line 115, ../sass/_fonts.sass */
.icon-cancel:before, .twister-user-remove:before, .prompt-close:before, .modal-close:before { .icon-cancel:before, .twister-user-remove:before, .modal-close:before {
content: ""; content: "";
} }
/* '' */ /* '' */
/* line 120, ../sass/_fonts.sass */ /* line 120, ../sass/_fonts.sass */
.icon-plus:before, .mini-profile-actions span:before, ul.userMenu-search-profiles button:before, ul.userMenu-search-profiles .modal-back:before { .icon-plus:before, .mini-profile-actions span:before, ul.userMenu-search-profiles button:before {
content: ""; content: "";
} }
@ -1196,16 +1196,16 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
} }
/* line 52, ../sass/_following.sass */ /* line 52, ../sass/_following.sass */
.following button, .following .mini-profile-actions span, .mini-profile-actions .following span, .following .modal-back { .following button, .following .mini-profile-actions span, .mini-profile-actions .following span {
display: inline-block; display: inline-block;
margin: 5px 0; margin: 5px 0;
} }
/* line 55, ../sass/_following.sass */ /* line 55, ../sass/_following.sass */
.following button.unfollow, .following .mini-profile-actions span.unfollow, .mini-profile-actions .following span.unfollow, .following .unfollow.modal-back { .following button.unfollow, .following .mini-profile-actions span.unfollow, .mini-profile-actions .following span.unfollow {
background-color: #aaa; background-color: #aaa;
} }
/* line 57, ../sass/_following.sass */ /* line 57, ../sass/_following.sass */
.following button.public-following, .following .mini-profile-actions span.public-following, .mini-profile-actions .following span.public-following, .following .public-following.modal-back { .following button.public-following, .following .mini-profile-actions span.public-following, .mini-profile-actions .following span.public-following {
background-color: #B4C669; background-color: #B4C669;
} }
@ -1613,7 +1613,7 @@ h3 .isFollowing:after {
/************** BUTTONS *********** */ /************** BUTTONS *********** */
/* line 65, ../sass/_commons.sass */ /* line 65, ../sass/_commons.sass */
button, .mini-profile-actions span, .modal-back, a.button { button, .mini-profile-actions span, a.button {
padding: 6px 8px; padding: 6px 8px;
font-size: 13px; font-size: 13px;
display: inline-block; display: inline-block;
@ -1640,17 +1640,17 @@ button, .mini-profile-actions span, .modal-back, a.button {
cursor: pointer; cursor: pointer;
} }
/* line 82, ../sass/_commons.sass */ /* line 82, ../sass/_commons.sass */
button:hover, .mini-profile-actions span:hover, .modal-back:hover, a.button:hover { button:hover, .mini-profile-actions span:hover, a.button:hover {
background: #aaa; background: #aaa;
text-shadow: 2px 2px 0 rgba(0, 0, 0, 0.1); text-shadow: 2px 2px 0 rgba(0, 0, 0, 0.1);
} }
/* line 85, ../sass/_commons.sass */ /* line 85, ../sass/_commons.sass */
button.disabled, .mini-profile-actions span.disabled, .disabled.modal-back, a.button.disabled { button.disabled, .mini-profile-actions span.disabled, a.button.disabled {
opacity: 0.5; opacity: 0.5;
background-color: #999; background-color: #999;
} }
/* line 88, ../sass/_commons.sass */ /* line 88, ../sass/_commons.sass */
button.disabled:hover, .mini-profile-actions span.disabled:hover, .disabled.modal-back:hover, a.button.disabled:hover { button.disabled:hover, .mini-profile-actions span.disabled:hover, a.button.disabled:hover {
color: white; color: white;
} }
@ -1850,12 +1850,12 @@ ul.userMenu-search-profiles .mini-profile-info {
float: none; float: none;
} }
/* line 119, ../sass/style.sass */ /* line 119, ../sass/style.sass */
ul.userMenu-search-profiles button, ul.userMenu-search-profiles .mini-profile-actions span, .mini-profile-actions ul.userMenu-search-profiles span, ul.userMenu-search-profiles .modal-back { ul.userMenu-search-profiles button, ul.userMenu-search-profiles .mini-profile-actions span, .mini-profile-actions ul.userMenu-search-profiles span {
background-color: #66686B; background-color: #66686B;
padding: 3px; padding: 3px;
} }
/* line 124, ../sass/style.sass */ /* line 124, ../sass/style.sass */
ul.userMenu-search-profiles button:after, ul.userMenu-search-profiles .mini-profile-actions span:after, .mini-profile-actions ul.userMenu-search-profiles span:after, ul.userMenu-search-profiles .modal-back:after { ul.userMenu-search-profiles button:after, ul.userMenu-search-profiles .mini-profile-actions span:after, .mini-profile-actions ul.userMenu-search-profiles span:after {
content: ""; content: "";
font-family: "fontello"; font-family: "fontello";
} }
@ -2311,14 +2311,14 @@ textarea.splited-post {
} }
/* line 491, ../sass/style.sass */ /* line 491, ../sass/style.sass */
button.follow, .mini-profile-actions span.follow, .follow.modal-back { button.follow, .mini-profile-actions span.follow {
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
right: 10px; right: 10px;
background: #B4C669; background: #B4C669;
} }
/* line 496, ../sass/style.sass */ /* line 496, ../sass/style.sass */
button.follow:hover, .mini-profile-actions span.follow:hover, .follow.modal-back:hover { button.follow:hover, .mini-profile-actions span.follow:hover {
background: #aaa; background: #aaa;
} }
@ -2399,27 +2399,8 @@ ol.toptrends-list a:hover {
margin-left: -300px; margin-left: -300px;
} }
/* line 568, ../sass/style.sass */
.prompt-close {
position: absolute;
right: 10px;
top: 0;
font-size: 14px;
line-height: 40px;
cursor: pointer;
color: rgba(255, 255, 255, 0.7);
}
/* line 578, ../sass/style.sass */
.prompt-close:hover {
color: white;
}
/* line 580, ../sass/style.sass */
.prompt-close b {
display: none;
}
/*********** POPUP MODAL ************* */ /*********** POPUP MODAL ************* */
/* line 584, ../sass/style.sass */ /* line 570, ../sass/style.sass */
.modal-blackout { .modal-blackout {
position: fixed; position: fixed;
width: 100%; width: 100%;
@ -2431,24 +2412,24 @@ ol.toptrends-list a:hover {
z-index: 3; z-index: 3;
} }
/* line 594, ../sass/style.sass */ /* line 580, ../sass/style.sass */
.modal-wrapper { .modal-wrapper {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
overflow: hidden; overflow: hidden;
} }
/* line 599, ../sass/style.sass */ /* line 585, ../sass/style.sass */
.modal-wrapper .post-area-new { .modal-wrapper .post-area-new {
padding: 10px; padding: 10px;
} }
/* line 602, ../sass/style.sass */ /* line 588, ../sass/style.sass */
.modal-content { .modal-content {
background: #f3f2f1; background: #f3f2f1;
padding: 20px; padding: 20px;
} }
/* line 606, ../sass/style.sass */ /* line 592, ../sass/style.sass */
.modal-content .postboard h2 { .modal-content .postboard h2 {
position: fixed; position: fixed;
z-index: 2; z-index: 2;
@ -2457,11 +2438,11 @@ ol.toptrends-list a:hover {
width: 100px; width: 100px;
width: 520px; width: 520px;
} }
/* line 613, ../sass/style.sass */ /* line 599, ../sass/style.sass */
.modal-content .postboard h2 span { .modal-content .postboard h2 span {
display: none; display: none;
} }
/* line 615, ../sass/style.sass */ /* line 601, ../sass/style.sass */
.modal-content .postboard-news { .modal-content .postboard-news {
line-height: 30px; line-height: 30px;
position: absolute; position: absolute;
@ -2475,7 +2456,7 @@ ol.toptrends-list a:hover {
background: #B4C669; background: #B4C669;
} }
/* line 628, ../sass/style.sass */ /* line 614, ../sass/style.sass */
.modal-header { .modal-header {
position: relative; position: relative;
background: #66686B; background: #66686B;
@ -2484,7 +2465,7 @@ ol.toptrends-list a:hover {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
/* line 634, ../sass/style.sass */ /* line 620, ../sass/style.sass */
.modal-header h3 { .modal-header h3 {
font-size: 0.8em; font-size: 0.8em;
line-height: 40px; line-height: 40px;
@ -2495,7 +2476,7 @@ ol.toptrends-list a:hover {
display: block !important; display: block !important;
} }
/* line 643, ../sass/style.sass */ /* line 629, ../sass/style.sass */
.modal-close { .modal-close {
position: absolute; position: absolute;
right: 10px; right: 10px;
@ -2505,16 +2486,16 @@ ol.toptrends-list a:hover {
cursor: pointer; cursor: pointer;
color: rgba(255, 255, 255, 0.7); color: rgba(255, 255, 255, 0.7);
} }
/* line 653, ../sass/style.sass */ /* line 639, ../sass/style.sass */
.modal-close:hover { .modal-close:hover {
color: white; color: white;
} }
/* line 655, ../sass/style.sass */ /* line 641, ../sass/style.sass */
.modal-close b { .modal-close b {
display: none; display: none;
} }
/* line 658, ../sass/style.sass */ /* line 644, ../sass/style.sass */
.mark-all-as-read { .mark-all-as-read {
float: left; float: left;
cursor: pointer; cursor: pointer;
@ -2526,93 +2507,104 @@ ol.toptrends-list a:hover {
display: none; display: none;
} }
/* line 668, ../sass/style.sass */ /* line 654, ../sass/style.sass */
.modal-back:hover, .mark-all-as-read:hover { .modal-back:hover, .mark-all-as-read:hover {
color: #B4C669; color: #B4C669;
} }
/* line 676, ../sass/style.sass */ /* line 662, ../sass/style.sass */
.modal-back { .modal-back {
margin: 0; position: absolute;
background: #B4C669; right: 35px;
display: none !important; top: 0;
float: left; font-size: 14px;
line-height: 40px;
cursor: pointer;
color: rgba(255, 255, 255, 0.7);
}
/* line 672, ../sass/style.sass */
.modal-back:hover {
color: white;
}
/* line 674, ../sass/style.sass */
.modal-back b {
display: none;
} }
/* line 685, ../sass/style.sass */ /* line 677, ../sass/style.sass */
.modal-buttons { .modal-buttons {
padding: 10px; padding: 10px;
text-align: right; text-align: right;
} }
/************ FOLLOWING-CONFIG MODAL ********* */ /************ FOLLOWING-CONFIG MODAL ********* */
/* line 693, ../sass/style.sass */ /* line 685, ../sass/style.sass */
.following-config-modal h2 { .following-config-modal h2 {
text-transform: none; text-transform: none;
} }
/* line 695, ../sass/style.sass */ /* line 687, ../sass/style.sass */
.following-config-modal .modal-wrapper { .following-config-modal .modal-wrapper {
top: 43%; top: 43%;
left: 25%; left: 25%;
width: 50%; width: 50%;
} }
/* line 699, ../sass/style.sass */ /* line 691, ../sass/style.sass */
.following-config-modal .modal-content { .following-config-modal .modal-content {
padding: 10px; padding: 10px;
text-align: center; text-align: center;
background-color: white; background-color: white;
} }
/* line 703, ../sass/style.sass */ /* line 695, ../sass/style.sass */
.following-config-modal .modal-buttons { .following-config-modal .modal-buttons {
display: none; display: none;
} }
/* line 705, ../sass/style.sass */ /* line 697, ../sass/style.sass */
.following-config-method-buttons { .following-config-method-buttons {
padding: 10px; padding: 10px;
} }
/* line 707, ../sass/style.sass */ /* line 699, ../sass/style.sass */
.following-config-method-buttons .public-following { .following-config-method-buttons .public-following {
background-color: #B4C669; background-color: #B4C669;
} }
/************ RETWIST POSTS MODAL ********* */ /************ RETWIST POSTS MODAL ********* */
/* line 713, ../sass/style.sass */ /* line 705, ../sass/style.sass */
.reTwist .modal-wrapper { .reTwist .modal-wrapper {
width: 520px; width: 520px;
top: 20%; top: 20%;
margin: 0 0 0 -260px; margin: 0 0 0 -260px;
} }
/* line 717, ../sass/style.sass */ /* line 709, ../sass/style.sass */
.reTwist .post-expand, .reTwist .post-interactions { .reTwist .post-expand, .reTwist .post-interactions {
display: none; display: none;
} }
/********* REPLY POSTS MODAL************** */ /********* REPLY POSTS MODAL************** */
/* line 723, ../sass/style.sass */ /* line 715, ../sass/style.sass */
.reply .modal-wrapper { .reply .modal-wrapper {
width: 520px; width: 520px;
top: 20%; top: 20%;
margin: 0 0 0 -260px; margin: 0 0 0 -260px;
} }
/* line 727, ../sass/style.sass */ /* line 719, ../sass/style.sass */
.reply .modal-buttons, .reply .post-expand, .reply .post-interactions { .reply .modal-buttons, .reply .post-expand, .reply .post-interactions {
display: none; display: none;
} }
/****** DIRECT MESSAGES MODAL********* */ /****** DIRECT MESSAGES MODAL********* */
/* line 733, ../sass/style.sass */ /* line 725, ../sass/style.sass */
.directMessages .post-area-new { .directMessages .post-area-new {
display: none; display: none;
padding: 20px; padding: 20px;
z-index: 5; z-index: 5;
background: #E2E1DE; background: #E2E1DE;
} }
/* line 740, ../sass/style.sass */ /* line 732, ../sass/style.sass */
.directMessages .post-area-new .modal-header h3 span { .directMessages .post-area-new .modal-header h3 span {
display: inline !important; display: inline !important;
} }
/* line 742, ../sass/style.sass */ /* line 734, ../sass/style.sass */
.directMessages .modal-wrapper { .directMessages .modal-wrapper {
width: 520px; width: 520px;
height: 490px; height: 490px;
@ -2620,7 +2612,7 @@ ol.toptrends-list a:hover {
margin: 0 0 0 -260px; margin: 0 0 0 -260px;
overflow-x: hidden; overflow-x: hidden;
} }
/* line 749, ../sass/style.sass */ /* line 741, ../sass/style.sass */
.directMessages .modal-content { .directMessages .modal-content {
overflow-y: auto; overflow-y: auto;
height: 300px; height: 300px;
@ -2629,25 +2621,25 @@ ol.toptrends-list a:hover {
box-sizing: border-box; box-sizing: border-box;
width: 520px; width: 520px;
} }
/* line 756, ../sass/style.sass */ /* line 748, ../sass/style.sass */
.directMessages .modal-buttons { .directMessages .modal-buttons {
display: none; display: none;
} }
/* line 758, ../sass/style.sass */ /* line 750, ../sass/style.sass */
.directMessages .post-photo { .directMessages .post-photo {
height: 48px; height: 48px;
width: 48px; width: 48px;
} }
/* line 761, ../sass/style.sass */ /* line 753, ../sass/style.sass */
.directMessages .post-text { .directMessages .post-text {
margin-left: 58px; margin-left: 58px;
font-size: 0.9em; font-size: 0.9em;
} }
/* line 764, ../sass/style.sass */ /* line 756, ../sass/style.sass */
.directMessages .post-info-name { .directMessages .post-info-name {
float: none; float: none;
} }
/* line 766, ../sass/style.sass */ /* line 758, ../sass/style.sass */
.directMessages .post-info-tag { .directMessages .post-info-tag {
line-height: 1em; line-height: 1em;
padding: 0; padding: 0;
@ -2656,12 +2648,12 @@ ol.toptrends-list a:hover {
margin: 0 0 0 1em; margin: 0 0 0 1em;
} }
/* line 773, ../sass/style.sass */ /* line 765, ../sass/style.sass */
.direct-messages-list .post { .direct-messages-list .post {
padding: 10px 30px 10px 15px; padding: 10px 30px 10px 15px;
cursor: pointer; cursor: pointer;
} }
/* line 776, ../sass/style.sass */ /* line 768, ../sass/style.sass */
.direct-messages-list .post:after { .direct-messages-list .post:after {
content: ""; content: "";
font-family: "fontello"; font-family: "fontello";
@ -2674,19 +2666,19 @@ ol.toptrends-list a:hover {
display: none; display: none;
} }
/* line 788, ../sass/style.sass */ /* line 780, ../sass/style.sass */
.direct-messages-list .post:hover:after { .direct-messages-list .post:hover:after {
display: block; display: block;
} }
/* line 793, ../sass/style.sass */ /* line 785, ../sass/style.sass */
.direct-messages-thread .post { .direct-messages-thread .post {
background: none; background: none;
left: 0; left: 0;
margin: 0px 10px 20px 10px; margin: 0px 10px 20px 10px;
cursor: default; cursor: default;
} }
/* line 799, ../sass/style.sass */ /* line 791, ../sass/style.sass */
.direct-messages-thread .post .post-info-time { .direct-messages-thread .post .post-info-time {
float: none; float: none;
display: block; display: block;
@ -2695,11 +2687,11 @@ ol.toptrends-list a:hover {
margin: 10px 0; margin: 10px 0;
cursor: default; cursor: default;
} }
/* line 806, ../sass/style.sass */ /* line 798, ../sass/style.sass */
.direct-messages-thread .post .post-info-time:hover { .direct-messages-thread .post .post-info-time:hover {
color: #aaa; color: #aaa;
} }
/* line 810, ../sass/style.sass */ /* line 802, ../sass/style.sass */
.direct-messages-thread .post .post-text:after, .direct-messages-thread .post .post-text:nth-child(2n):after { .direct-messages-thread .post .post-text:after, .direct-messages-thread .post .post-text:nth-child(2n):after {
content: ""; content: "";
width: 1px; width: 1px;
@ -2708,14 +2700,14 @@ ol.toptrends-list a:hover {
top: 10px; top: 10px;
white-space: normal; white-space: normal;
} }
/* line 818, ../sass/style.sass */ /* line 810, ../sass/style.sass */
.direct-messages-thread .post .post-text:after { .direct-messages-thread .post .post-text:after {
border-top: solid 7px transparent; border-top: solid 7px transparent;
border-bottom: solid 7px transparent; border-bottom: solid 7px transparent;
border-right: solid 7px white; border-right: solid 7px white;
left: -7px; left: -7px;
} }
/* line 824, ../sass/style.sass */ /* line 816, ../sass/style.sass */
.direct-messages-thread .post .post-text { .direct-messages-thread .post .post-text {
background: white; background: white;
margin-right: 60px; margin-right: 60px;
@ -2731,13 +2723,13 @@ ol.toptrends-list a:hover {
max-width: 60%; max-width: 60%;
min-height: 15px; min-height: 15px;
} }
/* line 839, ../sass/style.sass */ /* line 831, ../sass/style.sass */
.direct-messages-thread .post .post-photo { .direct-messages-thread .post .post-photo {
position: absolute; position: absolute;
left: 0; left: 0;
top: 10px; top: 10px;
} }
/* line 848, ../sass/style.sass */ /* line 840, ../sass/style.sass */
.direct-messages-thread .post.sent .post-text:after { .direct-messages-thread .post.sent .post-text:after {
border-top: solid 7px transparent; border-top: solid 7px transparent;
border-bottom: solid 7px transparent; border-bottom: solid 7px transparent;
@ -2746,11 +2738,11 @@ ol.toptrends-list a:hover {
right: -7px; right: -7px;
left: auto; left: auto;
} }
/* line 855, ../sass/style.sass */ /* line 847, ../sass/style.sass */
.direct-messages-thread .post.sent .post-text { .direct-messages-thread .post.sent .post-text {
float: right; float: right;
} }
/* line 857, ../sass/style.sass */ /* line 849, ../sass/style.sass */
.direct-messages-thread .post.sent .post-photo { .direct-messages-thread .post.sent .post-photo {
position: absolute; position: absolute;
right: 0; right: 0;
@ -2758,7 +2750,7 @@ ol.toptrends-list a:hover {
} }
/********* NEW USER MODAL************* */ /********* NEW USER MODAL************* */
/* line 867, ../sass/style.sass */ /* line 859, ../sass/style.sass */
.new-user .modal-wrapper { .new-user .modal-wrapper {
width: 520px; width: 520px;
height: 600px; height: 600px;
@ -2767,31 +2759,31 @@ ol.toptrends-list a:hover {
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
} }
/* line 874, ../sass/style.sass */ /* line 866, ../sass/style.sass */
.new-user .modal-content { .new-user .modal-content {
margin: 10px 10px 10px 10px; margin: 10px 10px 10px 10px;
} }
/* line 876, ../sass/style.sass */ /* line 868, ../sass/style.sass */
.new-user .modal-buttons, .new-user .modal-close { .new-user .modal-buttons, .new-user .modal-close {
display: none; display: none;
} }
/* line 878, ../sass/style.sass */ /* line 870, ../sass/style.sass */
.new-user .text { .new-user .text {
margin: 0 0 15px 0; margin: 0 0 15px 0;
} }
/* line 880, ../sass/style.sass */ /* line 872, ../sass/style.sass */
.new-user .emphasis { .new-user .emphasis {
font-size: 18px; font-size: 18px;
text-align: center; text-align: center;
} }
/* line 883, ../sass/style.sass */ /* line 875, ../sass/style.sass */
.new-user .secret-key { .new-user .secret-key {
color: black; color: black;
font-weight: bold; font-weight: bold;
} }
/******** HASHTAG MODAL********** */ /******** HASHTAG MODAL********** */
/* line 890, ../sass/style.sass */ /* line 882, ../sass/style.sass */
.hashtag-modal .modal-wrapper { .hashtag-modal .modal-wrapper {
width: 520px; width: 520px;
height: 600px; height: 600px;
@ -2799,22 +2791,22 @@ ol.toptrends-list a:hover {
margin: 0 0 0 -260px; margin: 0 0 0 -260px;
overflow: hidden; overflow: hidden;
} }
/* line 896, ../sass/style.sass */ /* line 888, ../sass/style.sass */
.hashtag-modal .modal-content { .hashtag-modal .modal-content {
overflow-y: auto; overflow-y: auto;
height: 500px; height: 500px;
} }
/* line 899, ../sass/style.sass */ /* line 891, ../sass/style.sass */
.hashtag-modal .modal-buttons { .hashtag-modal .modal-buttons {
display: none; display: none;
} }
/* line 901, ../sass/style.sass */ /* line 893, ../sass/style.sass */
.hashtag-modal .postboard { .hashtag-modal .postboard {
padding: 0; padding: 0;
} }
/****** CONVERSATION MODAL********** */ /****** CONVERSATION MODAL********** */
/* line 907, ../sass/style.sass */ /* line 899, ../sass/style.sass */
.conversation-modal .modal-wrapper { .conversation-modal .modal-wrapper {
position: absolute; position: absolute;
width: 520px; width: 520px;
@ -2824,22 +2816,22 @@ ol.toptrends-list a:hover {
overflow: hidden; overflow: hidden;
background: white; background: white;
} }
/* line 915, ../sass/style.sass */ /* line 907, ../sass/style.sass */
.conversation-modal .modal-content { .conversation-modal .modal-content {
overflow-y: auto; overflow-y: auto;
height: 90%; height: 90%;
} }
/* line 918, ../sass/style.sass */ /* line 910, ../sass/style.sass */
.conversation-modal .modal-buttons { .conversation-modal .modal-buttons {
display: none; display: none;
} }
/* line 920, ../sass/style.sass */ /* line 912, ../sass/style.sass */
.conversation-modal .postboard { .conversation-modal .postboard {
padding: 0; padding: 0;
} }
/****** FOLLOWING MODAL****** */ /****** FOLLOWING MODAL****** */
/* line 926, ../sass/style.sass */ /* line 918, ../sass/style.sass */
.following-modal .modal-wrapper { .following-modal .modal-wrapper {
width: 520px; width: 520px;
top: 10%; top: 10%;
@ -2847,27 +2839,27 @@ ol.toptrends-list a:hover {
margin: 0 0 0 -260px; margin: 0 0 0 -260px;
overflow-x: hidden; overflow-x: hidden;
} }
/* line 932, ../sass/style.sass */ /* line 924, ../sass/style.sass */
.following-modal .modal-content { .following-modal .modal-content {
height: 300px; height: 300px;
overflow-y: auto; overflow-y: auto;
padding: 0; padding: 0;
} }
/* line 936, ../sass/style.sass */ /* line 928, ../sass/style.sass */
.following-modal .modal-buttons { .following-modal .modal-buttons {
display: none; display: none;
} }
/* line 938, ../sass/style.sass */ /* line 930, ../sass/style.sass */
.following-modal ol { .following-modal ol {
margin: 5px; margin: 5px;
} }
/* line 941, ../sass/style.sass */ /* line 933, ../sass/style.sass */
.following-modal .open-profile-modal:hover { .following-modal .open-profile-modal:hover {
text-decoration: none; text-decoration: none;
} }
/******* WHO TO FOLLOW MODAL****** */ /******* WHO TO FOLLOW MODAL****** */
/* line 949, ../sass/style.sass */ /* line 941, ../sass/style.sass */
.who-to-follow-modal .modal-wrapper { .who-to-follow-modal .modal-wrapper {
width: 520px; width: 520px;
top: 10%; top: 10%;
@ -2875,54 +2867,54 @@ ol.toptrends-list a:hover {
margin: 0 0 0 -260px; margin: 0 0 0 -260px;
overflow-x: hidden; overflow-x: hidden;
} }
/* line 955, ../sass/style.sass */ /* line 947, ../sass/style.sass */
.who-to-follow-modal .modal-content { .who-to-follow-modal .modal-content {
padding: 15px; padding: 15px;
height: 400px; height: 400px;
overflow-y: auto; overflow-y: auto;
} }
/* line 959, ../sass/style.sass */ /* line 951, ../sass/style.sass */
.who-to-follow-modal .modal-buttons { .who-to-follow-modal .modal-buttons {
display: none; display: none;
} }
/* line 961, ../sass/style.sass */ /* line 953, ../sass/style.sass */
.who-to-follow-modal ol { .who-to-follow-modal ol {
margin: 5px; margin: 5px;
} }
/* line 964, ../sass/style.sass */ /* line 956, ../sass/style.sass */
.who-to-follow-modal .open-profile-modal:hover { .who-to-follow-modal .open-profile-modal:hover {
text-decoration: none; text-decoration: none;
} }
/* line 966, ../sass/style.sass */ /* line 958, ../sass/style.sass */
.who-to-follow-modal .twister-user { .who-to-follow-modal .twister-user {
position: relative; position: relative;
padding: 5px; padding: 5px;
} }
/* line 969, ../sass/style.sass */ /* line 961, ../sass/style.sass */
.who-to-follow-modal .twister-user-photo { .who-to-follow-modal .twister-user-photo {
position: relative; position: relative;
left: 0; left: 0;
float: left; float: left;
display: block; display: block;
} }
/* line 974, ../sass/style.sass */ /* line 966, ../sass/style.sass */
.who-to-follow-modal .twister-user-info { .who-to-follow-modal .twister-user-info {
position: relative; position: relative;
padding-left: 70px; padding-left: 70px;
width: auto; width: auto;
} }
/* line 978, ../sass/style.sass */ /* line 970, ../sass/style.sass */
.who-to-follow-modal .bio { .who-to-follow-modal .bio {
color: rgba(0, 0, 0, 0.6); color: rgba(0, 0, 0, 0.6);
font-style: italic; font-style: italic;
} }
/******* LOADER ************ */ /******* LOADER ************ */
/* line 984, ../sass/style.sass */ /* line 976, ../sass/style.sass */
.postboard-loading { .postboard-loading {
text-align: center; text-align: center;
} }
/* line 986, ../sass/style.sass */ /* line 978, ../sass/style.sass */
.postboard-loading div { .postboard-loading div {
display: inline-block; display: inline-block;
width: 120px; width: 120px;
@ -2931,7 +2923,7 @@ ol.toptrends-list a:hover {
position: relative; position: relative;
margin: 10px 0 0 0; margin: 10px 0 0 0;
} }
/* line 993, ../sass/style.sass */ /* line 985, ../sass/style.sass */
.postboard-loading div:after { .postboard-loading div:after {
content: ""; content: "";
position: absolute; position: absolute;
@ -3015,7 +3007,7 @@ ol.toptrends-list a:hover {
} }
} }
/* Options */ /* Options */
/* line 1068, ../sass/style.sass */ /* line 1060, ../sass/style.sass */
.suboptions { .suboptions {
margin: 5px 30px; margin: 5px 30px;
border: double 2px rgba(69, 71, 77, 0.1); border: double 2px rgba(69, 71, 77, 0.1);
@ -3032,22 +3024,22 @@ ol.toptrends-list a:hover {
line-height: 0.9em; line-height: 0.9em;
font-style: italic; font-style: italic;
} }
/* line 1083, ../sass/style.sass */ /* line 1075, ../sass/style.sass */
.suboptions div { .suboptions div {
float: none !important; float: none !important;
} }
/* line 1085, ../sass/style.sass */ /* line 1077, ../sass/style.sass */
.suboptions span { .suboptions span {
font-style: normal; font-style: normal;
} }
/* Autocomplite */ /* Autocomplite */
/* line 1090, ../sass/style.sass */ /* line 1082, ../sass/style.sass */
.textcomplete-wrapper textarea { .textcomplete-wrapper textarea {
display: inline; display: inline;
} }
/* line 1093, ../sass/style.sass */ /* line 1085, ../sass/style.sass */
ul.dropdown-menu { ul.dropdown-menu {
position: absolute; position: absolute;
top: 23px; top: 23px;
@ -3065,11 +3057,11 @@ ul.dropdown-menu {
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
} }
/* line 1109, ../sass/style.sass */ /* line 1101, ../sass/style.sass */
ul.dropdown-menu li { ul.dropdown-menu li {
line-height: 20px; line-height: 20px;
} }
/* line 1111, ../sass/style.sass */ /* line 1103, ../sass/style.sass */
ul.dropdown-menu > li > a { ul.dropdown-menu > li > a {
display: block; display: block;
padding: 3px 20px; padding: 3px 20px;

1
theme_nin/js/theme_option.js

@ -1,6 +1,7 @@
$(function(){ $(function(){
$('.modal-close').html(''); $('.modal-close').html('');
$('.modal-back').html('');
$('.twister-user-remove').html(''); $('.twister-user-remove').html('');
$('.profile-card-main').attr('style', ''); $('.profile-card-main').attr('style', '');
$('img[src$="img/tornado_avatar.png"]').attr("src","theme_nin/img/tornado_avatar.png"); $('img[src$="img/tornado_avatar.png"]').attr("src","theme_nin/img/tornado_avatar.png");

16
theme_nin/sass/style.sass

@ -662,11 +662,17 @@ ol.toptrends-list
.modal-back .modal-back
@extend .extend-icon @extend .extend-icon
@extend .icon-left @extend .icon-left
@extend button position: absolute
margin: 0 right: 35px
background: $main-color-color top: 0
display: none!important font-size: 14px
float: left line-height: 40px
cursor: pointer
color: rgba(white, 0.7)
&:hover
color: white
b
display: none
.modal-buttons .modal-buttons
padding: 10px padding: 10px

Loading…
Cancel
Save