From b3f3a51be64c8524ba95d2ba3bbf652efacd2337 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Mon, 16 Feb 2015 06:32:08 +0400 Subject: [PATCH] Styles fixes --- dev/Styles/SettingsAccounts.less | 26 ++++++++++++++++++++++++++ dev/Styles/SettingsFilters.less | 9 ++++++++- dev/Styles/SettingsTemplates.less | 13 +++++++++++++ dev/View/Popup/Compose.js | 6 ++++-- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dev/Styles/SettingsAccounts.less b/dev/Styles/SettingsAccounts.less index 9a8419b8d..3d1dbee49 100644 --- a/dev/Styles/SettingsAccounts.less +++ b/dev/Styles/SettingsAccounts.less @@ -74,6 +74,19 @@ cursor: pointer; opacity: 0.5; } + + &.ui-sortable-helper { + background: #F5F5F5; + border: 1px solid #DDD; + + .button-delete, .delete-account { + display: none; + } + + td { + border-width: 0px; + } + } } .identity-item { @@ -101,5 +114,18 @@ cursor: pointer; opacity: 0.5; } + + &.ui-sortable-helper { + background: #F5F5F5; + border: 1px solid #DDD; + + .button-delete, .delete-identity { + display: none; + } + + td { + border-width: 0px; + } + } } } \ No newline at end of file diff --git a/dev/Styles/SettingsFilters.less b/dev/Styles/SettingsFilters.less index 5529ff931..ea218b9fe 100644 --- a/dev/Styles/SettingsFilters.less +++ b/dev/Styles/SettingsFilters.less @@ -77,9 +77,16 @@ } &.ui-sortable-helper { - .delete-filter { + background: #F5F5F5; + border: 1px solid #DDD; + + .button-delete, .delete-filter { display: none; } + + td { + border-width: 0px; + } } } } diff --git a/dev/Styles/SettingsTemplates.less b/dev/Styles/SettingsTemplates.less index 2aa1afb30..09ad48c32 100644 --- a/dev/Styles/SettingsTemplates.less +++ b/dev/Styles/SettingsTemplates.less @@ -66,5 +66,18 @@ cursor: pointer; opacity: 0.5; } + + &.ui-sortable-helper { + background: #F5F5F5; + border: 1px solid #DDD; + + .button-delete, .delete-template { + display: none; + } + + td { + border-width: 0px; + } + } } } \ No newline at end of file diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index a499c17ed..3f23cb934 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -196,8 +196,8 @@ this.attachmentsPlace = ko.observable(false); - this.attachments.subscribe(Utils.windowResizeCallback); - this.attachmentsPlace.subscribe(Utils.windowResizeCallback); + this.attachments.subscribe(this.resizerTrigger); + this.attachmentsPlace.subscribe(this.resizerTrigger); this.attachmentsInErrorCount.subscribe(function (iN) { if (0 === iN) @@ -759,6 +759,7 @@ { self.oEditor = new HtmlEditor(self.composeEditorArea(), null, function () { fOnInit(self.oEditor); + self.resizerTrigger(); }, function (bHtml) { self.isHtml(!!bHtml); }); @@ -766,6 +767,7 @@ else if (this.oEditor) { fOnInit(this.oEditor); + this.resizerTrigger(); } } };