From 5fab8522a6fedc0e71d3a7c263b21b7f5db553dd Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 13 Oct 2023 21:44:18 +0300
Subject: [PATCH] Minor UI fixes

---
 rsconcept/frontend/public/logo_full.svg       |  4 +-
 rsconcept/frontend/public/logo_full_dark.svg  | 39 +++++++++++++++++++
 .../src/components/Navigation/Logo.tsx        |  9 ++++-
 .../frontend/src/components/RSInput/index.tsx |  2 +-
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 rsconcept/frontend/public/logo_full_dark.svg

diff --git a/rsconcept/frontend/public/logo_full.svg b/rsconcept/frontend/public/logo_full.svg
index df726b3a..030bbc96 100644
--- a/rsconcept/frontend/public/logo_full.svg
+++ b/rsconcept/frontend/public/logo_full.svg
@@ -11,8 +11,8 @@ viewBox="0 0 194.51 27.49"
     .fil0 {fill:#E31E24}
     .fil1 {fill:#00A0E3}
     .fil3 {fill:#009846}
-    .fil4 {fill:#1A1A1A}
-    .fil2 {fill:#1A1A1A;fill-rule:nonzero}
+    .fil4 {fill:#4d4d4d}
+    .fil2 {fill:#4d4d4d;fill-rule:nonzero}
    ]]>
   </style>
  </defs>
diff --git a/rsconcept/frontend/public/logo_full_dark.svg b/rsconcept/frontend/public/logo_full_dark.svg
new file mode 100644
index 00000000..253a2530
--- /dev/null
+++ b/rsconcept/frontend/public/logo_full_dark.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Creator: CorelDRAW -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="353px" height="50px" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+viewBox="0 0 194.51 27.49"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xodm="http://www.corel.com/coreldraw/odm/2003">
+ <defs>
+  <style type="text/css">
+   <![CDATA[
+    .fil0 {fill:#E31E24}
+    .fil1 {fill:#00A0E3}
+    .fil3 {fill:#009846}
+    .fil4 {fill:#d9d9d9}
+    .fil2 {fill:#d9d9d9;fill-rule:nonzero}
+   ]]>
+  </style>
+ </defs>
+ <g id="Layer_x0020_1">
+  <metadata id="CorelCorpID_0Corel-Layer"/>
+  <path class="fil0" d="M17.61 0l0 0 -8.8 13.55 0 0 17.61 0 0 0 -8.81 -13.55 0 0zm3.75 10.84l-3.75 -5.75 -2.87 4.41 -0.19 0.29 -0.69 1.05 3.75 0 3.75 0z"/>
+  <path class="fil1" d="M26.42 13.55l0 0 -8.81 13.55 0 0 17.62 0 0 0 -8.81 -13.55 0 0zm3.75 10.84l-3.75 -5.74 -2.87 4.4 -0.2 0.29 -0.68 1.05 3.75 0 3.75 0z"/>
+  <polygon class="fil2" points="183.1,27.16 185.55,27.16 188.81,19.08 192.05,27.16 194.51,27.16 189.94,15.82 187.67,15.82 "/>
+  <path class="fil2" d="M176.61 19.08l1.36 3.38 -2.72 0 1.36 -3.38zm-5.7 8.08l2.44 0 0.98 -2.43 4.55 0 0.97 2.43 2.47 0 -4.57 -11.34 -2.27 0 -4.57 11.34z"/>
+  <polygon class="fil2" points="161,15.82 161,18.09 164.73,18.09 164.73,27.16 166.99,27.16 166.99,18.09 170.72,18.09 170.72,15.82 "/>
+  <path class="fil2" d="M155.75 18.09c0.77,0 1.38,0.61 1.38,1.38 0,0.76 -0.61,1.37 -1.38,1.37l-2.18 0 0 -2.75 2.18 0zm-4.45 -2.27l0 11.34 2.27 0 0 -4.05 2.18 0c2.01,0 3.65,-1.63 3.65,-3.64 0,-2.01 -1.64,-3.65 -3.65,-3.65l-4.45 0z"/>
+  <path class="fil2" d="M139.47 21.49c0,-2.06 1.67,-3.73 3.73,-3.73 2.05,0 3.72,1.67 3.72,3.73 0,2.06 -1.67,3.73 -3.72,3.73 -2.06,0 -3.73,-1.67 -3.73,-3.73zm-2.27 0c0,3.31 2.69,6 6,6 3.3,0 5.99,-2.69 5.99,-6 0,-3.3 -2.69,-5.99 -5.99,-5.99 -3.31,0 -6,2.69 -6,5.99z"/>
+  <polygon class="fil2" points="112.6,15.82 112.6,18.09 116.33,18.09 116.33,27.16 118.6,27.16 118.6,18.09 122.32,18.09 122.32,15.82 "/>
+  <polygon class="fil2" points="108.09,27.16 110.35,27.16 110.35,15.82 100.96,15.82 100.96,27.16 103.22,27.16 103.22,18.09 108.09,18.09 "/>
+  <polygon class="fil2" points="92.83,18.09 98.18,18.09 98.18,15.82 90.56,15.82 90.56,27.16 98.18,27.16 98.18,24.89 92.83,24.89 92.83,22.63 98.18,22.63 98.18,20.36 92.83,20.36 "/>
+  <polygon class="fil2" points="77.3,27.16 88.64,27.16 88.64,24.9 86.69,24.9 86.69,15.82 84.43,15.82 84.43,24.9 79.56,24.9 79.56,15.82 77.3,15.82 "/>
+  <polygon class="fil2" points="71.97,27.16 74.24,27.16 74.24,15.82 71.97,15.82 71.97,20.36 66.62,20.36 66.62,15.82 64.35,15.82 64.35,27.16 66.62,27.16 66.62,22.63 71.97,22.63 "/>
+  <path class="fil2" d="M52.53 21.49c0,-2.06 1.66,-3.73 3.72,-3.73 2.06,0 3.73,1.67 3.73,3.73 0,2.06 -1.67,3.73 -3.73,3.73 -2.06,0 -3.72,-1.67 -3.72,-3.73zm-2.27 0c0,3.31 2.69,6 5.99,6 3.31,0 6,-2.69 6,-6 0,-3.3 -2.69,-5.99 -6,-5.99 -3.3,0 -5.99,2.69 -5.99,5.99z"/>
+  <path class="fil3" d="M8.81 13.55l0 0 -8.81 13.55 0 0 17.61 0 0 0 -8.8 -13.55 0 0zm3.75 10.84l-3.75 -5.74 -2.88 4.4 -0.19 0.29 -0.68 1.05 3.75 0 3.75 0z"/>
+  <polygon class="fil2" points="132.74,27.16 135.01,27.16 135.01,13.55 124.57,13.55 124.57,27.16 126.84,27.16 126.84,15.82 132.74,15.82 "/>
+  <polygon class="fil2" points="50.53,13.55 47.58,13.55 42.54,19.15 42.55,13.55 40.28,13.55 40.28,27.16 42.55,27.16 42.54,21.08 47.58,27.16 50.53,27.16 44.65,20.09 "/>
+  <rect class="fil4" x="189.17" y="24.89" width="3.79" height="2.26"/>
+ </g>
+</svg>
diff --git a/rsconcept/frontend/src/components/Navigation/Logo.tsx b/rsconcept/frontend/src/components/Navigation/Logo.tsx
index 3e8507c5..4e22b6d1 100644
--- a/rsconcept/frontend/src/components/Navigation/Logo.tsx
+++ b/rsconcept/frontend/src/components/Navigation/Logo.tsx
@@ -1,19 +1,26 @@
 import { Link } from 'react-router-dom';
 
+import { useConceptTheme } from '../../context/ThemeContext';
 import useWindowSize from '../../hooks/useWindowSize';
 
 const HIDE_LOGO_TEXT_LIMIT = 700;
 
 function Logo() {
+  const { darkMode } = useConceptTheme();
   const windowSize = useWindowSize();
 
   return (
     <Link to='/' className='flex items-center h-full mr-2' tabIndex={-1}>
-      { (windowSize.width && windowSize.width >= HIDE_LOGO_TEXT_LIMIT) && 
+      { (windowSize.width && windowSize.width >= HIDE_LOGO_TEXT_LIMIT) && !darkMode &&
       <img alt=''
         src='/logo_full.svg'
         className='max-h-[1.6rem] min-w-[1.6rem]'
       />}
+      { (windowSize.width && windowSize.width >= HIDE_LOGO_TEXT_LIMIT) && darkMode &&
+      <img alt=''
+        src='/logo_full_dark.svg'
+        className='max-h-[1.6rem] min-w-[1.6rem]'
+      />}
       { (!windowSize.width || windowSize.width < HIDE_LOGO_TEXT_LIMIT) && 
       <img alt=''
         src='/logo_sign.svg'
diff --git a/rsconcept/frontend/src/components/RSInput/index.tsx b/rsconcept/frontend/src/components/RSInput/index.tsx
index 454c12c2..94c62d24 100644
--- a/rsconcept/frontend/src/components/RSInput/index.tsx
+++ b/rsconcept/frontend/src/components/RSInput/index.tsx
@@ -106,7 +106,7 @@ function RSInput({
         event.preventDefault();
         return;
       }
-      if (event.key === 'B') {
+      if (event.code === 'KeyB') {
         text.insertChar('ℬ');
         event.preventDefault();
         return;