Updated: ckeditor

This commit is contained in:
RainLoop Team 2015-10-14 21:28:58 +03:00
parent 7b5d00ff01
commit 52dcd44036
266 changed files with 4500 additions and 12312 deletions

View file

@ -179,8 +179,11 @@
*/
AbstractApp.prototype.setWindowTitle = function (sTitle)
{
sTitle = ((Utils.isNormal(sTitle) && 0 < sTitle.length) ? sTitle + ' - ' : '') +
Settings.settingsGet('Title') || '';
sTitle = ((Utils.isNormal(sTitle) && 0 < sTitle.length) ? '' + sTitle : '');
if (Settings.settingsGet('Title'))
{
sTitle += (sTitle ? ' - ' : '') + Settings.settingsGet('Title');
}
window.document.title = sTitle + ' ...';
window.document.title = sTitle;

View file

@ -143,7 +143,8 @@
SettingsUserScreen.prototype.setSettingsTitle = function ()
{
require('App/User').setWindowTitle(this.sSettingsTitle);
var sEmail = AccountStore.email();
require('App/User').setWindowTitle(('' === sEmail ? '' : sEmail + ' - ') + this.sSettingsTitle);
};
module.exports = SettingsUserScreen;

View file

@ -6,7 +6,7 @@
width: 100%;
height: 10px;
z-index: 102;
box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.3);
box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.4);
}
.nano.scroller-shadow-top:before {
@ -19,4 +19,16 @@
.nano.fixIndex.scroller-shadow-top:before, .nano.fixIndex.scroller-shadow-bottom:after {
z-index: 98;
}
.nano .pane .slider {
.transition(top 0.1s ease-out);
}
.nano .pane2 .slider2 {
.transition(left 0.1s ease-out);
}
.nano .pane.active .slider, .nano .pane2.active .slider2 {
.transition(none);
}