Merge branch 'devel'

Serubin · Jul 31, 2017 · 748f1bb · 748f1bb
2 parents 64ce8fd + 9428918
commit 748f1bb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/resources/js/Conversations.js b/resources/js/Conversations.js
@@ -169,6 +169,7 @@ function Conversations(data, elem, page, small) {
 
                 $icon       = "<svg class=\"contact-img\" height=\"48\" width=\"48\">"
                             + "<circle cx=\"24\" cy=\"24\" r=\"24\" shape-rendering=\"auto\" fill=\"" + (hasGlobalTheme() ? globalColor : data[i].color) + "\"/>"
+                            + "<text x=\"24\" style=\"text-anchor: middle;font-size: 30px;fill: #fff;font-weight: 300;\" y=\"34\">" + convo.title.substr(0,1) + "</text>"
                             + "</svg>";
 
                 $text_wrap  = $("<p></p>").addClass("conversation-text");
@@ -191,10 +192,7 @@ function Conversations(data, elem, page, small) {
                     $snippet.addClass("conversation-snippet-small");
                     $icon = "<svg class=\"contact-img contact-img-small\" height=\"24\" width=\"24\">"
                             + "<circle cx=\"12\" cy=\"12\" r=\"12\" shape-rendering=\"auto\" fill=\"" + (hasGlobalTheme() ? globalColor : data[i].color) + "\"/>"
-                            + "</svg>";
-                } else {
-                    $icon = "<svg class=\"contact-img\" height=\"48\" width=\"48\">"
-                            + "<circle cx=\"24\" cy=\"24\" r=\"24\" shape-rendering=\"auto\" fill=\"" + (hasGlobalTheme() ? globalColor : data[i].color) + "\"/>"
+                            + "<text style=\"text-anchor: middle;font-size: 16px;fill: #fff;font-weight: 300;\" x=\"12\" y=\"17.5\">" + convo.title.substr(0,1) + "</text>"
                             + "</svg>";
                 }
 

diff --git a/resources/js/Theme.js b/resources/js/Theme.js
@@ -44,21 +44,21 @@ function enableTheme() {
 
     if (hasColoredToolbar()) {
 
-      $(".material-icons").addClass("material-icons-white");
-      $("#toolbar-title").css("color", "white");
-      $(".icon_logo").addClass("icon_logo_dark").removeClass("icon_logo");
-      $(".icon_menu_toggle").addClass("icon_menu_toggle_dark").removeClass("icon_menu_toggle");
+        $(".material-icons").addClass("material-icons-white");
+        $("#toolbar-title").css("color", "white");
+        $(".icon_logo").addClass("icon_logo_dark").removeClass("icon_logo");
+        $(".icon_menu_toggle").addClass("icon_menu_toggle_dark").removeClass("icon_menu_toggle");
 
-      var color = hasGlobalTheme() ? globalColor : "#2196F3";
-      $("#toolbar").css("background-color", color);
+        var color = hasGlobalTheme() ? globalColor : "#2196F3";
+        $("#toolbar").css("background-color", color);
 
     } else {
 
-      $("#toolbar").css("background-color", "#fafafa");
-      $("#toolbar-title").css("color", "#666666");
-      $(".material-icons").removeClass("material-icons-white");
-      $(".icon_logo_dark").addClass("icon_logo").removeClass("icon_logo_dark");
-      $(".icon_menu_toggle_dark").addClass("icon_menu_toggle").removeClass("icon_menu_toggle_dark");
+        $("#toolbar").css("background-color", "#fafafa");
+        $("#toolbar-title").css("color", "#666666");
+        $(".material-icons").removeClass("material-icons-white");
+        $(".icon_logo_dark").addClass("icon_logo").removeClass("icon_logo_dark");
+        $(".icon_menu_toggle_dark").addClass("icon_menu_toggle").removeClass("icon_menu_toggle_dark");
 
     }
 
@@ -233,7 +233,7 @@ function loadMiniVersion() {
 		var $outside_sidemenu = $("#outside-side-menu");
 
 		if ($sidemenu.css("margin-left") == "0px") {
-			$html.removeClass("side-menu_show");
+            $html.removeClass("side-menu_show");
 			$sidemenu.css("margin-left", "-269px");
 			$outside_sidemenu.fadeOut(500);
 		} else {
@@ -250,9 +250,11 @@ function loadFullVersion() {
 	$("html").removeClass("side-menu_show");
 	$("#content").css("margin-left", SIDE_MENU_WIDTH + "px");
 
-	$("#logo").show();
+	$("#logo").off();
+
     $("#side-menu").css("margin-left", "0px");
 	$("#side-menu_toggle").hide();
+    $("#outside-side-menu").hide()
 	$("#side-menu_toggle").off();
 
 	var $logo_image = $("#logo-image");