From d47736334a0b2a2f3b6f79bfb2cdf42d521ff772 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 19 Apr 2018 21:46:43 +0200
Subject: Chat design, began TODO list

---
 main/app/sprinkles/core/assets/SiteAssets/css/main.css | 18 +++++++++++++-----
 main/app/sprinkles/core/locale/de_DE/messages.php      |  6 +++---
 .../app/sprinkles/core/templates/pages/index.html.twig |  6 +++---
 .../core/templates/pages/partials/favicons.html.twig   |  8 ++++----
 4 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'main/app/sprinkles')

diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
index ff3295a..3bf1b55 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css
+++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
@@ -193,17 +193,25 @@ CHAT WINDOW
 
 .ChatInput {
     position: absolute;
-    margin: auto;
-    bottom: 90px; /* 75+15 */
-    left: 0;
-    z-index: 600;
+    box-sizing: border-box;
     width: 100%;
     height: 40px;
+    padding-left: 15px;
+    padding-right: 15px;
+    bottom: 90px; /* 75+15 */
+    z-index: 600;
     border: none;
-    color: #FFF;
+    -webkit-border-radius: 25px;
+    -moz-border-radius: 25px;
+    border-radius: 25px;
+    color: #426A91;
     background-color: #13223C;
 }
 
+#SubscribeTextInput {
+    color: #FFF;
+}
+
 #ChatTextInput {
     display: none;
 }
diff --git a/main/app/sprinkles/core/locale/de_DE/messages.php b/main/app/sprinkles/core/locale/de_DE/messages.php
index 999947d..1af7c57 100644
--- a/main/app/sprinkles/core/locale/de_DE/messages.php
+++ b/main/app/sprinkles/core/locale/de_DE/messages.php
@@ -73,9 +73,9 @@ return [
         "DESCRIPTION" => "In unsere Datenschutzbestimmungen erklären wir Ihnen, welche Daten wir sammeln und wozu wir diese benutzen."
     ],
 
-    "SLUG" => "Schnecke",
-    "SLUG_CONDITION" => "Schnecke/Bedingungen",
-    "SLUG_IN_USE" => "Die Schnecke <strong>{{slug}}</strong> existiert bereits",
+    "SLUG" => "Abkürzung",
+    "SLUG_CONDITION" => "Abkürzung/Bedingungen",
+    "SLUG_IN_USE" => "Die Abkürzung <strong>{{slug}}</strong> existiert bereits",
     "STATUS" => "Status",
     "SUGGEST" => "Vorschlagen",
 
diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig
index f064cea..417b7ab 100644
--- a/main/app/sprinkles/core/templates/pages/index.html.twig
+++ b/main/app/sprinkles/core/templates/pages/index.html.twig
@@ -49,8 +49,8 @@
                         <div id="ChatMessages" class="ChatMessages">
                             <!-- Messages -->
                         </div>
-                        <input title="Type your message..." id="ChatTextInput" class="ChatInput" type="text"/>
-                        <input title="Join a group..." id="SubscribeTextInput" class="ChatInput" type="text"/>
+                        <input title="Type your message..." placeholder="Type your message..." id="ChatTextInput" class="ChatInput" type="text"/>
+                        <input title="Join a group..." placeholder="Join a group..." id="SubscribeTextInput" class="ChatInput" type="text"/>
                 </div>
             </div>
 
@@ -100,7 +100,7 @@
             <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/ExploreGlobeOutline.svg') }}">
         </span>
             <span id="2" class="NavbarIconWrap ActiveTab">
-            <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutline.svg') }}">
+            <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutlineActivated.svg') }}">
         </span>
             <span id="3" class="NavbarIconWrap">
             <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/UserGroupOutline.svg') }}">
diff --git a/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig b/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig
index 11b0c52..eda4dcf 100644
--- a/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig
+++ b/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig
@@ -11,12 +11,12 @@
     IE 10 Metro tile icon (Metro equivalent of apple-touch-icon-precomposed)
     (see https://github.com/audreyr/favicon-cheat-sheet)
 #}
-<meta name="msapplication-TileColor" content="#603cba">
+<meta name="msapplication-TileColor" content="#0c1d34">
 <meta name="msapplication-TileImage" content="{{ assets.url('assets://userfrosting/favicons/mstile-144x144.png') }}">
 
 {# IE 11 Tile for Windows 8.1 Start Screen #}
-<meta name="application-name" content="UserFrosting">
-<meta name="msapplication-tooltip" content="A secure, modern user management system for PHP.">
+<meta name="application-name" content="BEAM-Messenger">
+<meta name="msapplication-tooltip" content="A secure, fast and simple messenger.">
 <meta name="msapplication-config" content="{{ assets.url('assets://userfrosting/favicons/ieconfig.xml') }}">
 
 {# Apple touch icons #}
@@ -33,7 +33,7 @@
 {# Chrome icons and manifest #}
 <link rel="icon" type="image/png" sizes="192x192" href="{{ assets.url('assets://userfrosting/favicons/android-chrome-192x192.png') }}">
 <link rel="manifest" href="{{ assets.url('assets://userfrosting/favicons/manifest.json') }}">
-<meta name="theme-color" content="#f3f2e4">
+<meta name="theme-color" content="#0c1d34">
 
 {# Safari pinned sites icons #}
 <link rel="mask-icon" href="{{ assets.url('assets://userfrosting/favicons/safari-pinned-tab.svg') }}" color="#f39ca1">
-- 
cgit v1.2.3