From 5ffb3811ff63698df07d894ae8ff8a26b49eca60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Wed, 6 Dec 2017 21:48:33 +0100
Subject: [PATCH] Fix chat bubbles CSS Add icons to the Config Color fixes

---
 app/widgets/Chat/chat.css           |  2 +-
 app/widgets/Config/_config_form.tpl | 12 +++++++++---
 app/widgets/Config/locales.ini      |  2 +-
 app/widgets/Vcard4/_vcard4_form.tpl |  2 +-
 themes/material/css/listn.css       | 10 +++++++---
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/widgets/Chat/chat.css b/app/widgets/Chat/chat.css
index 5b4d4caba..f96d69f9a 100644
--- a/app/widgets/Chat/chat.css
+++ b/app/widgets/Chat/chat.css
@@ -41,7 +41,7 @@
 
 #chat_widget .chat_box span.control {
     font-size: 4rem;
-    color: gray;
+    color: rgba(var(--movim-font), 0.54);
 }
 
 #chat_widget .chat_box span.control:hover {
diff --git a/app/widgets/Config/_config_form.tpl b/app/widgets/Config/_config_form.tpl
index bfd1b19af..58a4fedd4 100644
--- a/app/widgets/Config/_config_form.tpl
+++ b/app/widgets/Config/_config_form.tpl
@@ -42,7 +42,10 @@
     <div class="block">
         <ul class="list thick">
             <li>
-                <span class="primary">
+                <span class="primary icon gray">
+                    18+
+                </span>
+                <span class="control">
                     <div class="checkbox">
                         <input
                             {if="$conf->nsfw"}checked{/if}
@@ -61,7 +64,10 @@
     <div class="block">
         <ul class="list thick">
             <li>
-                <span class="primary">
+                <span class="primary icon gray">
+                    <i class="zmdi zmdi-brightness-2"></i>
+                </span>
+                <span class="control">
                     <div class="checkbox">
                         <input
                             {if="$conf->nightmode"}checked{/if}
@@ -73,7 +79,7 @@
                     </div>
                 </span>
                 <p class="line">{$c->__('config.night_mode')}</p>
-                <p class="line">{$c->__('config.night_mode')}</p>
+                <p class="line">{$c->__('config.night_mode_text')}</p>
             </li>
         </ul>
     </div>
diff --git a/app/widgets/Config/locales.ini b/app/widgets/Config/locales.ini
index bc953d4f7..315d2caa7 100644
--- a/app/widgets/Config/locales.ini
+++ b/app/widgets/Config/locales.ini
@@ -11,7 +11,7 @@ advanced             = Advanced Configuration
 nsfw                 = Display adult content
 nsfw_text            = Will allow you to read the posts tagged with the #nsfw tag
 night_mode           = Night Mode
-night_mode_text      = Use dark colors
+night_mode_text      = Use dark colors to rest your eyes
 
 [cssurl]
 label                = Custom CSS URL for your blog
diff --git a/app/widgets/Vcard4/_vcard4_form.tpl b/app/widgets/Vcard4/_vcard4_form.tpl
index 91c545891..6385b35fa 100644
--- a/app/widgets/Vcard4/_vcard4_form.tpl
+++ b/app/widgets/Vcard4/_vcard4_form.tpl
@@ -63,7 +63,7 @@
     </div>
 
     <div class="block large">
-        <textarea name="desc" id="desctext" class="content" onkeyup="MovimUtils.textareaAutoheight(this);">{$desc}</textarea>
+        <textarea name="desc" id="desctext" class="content" placeholder="{$c->__('general.about')}" onkeyup="MovimUtils.textareaAutoheight(this);">{$desc}</textarea>
         <label for="desc">{$c->__('general.about')}</label>
     </div>
 
diff --git a/themes/material/css/listn.css b/themes/material/css/listn.css
index cccf829cc..b665c644a 100644
--- a/themes/material/css/listn.css
+++ b/themes/material/css/listn.css
@@ -363,7 +363,7 @@ ul li div.bubble[dir="rtl"] {
 
 ul li div.bubble:not(.sticker):not(.file) {
     padding: 1rem 1.75rem 0.5rem;
-    border-radius: 0.5rem;
+    border-radius: 0 0.5rem 0.5rem;
     line-height: 2.75rem;
     border-color: rgba(var(--movim-background-main), 1);
     margin-bottom: 0.75rem;
@@ -397,6 +397,7 @@ ul li.oppose div.bubble.file {
 ul li.oppose div.bubble:not(.sticker):not(.file) {
     background-color: rgba(var(--movim-background-main), 0.5);
     border-color: rgba(var(--movim-background-main), 0.5);
+    border-radius: 0.5rem 0 0.5rem 0.5rem;
 }
 
 ul li div.bubble span.info {
@@ -437,13 +438,16 @@ ul li div.bubble:not(.sticker):not(.file):before {
     position: absolute;
     top: 0;
     left: -1.5rem;
-    border: 1.5rem solid transparent;
+    border: 0.75rem solid transparent;
     border-top-color: inherit;
+    border-right-color: inherit;
 }
 
 ul li.oppose div.bubble:not(.sticker):not(.file):before {
-    left: calc(100% - 10.5rem);
+    left: calc(100% - 9rem);
     top: 0.75rem;
+    border-right-color: transparent;
+    border-left-color: inherit;
 }
 
 /* Date separator */