Browse Source

import username autocomplete from calm

master
Miguel Freitas 11 years ago
parent
commit
7a68cccfde
  1. 75
      css/style.css
  2. 10
      home.html
  3. 2
      js/interface_common.js
  4. 2
      js/twister_formatpost.js

75
css/style.css

@ -557,7 +557,7 @@ button.disabled:hover
display: inline-block; display: inline-block;
margin-top: 4px; margin-top: 4px;
} }
.post-area-new.open textarea + .post-area-extras .post-area-new.open > .post-area-extras
{ {
height: 35px; height: 35px;
transition: all .6s linear; transition: all .6s linear;
@ -1154,6 +1154,23 @@ button.disabled:hover
color: #fff; color: #fff;
background: rgba( 0, 0, 0, .1 ); background: rgba( 0, 0, 0, .1 );
} }
.modal-back {
position: absolute;
right: 30px;
top: 0;
padding: 3px 10px;
cursor: pointer;
color: rgba( 255, 255, 255, .7 );
font-weight: bold;
border-left: solid 1px rgba( 255, 255, 255, .3 );
transition: all .1s linear;
display: none;
}
.modal-back:hover
{
color: #fff;
background: rgba( 0, 0, 0, .1 );
}
.modal-buttons .modal-buttons
{ {
padding: 10px; padding: 10px;
@ -1498,3 +1515,59 @@ button.disabled:hover
left: 2px; left: 2px;
} }
} }
/* Options */
#playerVol {
float: right;
margin-right: 20px;
}
.volValue {
float: right;
margin-right: -163px;
font: 12px "Open Sans", sans-serif;
}
#notifyForm p, #choseLanguage p, #keysOpt p {
margin-top: 15px;
}
/* Autocomplite*/
.textcomplete-wrapper textarea {
display: inline;
}
ul.dropdown-menu {
position: absolute;
top: 23px;
left: 170px;
z-index: 100;
display: block;
float: left;
min-width: 160px;
padding: 5px 0;
margin: 2px 0 0;
list-style: none;
background-color: #fff;
border: 1px solid rgba(0,0,0, .2);
border-radius: 6px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0,0,0, .2);
-moz-box-shadow: 0 5px 10px rgba(0,0,0, .2);
box-shadow: 0 5px 10px rgba(0,0,0, .2);
}
ul.dropdown-menu li {
line-height: 20px;
}
ul.dropdown-menu > li > a {
display: block;
padding: 3px 20px;
clear: both;
font: 13px/20px "Open Sans", sans-serif;
white-space: nowrap;
-webkit-transition: all 200ms;
-moz-transition: all 200ms;
-ms-transition: all 200ms;
-o-transition: all 200ms;
transition: all 200ms;
}

10
home.html

@ -24,6 +24,10 @@
<script src="js/twister_directmsg.js"></script> <script src="js/twister_directmsg.js"></script>
<script src="js/interface_common.js"></script> <script src="js/interface_common.js"></script>
<script src="js/interface_home.js"></script> <script src="js/interface_home.js"></script>
<script src="js/jquery.textcomplete.js"></script>
<script src="js/calm.js"></script>
<script src="js/options.js"></script>
<script>$(function(){setTimeout(mensAutocomplete, 800);})</script> <!-- calm init for autocomplete -->
<link rel="icon" type="image/png" href="img/twister_mini.png" /> <link rel="icon" type="image/png" href="img/twister_mini.png" />
</head> </head>
@ -270,11 +274,12 @@
<!-- TEMPLATE INVÓLUCRO DO POST EXPANDIDO END --> <!-- TEMPLATE INVÓLUCRO DO POST EXPANDIDO END -->
<!-- TEMPLATE DO MODAL GENÉRICO INIT --> <!-- TEMPLATE DO MODAL GENÉRICO INIT -->
<div class="modal-blackout"> <div class="modal-blackout cancel">
<div class="modal-wrapper"> <div class="modal-wrapper">
<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>
</div> </div>
<div class="modal-content"></div> <div class="modal-content"></div>
<div class="modal-buttons"> <div class="modal-buttons">
@ -441,6 +446,7 @@
</div> </div>
<!-- TEMPLATES END --> <!-- TEMPLATES END -->
<audio id="player"></audio>
<audio id="playerSec"></audio>
</body> </body>
</html> </html>

2
js/interface_common.js

@ -134,7 +134,7 @@ function openHashtagModal(e)
e.preventDefault(); e.preventDefault();
var $this = $( this ); var $this = $( this );
var hashtag = $this.text().substring(1); var hashtag = $this.text().substring(1).toLowerCase();
var hashtagModalClass = "hashtag-modal"; var hashtagModalClass = "hashtag-modal";
openModal( hashtagModalClass ); openModal( hashtagModalClass );

2
js/twister_formatpost.js

@ -219,7 +219,7 @@ function htmlFormatMsg( msg, output, mentions ) {
if( hashtag.length ) { if( hashtag.length ) {
var hashtagLinkTemplate = $("#hashtag-link-template").clone(true); var hashtagLinkTemplate = $("#hashtag-link-template").clone(true);
hashtagLinkTemplate.removeAttr("id"); hashtagLinkTemplate.removeAttr("id");
hashtagLinkTemplate.attr("href",$.MAL.hashtagUrl(hashtag)); hashtagLinkTemplate.attr("href",$.MAL.hashtagUrl(hashtag.toLowerCase()));
hashtagLinkTemplate.text("#"+hashtag); hashtagLinkTemplate.text("#"+hashtag);
output.append(hashtagLinkTemplate); output.append(hashtagLinkTemplate);
msg = tmp.substr(String(hashtag).length); msg = tmp.substr(String(hashtag).length);

Loading…
Cancel
Save