Merge branch 'pull'
This commit is contained in:
friendica
commit
4b1f3555f1
|
|
@ -104,34 +104,6 @@ function initEditor(cb) {
|
|||
$(".jothidden").show();
|
||||
|
||||
if (typeof cb!="undefined") { cb(); }
|
||||
|
||||
// character count part deux
|
||||
//
|
||||
// get # of chars
|
||||
var textlen = $('#profile-jot-text').val().length();
|
||||
$('#character-counter').html(textlen);
|
||||
|
||||
$('#profile-jot-text').keyup(function() {
|
||||
$('#character-counter').removeClass('jothidden');
|
||||
if(textlen <= 140) {
|
||||
$('#character-counter').removeClass('red');
|
||||
$('#character-counter').removeClass('orange');
|
||||
$('#character-counter').addClass('grey');
|
||||
}
|
||||
if((textlen > 140) && (textlen <= 420)) {
|
||||
$('#character-counter').removeClass('grey');
|
||||
$('#character-counter').removeClass('red');
|
||||
$('#character-counter').addClass('orange');
|
||||
}
|
||||
if(textlen > 420) {
|
||||
$('#character-counter').removeClass('grey');
|
||||
$('#character-counter').removeClass('orange');
|
||||
$('#character-counter').addClass('red');
|
||||
}
|
||||
// get new len
|
||||
$('#character-counter').html($(this).val().length);
|
||||
});
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -146,10 +118,38 @@ function initEditor(cb) {
|
|||
}
|
||||
}
|
||||
|
||||
function charCounter() {
|
||||
// character count part deux
|
||||
$('#profile-jot-text').keyup(function(event) {
|
||||
var textlen = $(this).val().length();
|
||||
var maxLen1 = 140;
|
||||
var maxLen2 = 420;
|
||||
|
||||
$('#character-counter').removeClass('jothidden');
|
||||
if(textlen <= maxLen1) {
|
||||
$('#character-counter').removeClass('red');
|
||||
$('#character-counter').removeClass('orange');
|
||||
$('#character-counter').addClass('grey');
|
||||
}
|
||||
if((textlen > maxLen1) && (textlen <= maxLen2)) {
|
||||
$('#character-counter').removeClass('grey');
|
||||
$('#character-counter').removeClass('red');
|
||||
$('#character-counter').addClass('orange');
|
||||
}
|
||||
if(textlen > maxLen2) {
|
||||
$('#character-counter').removeClass('grey');
|
||||
$('#character-counter').removeClass('orange');
|
||||
$('#character-counter').addClass('red');
|
||||
}
|
||||
$('#character-counter').html($(this).val().length);
|
||||
});
|
||||
}
|
||||
|
||||
function enableOnUser(){
|
||||
if (editor) return;
|
||||
$(this).val("");
|
||||
initEditor();
|
||||
charCounter();
|
||||
}
|
||||
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@ works -->
|
|||
{{ if $nav.help }}
|
||||
<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
|
||||
{{ endif }}
|
||||
{{ if $nav.community }}
|
||||
<a id="nav-community-link" class="nav-link $nav.community.2"
|
||||
href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
|
||||
{{ endif }}
|
||||
{{ if $nav.apps }}
|
||||
<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
|
||||
{{ endif }}
|
||||
|
|
@ -28,10 +32,6 @@ works -->
|
|||
<li class="empty">$emptynotifications</li>
|
||||
</ul>
|
||||
{{ endif }}
|
||||
{{ if $nav.community }}
|
||||
<a id="nav-community-link" class="nav-link $nav.community.2"
|
||||
href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
|
||||
{{ endif }}
|
||||
{{ if $nav.network }}
|
||||
<a id="nav-network-link" class="nav-link $nav.network.2"
|
||||
href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
|
||||
|
|
@ -106,6 +106,7 @@ works -->
|
|||
<a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<a href="#" class="floaterflip"></a>
|
||||
</nav>
|
||||
|
|
|
|||
|
|
@ -81,17 +81,18 @@ mark {
|
|||
font-weight: bold;
|
||||
}
|
||||
/* Redeclare monospace font family: h5bp.com/j */
|
||||
pre, code, kbd, samp {
|
||||
pre, code, kbd, samp, .wall-item-body code {
|
||||
font-family: monospace, monospace;
|
||||
_font-family: 'courier new', monospace;
|
||||
font-size: 1em; }
|
||||
|
||||
/* Improve readability of pre-formatted text in all browsers */
|
||||
pre {
|
||||
pre, .wall-item-body code {
|
||||
white-space: pre;
|
||||
white-space: pre-wrap;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
q {
|
||||
quotes: none;
|
||||
}
|
||||
|
|
@ -287,6 +288,11 @@ ul#user-menu-popup li a.nav-sep {
|
|||
}
|
||||
#nav-buttons {
|
||||
clear: both;
|
||||
list-style: none;
|
||||
padding: 0px;
|
||||
}
|
||||
#nav-buttons li {
|
||||
padding: 0;
|
||||
}
|
||||
nav .nav-link {
|
||||
float: right;
|
||||
|
|
@ -469,17 +475,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
width: 30px;
|
||||
height: 19px;
|
||||
background: transparent url(notifications.png) 0 0 no-repeat;
|
||||
color: #fff;
|
||||
color: #222;
|
||||
font-weight: bold;
|
||||
font-size: 0.8em;
|
||||
padding-top: 0.2em;
|
||||
text-align: center;
|
||||
float: left;
|
||||
margin-right: -4px;
|
||||
display: none;
|
||||
margin: 0 -1px 0 3px;
|
||||
display: block;
|
||||
visibility: hidden;
|
||||
}
|
||||
.nav-ajax-update.show, .nav-ajax-left.show {
|
||||
display: block;
|
||||
visibility: visible;
|
||||
}
|
||||
#net-update {
|
||||
background-position: 0px 0px;
|
||||
|
|
@ -918,9 +925,12 @@ aside #viewcontacts {
|
|||
#acl-deny-text-end {
|
||||
clear: both;
|
||||
}
|
||||
#jot-title-desc, #profile-jot-desc {
|
||||
#jot-title-desc {
|
||||
color: #cccccc;
|
||||
}
|
||||
#profile-jot-desc {
|
||||
color: #a00;
|
||||
}
|
||||
#jot-title-wrapper {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
|
@ -946,9 +956,10 @@ aside #viewcontacts {
|
|||
* section
|
||||
*/
|
||||
section {
|
||||
margin: 20px 9% 0 9%;
|
||||
margin: 20px 8% 0 6%;
|
||||
font-size: 0.8em;
|
||||
padding-right: 250px;
|
||||
min-width: 475px;
|
||||
}
|
||||
|
||||
/** tabs **/
|
||||
|
|
@ -1004,10 +1015,10 @@ section {
|
|||
overflow-x: auto;
|
||||
}
|
||||
[id^="tread-wrapper"], [class^="tread-wrapper"] {
|
||||
margin: 5px 0;
|
||||
border: 1px #aaa solid;
|
||||
border-radius: 5px;
|
||||
padding: 10px;
|
||||
margin: 15px 0 0 0;
|
||||
/*border: 1px #aaa solid;*/
|
||||
/*border-radius: 5px;*/
|
||||
padding: 0px;
|
||||
}
|
||||
.wall-item-photo-menu {
|
||||
display: none;
|
||||
|
|
@ -1428,6 +1439,37 @@ div[id$="wrapper"] br {
|
|||
#photos-upload-perms-menu {
|
||||
text-align: right;
|
||||
}
|
||||
#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
|
||||
float: left;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
#photo-edit-link-wrap {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
#photo-edit-caption {
|
||||
width: 100%;
|
||||
}
|
||||
#photo-edit-newtag {
|
||||
width: 100%;
|
||||
}
|
||||
#photo-like-div {
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
|
||||
clear: both;
|
||||
}
|
||||
#photo-edit-delete-button {
|
||||
margin-left: 200px;
|
||||
}
|
||||
#photo-edit-end {
|
||||
margin-bottom: 35px;
|
||||
}
|
||||
#photo-caption {
|
||||
font-size: 110%;
|
||||
font-weight: bold;
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
/**
|
||||
* message
|
||||
|
|
|
|||
Loading…
Reference in a new issue