Merged from sub repository (updated ckeditor, filters - step 2)

dev/Styles/@Main.less

@@ -90,6 +90,7 @@
 @import "SettingsOpenPGP.less";
 @import "SettingsFolders.less";
 @import "SettingsThemes.less";
+@import "SettingsFilters.less";
 
 @import "Animations.less";
 //@import "Responsive.less";

dev/Styles/Compose.less

@@ -68,7 +68,7 @@
 				border-bottom: 1px dashed #555;
 			}
 		}
-		
+
 		.e-row {
 			line-height: 30px;
 		}
@@ -135,6 +135,12 @@
 		}
 	}
 
+	.cke_chrome {
+		border-left-width: 0 !important;
+		border-right-width: 0 !important;
+		border-bottom-width: 0 !important;
+	}
+
 	.b-attachment-button {
 		display: inline-block;
 	}

dev/Styles/Filter.less

@@ -1,10 +1,14 @@
 .popups {
 	.b-filter-content {
 
-		width: 800px;
+		width: 750px;
 
 		.modal-header {
 			background-color: #fff;
 		}
+
+		.button-delete {
+			cursor: pointer;
+		}
 	}
 }

dev/Styles/SettingsFilters.less

@@ -0,0 +1,59 @@
+
+.b-settings-filters {
+
+	.process-place {
+		text-align: center;
+		width: 600px;
+		padding: 14px 0;
+	}
+
+	.list-table {
+
+		width: 600px;
+
+		td {
+			padding: 4px 8px;
+			line-height: 30px;
+		}
+
+		.filter-img {
+			font-size: 12px;
+			margin-right: 5px;
+		}
+
+		.filter-name {
+			display: inline-block;
+			word-break: break-all;
+			box-sizing: border-box;
+			line-height: 22px;
+			cursor: pointer;
+		}
+	}
+
+	.filter-item {
+
+		.e-action {
+			cursor: pointer;
+		}
+
+		.button-delete {
+			margin-right: 15px;
+			margin-top: 5px;
+			visibility: hidden;
+			opacity: 0;
+		}
+
+		.delete-access {
+			&.button-delete {
+				visibility: visible;
+				margin-right: 0;
+				opacity: 1;
+			}
+		}
+
+		.delete-filter {
+			cursor: pointer;
+			opacity: 0.5;
+		}
+	}
+}

dev/Styles/SettingsIdentities.less

@@ -10,6 +10,7 @@
 	.e-signature-place {
 		display: inline-block;
 		width: 680px;
+		width: 725px;
 		height: 250px;
 	}
 

dev/Styles/SettingsIdentity.less

@@ -3,6 +3,7 @@
 	.e-signature-place {
 		display: inline-block;
 		width: 680px;
+		width: 725px;
 		height: 250px;
 	}
 }

dev/Styles/_CkeFix.less

@@ -2,6 +2,40 @@
 	display: none !important;
 }*/
 
+.cke_chrome {
+	border: 1px solid #ccc !important;
+}
+
+.cke_toolgroup, .cke_combo_button {
+	border: 1px solid #A6A6A6 !important;
+}
+
+.cke_top {
+	padding: 6px 4px 1px 6px !important;
+	-moz-box-shadow: none !important;
+	-webkit-box-shadow: none !important;
+	box-shadow: none !important;
+}
+
+.cke_button {
+	padding: 5px 6px !important;
+}
+
+.cke_combo_text {
+	line-height: 28px !important;
+	padding-left: 8px !important;
+}
+
+.cke_combo_button {
+	background: #FBFBFB !important;
+}
+
+.cke_source {
+	font-family: Monaco, Menlo, Consolas, 'Courier New', monospace !important;
+	padding: 10px !important;
+	padding-right: 0 !important;
+}
+
 .cke_plain {
 
 	background-color: #fff;
@@ -38,7 +72,7 @@
 }
 
 .cke_wysiwyg_div {
-	
+
 	padding: 10px !important;
 	font-family: arial, sans-serif;
 	font-size: 13px;