From 435499640953545782929a492d57754d41ba7a68 Mon Sep 17 00:00:00 2001
From: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
Date: Fri, 13 Nov 2020 17:16:32 -0500
Subject: [PATCH] Logo centered and UI
Change-Id: I0450d19b0600c84b3272dfd18151a733388c1ff3
---
.../assets/img/jams_logo_no_gnu_package.svg | 632 ++++++++++++++++++
.../components/sidebarStyle.js | 24 +-
.../layouts/adminStyle.js | 3 +-
.../src/components/Devices/Devices.js | 4 +-
.../PasswordDialog/PasswordDialog.js | 4 +
.../src/components/Sidebar/Sidebar.js | 28 +-
jams-react-client/src/layouts/BaseLayout.js | 4 +-
jams-react-client/src/layouts/SignIn.js | 2 +-
jams-react-client/src/layouts/SignUp.js | 2 +-
.../src/views/Blueprint/Blueprint.js | 2 +-
.../src/views/Blueprints/Blueprints.js | 5 +-
jams-react-client/src/views/Groups/Groups.js | 5 +-
.../src/views/Settings/Settings.js | 1 -
.../views/UserProfile/DisplayUserProfile.js | 8 +-
.../UserProfile/EditCreateUserProfile.js | 13 +-
.../src/views/UserProfile/UserProfile.js | 1 -
16 files changed, 691 insertions(+), 47 deletions(-)
create mode 100644 jams-react-client/src/assets/img/jams_logo_no_gnu_package.svg
diff --git a/jams-react-client/src/assets/img/jams_logo_no_gnu_package.svg b/jams-react-client/src/assets/img/jams_logo_no_gnu_package.svg
new file mode 100644
index 00000000..1011a7f9
--- /dev/null
+++ b/jams-react-client/src/assets/img/jams_logo_no_gnu_package.svg
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 1299.5 446.4" style="enable-background:new 0 0 1299.5 446.4;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#000930;}
+ .st1{display:none;}
+ .st2{display:inline;}
+ .st3{fill:#00AEFF;}
+ .st4{opacity:0.5;fill:url(#SVGID_1_);}
+ .st5{fill:#008BCC;}
+ .st6{opacity:0.5;fill:url(#SVGID_2_);}
+ .st7{fill:#4DC6FF;}
+ .st8{opacity:0.4;fill:url(#SVGID_3_);}
+ .st9{opacity:0.5;fill:url(#SVGID_4_);}
+ .st10{opacity:0.5;fill:url(#SVGID_5_);}
+ .st11{opacity:0.4;fill:url(#SVGID_6_);}
+ .st12{fill:#66CFFF;}
+ .st13{opacity:0.5;fill:url(#SVGID_7_);}
+ .st14{fill:#1AB6FF;}
+ .st15{fill:#009DE6;}
+ .st16{opacity:0.6;fill:url(#SVGID_8_);}
+ .st17{fill:url(#SVGID_9_);}
+ .st18{opacity:0.5;fill:url(#SVGID_10_);}
+ .st19{fill:url(#SVGID_11_);}
+ .st20{fill:url(#SVGID_12_);}
+ .st21{fill:url(#SVGID_13_);}
+ .st22{fill:url(#SVGID_14_);}
+ .st23{fill:url(#SVGID_15_);}
+ .st24{fill:url(#SVGID_16_);}
+ .st25{opacity:0.4;fill:url(#SVGID_17_);enable-background:new ;}
+ .st26{fill:url(#SVGID_18_);}
+ .st27{fill:url(#SVGID_19_);}
+ .st28{fill:url(#SVGID_20_);}
+ .st29{fill:url(#SVGID_21_);}
+ .st30{fill:url(#SVGID_22_);}
+ .st31{fill:url(#SVGID_23_);}
+ .st32{fill:url(#SVGID_24_);}
+ .st33{fill:url(#SVGID_25_);}
+ .st34{fill:url(#SVGID_26_);}
+ .st35{opacity:0.2;fill:url(#SVGID_27_);enable-background:new ;}
+ .st36{fill:url(#SVGID_28_);}
+ .st37{fill:url(#SVGID_29_);}
+ .st38{opacity:0.25;fill:url(#SVGID_30_);enable-background:new ;}
+ .st39{fill:url(#SVGID_31_);}
+ .st40{fill:url(#SVGID_32_);}
+ .st41{opacity:0.2;fill:url(#SVGID_33_);enable-background:new ;}
+ .st42{fill:url(#SVGID_34_);}
+</style>
+<g id="Layer_1">
+ <g>
+ <path class="st0" d="M500.1,87.7v111.9c0,64.3-51.9,116.6-116.2,116.6v-31.5c46.8-0.4,84.7-38.3,84.7-85.1V87.7H500.1z
+ M505.6,31.1c0-11.9-9.8-21.3-21.3-21.3c-11.9,0-21.3,9.4-21.3,21.3c0,11.5,9.4,21.3,21.3,21.3C495.8,52.4,505.6,42.6,505.6,31.1z
+ "/>
+ <path class="st0" d="M755,314.1h-31.5v-34.5c-21.3,22.6-51.5,36.6-84.7,36.6c-64.3,0-116.6-52.4-116.6-116.6
+ S574.5,83.4,638.8,83.4c64.3,0,116.2,51.9,116.2,116.2V314.1z M723.5,199.6c0-46.8-37.9-84.7-84.7-84.7
+ c-46.8,0-85.1,37.9-85.1,84.7c0,46.8,38.3,85.1,85.1,85.1C685.6,284.8,723.5,246.5,723.5,199.6z"/>
+ <path class="st0" d="M1049.1,314.1V166c0-28.9-23.4-51.9-52.4-51.9c-28.9,0-52.4,23.4-52.4,52.4v147.7h-31.5V166
+ c0-28.9-23.4-51.9-52.4-51.9c-28.5,0-51.9,23.4-51.9,52.4v147.7h-31.5V166c0-46.4,37.5-83.4,83.4-83.4c28.1,0,52.8,13.6,68.1,34.9
+ c15.3-21.3,40-34.9,68.1-34.9c46.4,0,83.9,37.5,83.9,83.9v147.7H1049.1z"/>
+ </g>
+ <path class="st0" d="M1273,217.1c-7.9-8.4-17.4-14.5-28.5-18c-10.9-3.4-25.4-6.9-43.2-10.3c-14.4-2.5-25.8-5-33.8-7.4
+ c-7.9-2.3-14.6-6-19.9-10.8c-5.2-4.8-7.7-11-7.7-19c0-10.5,4.5-18.8,13.9-25.3c9.4-6.5,23.7-9.9,42.5-9.9c25,0,46.9,6.3,64.9,18.8
+ c0.5,0.3,1,0.4,1.5,0.3c0.5-0.1,1-0.5,1.2-0.9l13.2-24.3c0.5-0.9,0.2-2-0.6-2.5c-9.5-6.3-21.7-11.5-36.3-15.4
+ c-14.6-3.9-29.3-5.8-43.9-5.8c-28.1,0-50.4,6.1-66.3,18.3c-16,12.2-24.2,28.2-24.2,47.5c0,15.5,4.1,27.8,12.2,36.6
+ c8,8.7,17.8,15,29.1,18.6c11.1,3.6,25.9,7.1,44.1,10.5c13.5,2.2,24.4,4.6,32.5,7c7.9,2.3,14.6,5.8,19.7,10.2
+ c5,4.3,7.4,10.2,7.4,17.9c0,11-4.5,19.4-13.8,25.4c-9.4,6.1-24.3,9.3-44.3,9.3c-15,0-29.7-2.3-43.7-6.9
+ c-13.9-4.6-25.6-10.6-34.7-17.8c-0.4-0.3-1-0.5-1.5-0.4c-0.5,0.1-1,0.4-1.3,0.9l-13.6,23.8c-0.5,0.8-0.3,1.8,0.4,2.4
+ c9.5,8.1,22.8,14.9,39.6,20.2c16.7,5.3,34.4,8,52.7,8c29.2,0,52.4-5.9,69-17.6c16.8-11.8,25.3-28,25.3-48.2
+ C1285,237.5,1281,225.6,1273,217.1z"/>
+ <g>
+ <path class="st0" d="M946,363.8c-7.8,0-15.3,2.8-21.2,7.7v-16h-11.5v40.6c0,17.9,14.7,32.5,32.7,32.5c18.1,0,32.8-14.6,32.8-32.5
+ C978.8,378.3,964.1,363.8,946,363.8z M967.3,396.1c0,11.6-9.6,21.1-21.3,21.1c-11.7,0-21.2-9.5-21.2-21.1c0-11.6,9.5-21,21.2-21
+ C957.8,375.1,967.3,384.6,967.3,396.1z"/>
+ <path class="st0" d="M1038.8,396.1c0,11.6-9.5,21.1-21.2,21.1c-11.8,0-21.3-9.5-21.3-21.1v-31.7h-11.5v31.7
+ c0,17.9,14.7,32.5,32.8,32.5c7.8,0,15.3-2.8,21.2-7.7V437h11.5v-72.5h-11.5V396.1z"/>
+ <path class="st0" d="M1100.9,344.1c-4.1,0-7.2,3.1-7.2,7.2c0,3.9,3.2,7.2,7.2,7.2c3.9,0,7.2-3.3,7.2-7.2
+ C1108.2,347.3,1104.9,344.1,1100.9,344.1z"/>
+ <path class="st0" d="M1095.2,396c0,11.5-9.5,21-21.2,21.1l-1.5,0v11.4h1.5c18,0,32.7-14.6,32.7-32.5v-31.2h-11.5V396z"/>
+ <path class="st0" d="M1243.1,363.4c-7.1,0-13.7,3-18.3,8.3c-4.6-5.3-11.1-8.3-18.3-8.3c-13.2,0-23.9,10.6-23.9,23.7v40.9h11.5
+ v-40.7c0-6.8,5.6-12.4,12.4-12.4c6.9,0,12.5,5.5,12.5,12.3v40.9h11.5v-40.7c0-6.8,5.6-12.4,12.5-12.4s12.5,5.5,12.5,12.3v40.9
+ h11.5v-40.7C1267.1,374.1,1256.3,363.4,1243.1,363.4z"/>
+ <path class="st0" d="M1278.8,358.4c4.1,0,7.2-3.1,7.2-7.2c0-3.9-3.2-7.2-7.2-7.2c-4,0-7.2,3.2-7.2,7.2
+ C1271.5,355.2,1274.7,358.4,1278.8,358.4z"/>
+ <rect x="1273" y="364.8" class="st0" width="11.5" height="63.2"/>
+ <path class="st0" d="M1144.4,363.7c-18.1,0-32.8,14.6-32.8,32.5s14.7,32.5,32.8,32.5h32.8v-32.5
+ C1177.2,378.3,1162.5,363.7,1144.4,363.7z M1165.9,396.2v21.3h-21.5c-11.9,0-21.5-9.6-21.5-21.3s9.7-21.3,21.5-21.3
+ C1156.3,374.8,1165.9,384.4,1165.9,396.2z"/>
+ </g>
+</g>
+<g id="Layer_2" class="st1">
+ <g class="st2">
+ <path class="st3" d="M127.4,101.9c14.1-21.6,26.7-38.2,37.6-50.9c0,0,0,0,0,0.1c0,0,0.1-0.1,0.1-0.1
+ C124.4,6.1,104.6,8.6,103.5,8.9c-0.6,0-1.4,0.3-2,0.6c-1.4,0.6-2.8,5.1-2.8,5.1s-8.5,24.8,25.9,90.9L127.4,101.9L127.4,101.9z"/>
+ <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="97.9914" y1="57.1103" x2="165.387" y2="57.1103">
+ <stop offset="0" style="stop-color:#00AEFF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st4" d="M127.7,101.9c14.1-21.6,26.7-38.2,37.6-50.9c0,0,0,0,0,0.1c0,0,0.1-0.1,0.1-0.1
+ C124.7,6.1,104.9,8.6,103.8,8.9c-0.6,0-1.4,0.3-2,0.6c-1.4,0.6-2.8,5.1-2.8,5.1s-8.5,24.8,25.9,90.9L127.7,101.9L127.7,101.9z"/>
+ <path class="st5" d="M241.3,161.6c74.3,12,84.9,30.5,84.9,30.5c0,1.1,0,2.3,0,3.4c0,0.6-0.3,1.1-0.6,2c-0.3,0.9-6.8,15.1-55,25.3
+ L241.3,161.6z"/>
+ <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="283.7863" y1="161.5575" x2="283.7863" y2="222.7958">
+ <stop offset="0" style="stop-color:#008BCC"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st6" d="M241.3,161.6c74.3,12,84.9,30.5,84.9,30.5c0,1.1,0,2.3,0,3.4c0,0.6-0.3,1.1-0.6,2c-0.3,0.9-6.8,15.1-55,25.3
+ L241.3,161.6z"/>
+ <path class="st7" d="M53.4,222.8c-16.8,44.7-7.7,57.3-7.2,58.4c0.3,0.6,0.6,1.1,1.1,1.4c1.1,0,2.3-0.3,3.4-0.6
+ c0,0,30.5-1.4,66.1-52.1L53.4,222.8z"/>
+ <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="87.209" y1="265.3497" x2="60.3301" y2="218.7941">
+ <stop offset="0" style="stop-color:#4DC6FF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st8" d="M53.4,222.8c-16.8,44.7-7.7,57.3-7.2,58.4c0.3,0.6,0.9,1.4,1.4,1.7c1.1,0,2-0.6,3.1-0.9
+ c0,0,30.5-1.4,66.1-52.1L53.4,222.8z"/>
+ <path class="st3" d="M200.6,222.2c55.3,63.2,74.6,59.5,74.6,59.5c1.1,0.3,2.6,0.6,3.7,0.6c0.6-0.3,0.9-0.9,1.1-1.4
+ c0.9-1.1,14.2-27.1-38.7-119.3L200.6,222.2z"/>
+ <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="234.1831" y1="261.7554" x2="279.3609" y2="183.505">
+ <stop offset="0" style="stop-color:#00AEFF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st9" d="M200.3,222.2c55.3,63.2,74.6,59.5,74.6,59.5c1.1,0.3,2.6,0.6,3.7,0.6c0.6-0.3,0.9-0.9,1.1-1.4
+ c0.9-1.1,14.5-27.1-38.4-119.3L200.3,222.2z"/>
+ <path class="st5" d="M129.1,230.2C10.9,226.8,1.5,198.9,1,197.4c-0.3-0.6-0.6-1.1-0.6-2c0.3-2,4.3-5.7,4.3-5.7
+ s30.2-18.5,80.6-28.5L129.1,230.2z"/>
+ <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="39.4643" y1="169.6463" x2="96.1567" y2="267.8404">
+ <stop offset="0" style="stop-color:#008BCC"/>
+ <stop offset="0" style="stop-color:#008BCC"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st10" d="M129.1,230.2C10.9,226.8,1.5,198.9,1,197.4c-0.3-0.6-0.6-1.1-0.6-2c0.3-2,4.3-5.7,4.3-5.7
+ s30.2-18.5,80.6-28.5L129.1,230.2z"/>
+ <path class="st7" d="M207.7,98.6C237.6,28.3,226,12,226,12c-0.3-0.9-0.6-2-0.9-2.8c-0.6-0.3-1.1-0.3-2-0.6
+ c-1.4-0.3-33-2.6-95.7,93.3L207.7,98.6z"/>
+ <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="238.2546" y1="22.7968" x2="143.065" y2="117.9864">
+ <stop offset="0" style="stop-color:#4DC6FF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st11" d="M207.7,99.1C237.6,28.7,226,12.5,226,12.5c-0.3-0.9-0.6-2-0.9-2.8c-0.6-0.3-1.1-0.3-2-0.6
+ c-1.4-0.3-33-2.6-95.7,93.3L207.7,99.1z"/>
+ <path class="st12" d="M160,271.7c-40.4,43.9-57.1,44.8-58.2,44.8c-1.7-0.6-3.4-1.4-4.8-2.3l-49.7-31.6
+ c20.8-4.6,42.8-33.7,69.6-65.3L160,271.7z"/>
+ <linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="132.8499" y1="226.514" x2="85.7377" y2="308.1147">
+ <stop offset="1.818783e-03" style="stop-color:#66CFFF"/>
+ <stop offset="4.749321e-02" style="stop-color:#80D7FF"/>
+ <stop offset="0.1187" style="stop-color:#A2E2FF"/>
+ <stop offset="0.1977" style="stop-color:#BFEBFF"/>
+ <stop offset="0.2851" style="stop-color:#D7F2FF"/>
+ <stop offset="0.3845" style="stop-color:#E9F8FF"/>
+ <stop offset="0.5029" style="stop-color:#F5FCFF"/>
+ <stop offset="0.6589" style="stop-color:#FDFEFF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st13" d="M160,271.7c-40.4,43.9-57.7,44.8-58.8,44.8c-1.7-0.6-3.4-1.4-4.8-2.3l-49.3-31.3c20.8-4.6,43-34,69.8-65.6
+ L160,271.7z"/>
+ <path class="st14" d="M54.8,107.4c-17.9-46.1-9.1-60.7-8.5-61.5c1.1-1.4,2.6-2.6,4-3.4l51.3-33c-4.3,20.2,4.8,53,21.6,88.9
+ L54.8,107.4z"/>
+ <path class="st15" d="M238,166.5c38.5,5.4,73.7,14.4,88.2,28.9l-0.3-58.4c0-1.7-0.3-3.7-0.6-5.4c-0.3-0.9-9-16.4-55.4-26.3
+ L238,166.5z"/>
+ <linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="254.7876" y1="131.5979" x2="336.0161" y2="178.4952">
+ <stop offset="1.818783e-03" style="stop-color:#009DE6"/>
+ <stop offset="4.656537e-02" style="stop-color:#2BADEA"/>
+ <stop offset="0.1007" style="stop-color:#57BEEE"/>
+ <stop offset="0.1605" style="stop-color:#7FCEF2"/>
+ <stop offset="0.2246" style="stop-color:#A2DBF6"/>
+ <stop offset="0.2942" style="stop-color:#BFE6F9"/>
+ <stop offset="0.3711" style="stop-color:#D7EFFB"/>
+ <stop offset="0.4586" style="stop-color:#E9F6FD"/>
+ <stop offset="0.5627" style="stop-color:#F5FBFE"/>
+ <stop offset="0.6999" style="stop-color:#FDFEFF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st16" d="M238,166.5c38.5,5.4,73.7,14.4,88.2,28.9v-58.4c0-1.7-0.3-3.7-0.6-5.4c-0.3-0.9-9.3-16.4-55.7-26.3
+ L238,166.5z"/>
+ <path class="st15" d="M206.3,97.8c-8.5-0.3-27.1-1.1-43-1.1C17.8,96.6,1.8,130.2,1,131.9c-0.6,1.7-0.6,3.4-0.6,5.4V196
+ c14.2-14.2,45.3-21.9,83.2-27.6c24.5-3.4,49-5.4,73.8-5.7c4.6,0,9.1,0,13.7,0C171,162.4,214.9,98,206.3,97.8z"/>
+ <path class="st12" d="M220.8,196C300,74.1,281.2,47.3,280.4,45.9c-1.1-1.4-2.6-2.6-4-3.4l-51.3-33c7.1,33.6-27.1,93.7-66.4,153.2
+ c13.1,20.2,27.3,42.7,41.9,59.5C203.5,218.8,215.4,204.3,220.8,196z"/>
+
+ <linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="275.975" y1="-372.92" x2="190.576" y2="-533.1802" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="3.820000e-02" style="stop-color:#2174B1"/>
+ <stop offset="0.1177" style="stop-color:#0B86C4"/>
+ <stop offset="0.2081" style="stop-color:#0A94D2"/>
+ <stop offset="0.3177" style="stop-color:#0C9BDB"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6823" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7919" style="stop-color:#0A94D2"/>
+ <stop offset="0.8823" style="stop-color:#0B86C4"/>
+ <stop offset="0.9618" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st17" d="M204.6,226.2c0.3-0.3,0.6-0.3,0.6-0.6c-15.1-17.9-29.1-36.7-41.9-56.1c-0.3,0.3-0.6,0.6-0.6,1.1
+ C162.4,170.4,190.1,214,204.6,226.2z"/>
+ <path class="st14" d="M205.2,225.6c-15.1-17.9-29.1-36.7-41.9-56.1c-1.4-2.3-3.1-4.6-4.6-6.8c-24.8,0-49.6,2-74.1,5.4
+ c0.9,1.4,12.2,20.5,20.5,33.3c79.2,121.9,116.2,117.1,117.9,116.8c1.7-0.6,3.4-1.4,4.8-2.3l51-33.6
+ C258.2,277.5,231.4,256.1,205.2,225.6z"/>
+ <linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="132.807" y1="140.3285" x2="232.6371" y2="313.2392">
+ <stop offset="0" style="stop-color:#1AB6FF"/>
+ <stop offset="1.878715e-02" style="stop-color:#2BBBFF"/>
+ <stop offset="7.450032e-02" style="stop-color:#57C9FF"/>
+ <stop offset="0.136" style="stop-color:#7FD6FF"/>
+ <stop offset="0.2019" style="stop-color:#A2E1FF"/>
+ <stop offset="0.2735" style="stop-color:#BFEBFF"/>
+ <stop offset="0.3527" style="stop-color:#D7F2FF"/>
+ <stop offset="0.4427" style="stop-color:#E9F8FF"/>
+ <stop offset="0.5499" style="stop-color:#F5FCFF"/>
+ <stop offset="0.6912" style="stop-color:#FDFEFF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <path class="st18" d="M205.2,225.6c-15.1-17.9-29.1-36.7-41.9-56.1c-1.4-2.3-3.1-4.6-4.6-6.8c-24.8,0-49.6,2-74.1,5.4
+ c0.9,1.4,12.2,20.5,20.5,33.3c79.2,121.9,116.2,117.1,117.9,116.8c1.7-0.6,3.4-1.4,4.8-2.3l51-33.6
+ C258.2,277.5,231.4,256.1,205.2,225.6z"/>
+ </g>
+</g>
+<g id="Layer_3">
+ <g>
+
+ <linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="181.6281" y1="-500.104" x2="168.7209" y2="-485.0456" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <polygon class="st19" points="156.4,156.4 176.4,155.9 166.6,174.7 "/>
+
+ <linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="292.7782" y1="-506.6081" x2="292.7782" y2="-610.1052" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="7.040000e-02" style="stop-color:#2D4576"/>
+ <stop offset="0.2165" style="stop-color:#2E5589"/>
+ <stop offset="0.3608" style="stop-color:#2B5E97"/>
+ <stop offset="0.5" style="stop-color:#29629C"/>
+ <stop offset="0.6392" style="stop-color:#2B5E97"/>
+ <stop offset="0.7835" style="stop-color:#2E5589"/>
+ <stop offset="0.9296" style="stop-color:#2D4576"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st20" d="M242.8,161.2c73.4,11.8,83.8,30.1,83.8,30.1c0,1.1,0,2.2,0,3.4c0,0.6-0.3,1.1-0.6,2
+ c-0.3,0.8-7.6,16-55.1,26.2L242.8,161.2z"/>
+
+ <linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="62.6356" y1="-617.9026" x2="96.2178" y2="-558.1093" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#252B59"/>
+ <stop offset="8.590000e-02" style="stop-color:#2B3A69"/>
+ <stop offset="0.2267" style="stop-color:#2E4A7C"/>
+ <stop offset="0.3658" style="stop-color:#2E5487"/>
+ <stop offset="0.5" style="stop-color:#2D578C"/>
+ <stop offset="0.6342" style="stop-color:#2E5487"/>
+ <stop offset="0.7733" style="stop-color:#2E4A7C"/>
+ <stop offset="0.9141" style="stop-color:#2B3A69"/>
+ <stop offset="1" style="stop-color:#252B59"/>
+ </linearGradient>
+ <path class="st21" d="M57.7,220.3c-16.6,44.2-8.2,57.9-7.6,59.1c0.3,0.6,0.6,1.1,1.1,1.4c1.1,0,2.2-0.3,3.4-0.6
+ c0,0,30.1-1.4,65.2-51.5L57.7,220.3z"/>
+
+ <linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="158.6792" y1="-414.9013" x2="103.0936" y2="-350.0509" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#181844"/>
+ <stop offset="2.840000e-02" style="stop-color:#1E1E4C"/>
+ <stop offset="0.1353" style="stop-color:#283261"/>
+ <stop offset="0.2468" style="stop-color:#2D4172"/>
+ <stop offset="0.3647" style="stop-color:#2E4A7C"/>
+ <stop offset="0.5" style="stop-color:#2E4D7F"/>
+ <stop offset="0.6177" style="stop-color:#2D4576"/>
+ <stop offset="0.8125" style="stop-color:#273160"/>
+ <stop offset="1" style="stop-color:#181844"/>
+ </linearGradient>
+ <path class="st22" d="M167.4,51.8c-40.2-44.2-59.6-41.6-60.7-41.3c-0.6,0-1.4,0.3-2,0.6c-1.4,0.6-2.8,5.1-2.8,5.1
+ s-8.4,24.5,25.6,89.7L167.4,51.8z"/>
+
+ <linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="268.744" y1="-625.0323" x2="225.8019" y2="-486.6978" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#181844"/>
+ <stop offset="2.840000e-02" style="stop-color:#1E1E4C"/>
+ <stop offset="0.1353" style="stop-color:#283261"/>
+ <stop offset="0.2468" style="stop-color:#2D4172"/>
+ <stop offset="0.3647" style="stop-color:#2E4A7C"/>
+ <stop offset="0.5" style="stop-color:#2E4D7F"/>
+ <stop offset="0.6177" style="stop-color:#2D4576"/>
+ <stop offset="0.8125" style="stop-color:#273160"/>
+ <stop offset="1" style="stop-color:#181844"/>
+ </linearGradient>
+ <path class="st23" d="M202.6,221.1c54.6,62.4,73.7,58.8,73.7,58.8c1.1,0.3,2.5,0.6,3.7,0.6c0.6-0.3,0.8-0.8,1.1-1.4
+ c0.8-1.1,16.3-26.4-36-117.6L202.6,221.1z"/>
+
+ <linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="76.4995" y1="-506.6073" x2="76.4995" y2="-610.1024" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="7.040000e-02" style="stop-color:#2D4576"/>
+ <stop offset="0.2165" style="stop-color:#2E5589"/>
+ <stop offset="0.3608" style="stop-color:#2B5E97"/>
+ <stop offset="0.5" style="stop-color:#29629C"/>
+ <stop offset="0.6392" style="stop-color:#2B5E97"/>
+ <stop offset="0.7835" style="stop-color:#2E5589"/>
+ <stop offset="0.9296" style="stop-color:#2D4576"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st24" d="M132,230.7c-112.5-4.8-126-32.6-126.6-34c-0.3-0.6-0.6-1.1-0.6-2c0.3-2,4.2-5.6,4.2-5.6s29.8-18.3,79.6-28.1
+ L132,230.7z"/>
+
+ <linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="133.4038" y1="-405.0396" x2="174.0339" y2="-405.0396" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st25" d="M164.3,48.4c-14.1,15.2-27,31.5-38.8,48.4h2.8c8.7-11,30.4-38.5,37.7-46.4L164.3,48.4z"/>
+
+ <linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="187.0131" y1="-448.0157" x2="187.0131" y2="-350.3966" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#252B59"/>
+ <stop offset="0.5" style="stop-color:#2D578C"/>
+ <stop offset="0.6934" style="stop-color:#2D5588"/>
+ <stop offset="0.8038" style="stop-color:#2E4F80"/>
+ <stop offset="0.8932" style="stop-color:#2D4474"/>
+ <stop offset="0.971" style="stop-color:#283463"/>
+ <stop offset="1" style="stop-color:#252B59"/>
+ </linearGradient>
+ <path class="st26" d="M209.6,99.1c29.5-69.5,18-85.5,18-85.5c-0.3-0.8-0.6-2-0.8-2.8c-0.6-0.3-1.1-0.3-2-0.6
+ C223.4,9.9,192.7,6,128,96.5L209.6,99.1z"/>
+
+ <linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="97.9865" y1="-637.535" x2="276.3237" y2="-367.9654" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="8.239999e-02" style="stop-color:#177EBC"/>
+ <stop offset="0.1675" style="stop-color:#0E91D1"/>
+ <stop offset="0.2527" style="stop-color:#10A2E1"/>
+ <stop offset="0.337" style="stop-color:#18ACEA"/>
+ <stop offset="0.42" style="stop-color:#24B1ED"/>
+ <stop offset="0.5" style="stop-color:#28B1ED"/>
+ <stop offset="0.58" style="stop-color:#24B1ED"/>
+ <stop offset="0.663" style="stop-color:#18ACEA"/>
+ <stop offset="0.7473" style="stop-color:#10A2E1"/>
+ <stop offset="0.8325" style="stop-color:#0E91D1"/>
+ <stop offset="0.9176" style="stop-color:#177EBC"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st27" d="M165.2,273.4c-39.9,43.3-59.1,40.8-60.2,40.8c-1.7-0.6-3.4-1.4-4.8-2.2L51.5,281
+ c20.5-4.5,45.8-28.7,72.3-59.9L165.2,273.4z"/>
+
+ <linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="81.8875" y1="-642.9006" x2="152.5226" y2="-579.6575" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2C5D95"/>
+ <stop offset="8.220001e-02" style="stop-color:#246EAB"/>
+ <stop offset="0.1808" style="stop-color:#1B79B9"/>
+ <stop offset="0.3007" style="stop-color:#1080C2"/>
+ <stop offset="0.5" style="stop-color:#0E81C5"/>
+ <stop offset="0.6993" style="stop-color:#1080C2"/>
+ <stop offset="0.8192" style="stop-color:#1B79B9"/>
+ <stop offset="0.9178" style="stop-color:#246EAB"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st28" d="M166.9,275.1c-39.9,43.3-59.1,40.8-60.2,40.8c-1.7-0.6-3.4-1.4-4.8-2.2l-50.3-32.9c20.5-4.5,47.5-27,74-58.2
+ L166.9,275.1z"/>
+
+ <linearGradient id="SVGID_21_" gradientUnits="userSpaceOnUse" x1="75.3674" y1="-366.1688" x2="239.3868" y2="-639.5338" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2C5D95"/>
+ <stop offset="1.760000e-02" style="stop-color:#2A6199"/>
+ <stop offset="0.1407" style="stop-color:#1C79B7"/>
+ <stop offset="0.2631" style="stop-color:#0A8CCA"/>
+ <stop offset="0.3837" style="stop-color:#0B97D4"/>
+ <stop offset="0.5" style="stop-color:#0E9AD8"/>
+ <stop offset="0.6163" style="stop-color:#0B97D4"/>
+ <stop offset="0.7369" style="stop-color:#0A8CCA"/>
+ <stop offset="0.8593" style="stop-color:#1C79B7"/>
+ <stop offset="0.9824" style="stop-color:#2A6199"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st29" d="M60.3,106.4c-17.7-45.6-9-59.9-8.4-60.7c1.1-1.4,2.5-2.5,3.9-3.4l48.7-30.9c-4.2,20,6.5,50.6,23.1,86.3
+ L60.3,106.4z"/>
+
+ <linearGradient id="SVGID_22_" gradientUnits="userSpaceOnUse" x1="253.001" y1="-637.7335" x2="147.5363" y2="-504.8962" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2C5D95"/>
+ <stop offset="2.570000e-02" style="stop-color:#2A6199"/>
+ <stop offset="0.2053" style="stop-color:#1C79B7"/>
+ <stop offset="0.384" style="stop-color:#0A8CCA"/>
+ <stop offset="0.5599" style="stop-color:#0B97D4"/>
+ <stop offset="0.7296" style="stop-color:#0E9AD8"/>
+ <stop offset="0.7925" style="stop-color:#0B97D4"/>
+ <stop offset="0.8577" style="stop-color:#0A8CCA"/>
+ <stop offset="0.9239" style="stop-color:#1C79B7"/>
+ <stop offset="0.9905" style="stop-color:#2A6199"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st30" d="M162.9,160.4c-24.5,0-48.9,2-73.1,5.3c0.8,1.4,12.1,20.2,20.2,32.9C188.2,319,224.8,314.2,226.5,313.9
+ c1.7-0.6,3.4-1.4,4.8-2.2l48.7-30.9C246.7,273.7,200.6,219.7,162.9,160.4z"/>
+
+ <linearGradient id="SVGID_23_" gradientUnits="userSpaceOnUse" x1="100.5715" y1="-433.0317" x2="80.0374" y2="-359.1097" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2C5D95"/>
+ <stop offset="8.220001e-02" style="stop-color:#246EAB"/>
+ <stop offset="0.1808" style="stop-color:#1B79B9"/>
+ <stop offset="0.3007" style="stop-color:#1080C2"/>
+ <stop offset="0.5" style="stop-color:#0E81C5"/>
+ <stop offset="0.6993" style="stop-color:#1080C2"/>
+ <stop offset="0.8192" style="stop-color:#1B79B9"/>
+ <stop offset="0.9178" style="stop-color:#246EAB"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st31" d="M58.6,107.8c-17.7-45.6-9-59.9-8.4-60.7c1.1-1.4,2.5-2.5,3.9-3.4L104.7,11c-4.2,20,4.8,52.3,21.4,87.7
+ L58.6,107.8z"/>
+
+ <linearGradient id="SVGID_24_" gradientUnits="userSpaceOnUse" x1="333.1225" y1="-482.8043" x2="13.1914" y2="-482.8043" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="1.280000e-02" style="stop-color:#256BA7"/>
+ <stop offset="0.1121" style="stop-color:#0B83C3"/>
+ <stop offset="0.2115" style="stop-color:#1797D8"/>
+ <stop offset="0.3099" style="stop-color:#25A3E2"/>
+ <stop offset="0.4066" style="stop-color:#27ABE7"/>
+ <stop offset="0.5" style="stop-color:#2AAEEA"/>
+ <stop offset="0.5934" style="stop-color:#27ABE7"/>
+ <stop offset="0.6901" style="stop-color:#25A3E2"/>
+ <stop offset="0.7885" style="stop-color:#1797D8"/>
+ <stop offset="0.8879" style="stop-color:#0B83C3"/>
+ <stop offset="0.9872" style="stop-color:#256BA7"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st32" d="M242.5,167.1c38,5.3,69.5,13.2,83.8,27.6V137c0-1.7-0.3-3.7-0.6-5.3c-0.3-0.8-7.6-15.7-53.4-25.6
+ L242.5,167.1z"/>
+
+ <linearGradient id="SVGID_25_" gradientUnits="userSpaceOnUse" x1="241.4093" y1="-478.2634" x2="332.8521" y2="-483.1914" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2E5284"/>
+ <stop offset="6.100000e-03" style="stop-color:#2E5486"/>
+ <stop offset="9.120000e-02" style="stop-color:#29649D"/>
+ <stop offset="0.1876" style="stop-color:#236FAD"/>
+ <stop offset="0.3049" style="stop-color:#1D77B6"/>
+ <stop offset="0.5" style="stop-color:#1C78B9"/>
+ <stop offset="0.6951" style="stop-color:#1D77B6"/>
+ <stop offset="0.8124" style="stop-color:#236FAD"/>
+ <stop offset="0.9088" style="stop-color:#29649D"/>
+ <stop offset="0.9939" style="stop-color:#2E5486"/>
+ <stop offset="1" style="stop-color:#2E5284"/>
+ </linearGradient>
+ <path class="st33" d="M242.5,165.2c38,5.3,69.5,15.5,83.8,29.8v-60.2c0-1.7-0.3-3.7-0.6-5.3c-0.3-0.8-7.6-15.7-53.4-25.6
+ L242.5,165.2z"/>
+
+ <linearGradient id="SVGID_26_" gradientUnits="userSpaceOnUse" x1="12.9377" y1="-478.5856" x2="177.9198" y2="-478.5856" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="2.250000e-02" style="stop-color:#256BA7"/>
+ <stop offset="0.1971" style="stop-color:#0B83C3"/>
+ <stop offset="0.3718" style="stop-color:#1797D8"/>
+ <stop offset="0.5447" style="stop-color:#25A3E2"/>
+ <stop offset="0.7147" style="stop-color:#27ABE7"/>
+ <stop offset="0.8788" style="stop-color:#2AAEEA"/>
+ <stop offset="0.9015" style="stop-color:#27ABE7"/>
+ <stop offset="0.9249" style="stop-color:#25A3E2"/>
+ <stop offset="0.9487" style="stop-color:#1797D8"/>
+ <stop offset="0.9728" style="stop-color:#0B83C3"/>
+ <stop offset="0.9969" style="stop-color:#256BA7"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st34" d="M208.2,98.2c-8.4-0.3-26.7-1.1-42.5-1.1C22,97.1,6.3,130.3,5.4,132c-0.6,1.7-0.6,3.4-0.6,5.3v57.9
+ C18.9,181.2,49.6,173.6,87,168c24.2-3.4,48.4-5.3,72.8-5.6c4.5,0,9,0,13.5,0C173.3,162.1,216.6,98.5,208.2,98.2z"/>
+
+ <linearGradient id="SVGID_27_" gradientUnits="userSpaceOnUse" x1="128.9572" y1="-435.7314" x2="66.953" y2="-427.0119" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st35" d="M126.1,93.7c-30.1,1.4-51.7,3.7-69.7,8.7l0.8,2.2c1.7-0.3,3.7-0.8,5.3-1.1c21.7-3.4,43.3-5.6,65-6.5
+ L126.1,93.7z"/>
+
+ <linearGradient id="SVGID_28_" gradientUnits="userSpaceOnUse" x1="192.0278" y1="-488.9058" x2="16.8067" y2="-464.2652" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="3.820000e-02" style="stop-color:#2174B1"/>
+ <stop offset="0.1177" style="stop-color:#0B86C4"/>
+ <stop offset="0.2081" style="stop-color:#0A94D2"/>
+ <stop offset="0.3177" style="stop-color:#0C9BDB"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6823" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7919" style="stop-color:#0A94D2"/>
+ <stop offset="0.8823" style="stop-color:#0B86C4"/>
+ <stop offset="0.9618" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st36" d="M208.2,96c-8.4-0.3-26.7-1.1-42.5-1.1C22,94.8,6.3,128,5.4,129.7c-0.6,1.7-0.6,3.4-0.6,5.3v60.2
+ c14.1-14.1,44.7-23.9,82.1-29.5c24.2-3.4,48.4-5.3,72.8-5.6c4.5,0,9,0,13.5,0C179.8,160.1,216.6,96.3,208.2,96z"/>
+
+ <linearGradient id="SVGID_29_" gradientUnits="userSpaceOnUse" x1="273.2072" y1="-367.3556" x2="189.8825" y2="-510.8593" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="0.1238" style="stop-color:#177EBC"/>
+ <stop offset="0.2516" style="stop-color:#0E91D1"/>
+ <stop offset="0.3797" style="stop-color:#10A2E1"/>
+ <stop offset="0.5064" style="stop-color:#18ACEA"/>
+ <stop offset="0.631" style="stop-color:#24B1ED"/>
+ <stop offset="0.7513" style="stop-color:#28B1ED"/>
+ <stop offset="0.7911" style="stop-color:#24B1ED"/>
+ <stop offset="0.8324" style="stop-color:#18ACEA"/>
+ <stop offset="0.8743" style="stop-color:#10A2E1"/>
+ <stop offset="0.9167" style="stop-color:#0E91D1"/>
+ <stop offset="0.959" style="stop-color:#177EBC"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st37" d="M165.7,164.9c39.1-58.8,68.1-120.4,61-153.8L275.4,42c1.4,0.8,2.8,2,3.9,3.4c0.8,1.4,20,32.9-58.2,153.3
+ c-5.6,9-11,19.4-12.9,20.2c-11.5-11.2-35.4-43.9-41.3-52C166,165.7,165.7,164.9,165.7,164.9z"/>
+
+ <linearGradient id="SVGID_30_" gradientUnits="userSpaceOnUse" x1="283.8231" y1="-439.6182" x2="253.4852" y2="-496.5504" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st38" d="M274,104.1c-8.7,21.9-19.1,43-31.2,63l3.7,0.6c15.5-26.7,24.5-46.4,30.7-63L274,104.1z"/>
+
+ <linearGradient id="SVGID_31_" gradientUnits="userSpaceOnUse" x1="270.6096" y1="-370.5822" x2="187.0205" y2="-527.4453" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="3.820000e-02" style="stop-color:#2174B1"/>
+ <stop offset="0.1177" style="stop-color:#0B86C4"/>
+ <stop offset="0.2081" style="stop-color:#0A94D2"/>
+ <stop offset="0.3177" style="stop-color:#0C9BDB"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6823" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7919" style="stop-color:#0A94D2"/>
+ <stop offset="0.8823" style="stop-color:#0B86C4"/>
+ <stop offset="0.9618" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st39" d="M223.1,200.3C301.3,79.9,282.2,48.4,281.3,47c-1.1-1.4-2.5-2.5-3.9-3.4L226.8,11
+ c7,33.2-20.8,97.3-59.6,156.1c12.9,20,26.4,39.4,40.8,56C210.7,219.7,217.8,208.5,223.1,200.3z"/>
+
+ <linearGradient id="SVGID_32_" gradientUnits="userSpaceOnUse" x1="277.0814" y1="-374.1085" x2="192.7566" y2="-532.3528" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2867A2"/>
+ <stop offset="3.820000e-02" style="stop-color:#2174B1"/>
+ <stop offset="0.1177" style="stop-color:#0B86C4"/>
+ <stop offset="0.2081" style="stop-color:#0A94D2"/>
+ <stop offset="0.3177" style="stop-color:#0C9BDB"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6823" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7919" style="stop-color:#0A94D2"/>
+ <stop offset="0.8823" style="stop-color:#0B86C4"/>
+ <stop offset="0.9618" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2867A2"/>
+ </linearGradient>
+ <path class="st40" d="M206.5,225.1c0.3-0.3,0.6-0.3,0.6-0.6c-14.9-17.7-28.7-36.3-41.3-55.4c-0.3,0.3-0.6,0.6-0.6,1.1
+ C164.9,169.9,192.2,213,206.5,225.1z"/>
+
+ <linearGradient id="SVGID_33_" gradientUnits="userSpaceOnUse" x1="140.8843" y1="-554.018" x2="162.513" y2="-612.6138" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2B3B6A"/>
+ <stop offset="1" style="stop-color:#2B3B6A"/>
+ </linearGradient>
+ <path class="st41" d="M165.7,276.3c-0.6-0.8-29.2-34.6-42.5-54.6l-2.2,2.5c12.9,18.8,27.3,36.8,43,54L165.7,276.3z"/>
+
+ <linearGradient id="SVGID_34_" gradientUnits="userSpaceOnUse" x1="181.968" y1="-493.743" x2="207.4306" y2="-652.2678" gradientTransform="matrix(1 0 0 -1 -8.0854 -332.4089)">
+ <stop offset="0" style="stop-color:#2E5284"/>
+ <stop offset="2.440000e-02" style="stop-color:#2C5C92"/>
+ <stop offset="8.880000e-02" style="stop-color:#2075B1"/>
+ <stop offset="0.1599" style="stop-color:#0B86C4"/>
+ <stop offset="0.2403" style="stop-color:#0A94D2"/>
+ <stop offset="0.3378" style="stop-color:#0E9CDA"/>
+ <stop offset="0.5" style="stop-color:#109EDE"/>
+ <stop offset="0.6718" style="stop-color:#0C9BDB"/>
+ <stop offset="0.7751" style="stop-color:#0A94D2"/>
+ <stop offset="0.8603" style="stop-color:#0B86C4"/>
+ <stop offset="0.9351" style="stop-color:#2174B1"/>
+ <stop offset="1" style="stop-color:#2C5D95"/>
+ </linearGradient>
+ <path class="st42" d="M207.1,224.5c-14.9-17.7-28.7-36.3-41.3-55.4c-1.4-2.2-3.1-4.5-4.5-6.7c-24.5,0-48.9,2-73.1,5.3
+ c0.8,1.4,12.1,20.2,20.2,32.9C186.5,321,223.1,316.2,224.8,315.9c1.7-0.6,3.4-1.4,4.8-2.2l50.3-32.6
+ C259.4,276.3,232.9,254.6,207.1,224.5z"/>
+ </g>
+</g>
+<g id="Layer_4" class="st1">
+ <g class="st2">
+ <g>
+ <path class="st0" d="M221.7,316c-6.5,0-25.3-3.7-57.9-38.5c-32.6,34.1-51.1,37.2-57.5,36.8c-0.4,0-0.9-0.1-1.2-0.2
+ c-2.2-0.7-4.2-1.8-5.4-2.5l-47.5-30.2c-0.2-0.1-0.4-0.3-0.5-0.4c-1.2-0.7-1.8-2-2.2-2.7c-3.4-5.9-7-20.8,5.2-55.1
+ c-38.7-8.4-47.1-20.8-48.9-25.9c-0.2-0.3-0.3-0.7-0.5-1.2c-0.2-0.5-0.4-1-0.4-1.6v-60.1c0-0.7,0.2-1.3,0.4-1.8
+ c0.1-0.4,0.2-0.7,0.3-1.1c0.1-0.2,0.1-0.3,0.2-0.5c1.9-3.9,11.1-16.8,49.6-26.1c-15-41.5-6.8-55.6-5.8-57.2
+ c0.4-0.5,0.7-0.9,1.1-1.3c0.3-0.6,0.7-1,1.2-1.4l2-1.3c0.3-0.2,0.5-0.4,0.7-0.5l49.3-31.8c0.1-0.1,0.2-0.1,0.4-0.2
+ c0.4-0.2,1.8-0.9,3.3-0.9c3.5-0.5,22.9-0.8,59.6,38.5c37.2-42,55.9-38.9,56.7-38.7c0.2,0,0.3,0.1,0.5,0.1
+ c0.2,0.1,0.4,0.1,0.6,0.1c0.5,0.1,1.1,0.2,1.9,0.6c0.5,0.3,1,0.6,1.3,1.1l48.4,31.2c0.9,0.5,1.8,1.2,2.8,2.1
+ c0.1,0.1,0.2,0.2,0.2,0.2c0.6,0.6,1.2,1.1,1.7,1.8c0.1,0.1,0.2,0.3,0.3,0.4c2.2,3.7,8.2,18.5-5.8,57.1
+ c43.7,10.5,49.3,25.6,49.5,26.2c0.1,0.2,0.1,0.4,0.1,0.6c0.3,1.7,0.6,3.9,0.6,5.8v35.7l0.2,16.6c0,0.2,0.1,0.4,0.1,0.6v3.3
+ c0,1.1-0.3,1.9-0.6,2.6l-0.2,0.5c-0.9,2.7-7.5,16.2-50.4,26.1c14.4,38.4,8.2,52,6.1,55.1c-0.2,0.4-0.4,0.8-0.8,1.3
+ c-0.3,0.8-0.8,1.4-1.5,1.9l-49.1,31.8c-1.4,0.8-3.3,1.9-5.5,2.6c-0.2,0.1-0.4,0.1-0.6,0.1C223.3,315.9,222.6,316,221.7,316z
+ M165.4,269.7c1,0,2.1,0.4,2.8,1.2c34.4,37.1,51.9,37.5,54.1,37.4c1.1-0.4,2.3-1,3.5-1.7l43.6-28.3c-0.2-0.6-0.3-1.2-0.2-1.8
+ c0.2-1.8,1.7-3.2,3.6-3.4c0.4,0,1.1,0,1.4,0.1c0.3,0.1,0.6,0.1,0.9,0.2c1.2-2.4,6-16-10.2-55.4c-0.8-1.9,0.1-4.1,2-5
+ c1.9-0.9,4.1-0.1,5,1.8l0.5,0.9c40.9-9.2,45.8-21.1,45.9-21.3l0.3-1V191c0-0.2,0-0.3,0-0.5l-0.2-17.1v-35.8
+ c0-1.3-0.2-2.9-0.4-4.1c-0.8-1.3-9-13.4-48.1-22c-1.1-0.2-2-0.9-2.6-1.9c-0.5-1-0.6-2.2-0.2-3.2c14.7-38.6,9-52.4,8-54.3
+ c-0.3-0.3-0.5-0.5-0.8-0.8c0,0-0.1-0.1-0.1-0.1c-0.6-0.5-1.2-1-1.7-1.3L223.1,18c-0.1-0.1-0.2-0.2-0.3-0.2
+ c-0.1,0-0.3-0.1-0.4-0.1c-1.3-0.1-18.5,0.3-52.1,39.5c-1.3,1.5-3.4,1.8-5,0.7c-0.4-0.3-0.8-0.6-1.1-1.1
+ c-37.5-41-55.2-38.9-55.4-38.8c-0.2,0-0.5,0.1-0.7,0.1l0,0c0,0,0,0-0.1,0.1L58.7,49.8c-0.1,0-0.6,0.4-0.6,0.4l-0.8,0.5
+ c-0.1,0.1-0.2,0.3-0.4,0.4c-0.4,0.3-0.8,0.7-1.1,1.1c0,0,0,0,0,0c0,0-7.4,13.1,8.3,54c0.4,1,0.3,2.2-0.2,3.2
+ c-0.5,1-1.5,1.7-2.6,1.9C22.2,120,14,132,12.7,134.1c-0.1,0.4-0.2,0.8-0.2,1.3c0,0.2,0,0.3-0.1,0.5v57.7c0,0.1,0,0.1,0,0.2
+ c0.1,0.1,0.2,0.5,0.2,0.6c0.6,1.6,6.1,13.9,47.7,22.1c1.1,0.2,2.1,0.9,2.6,1.9c0.6,1,0.6,2.2,0.2,3.2
+ c-13.8,36.7-9.1,49.7-7.3,52.8c0,0.1,0.2,0.3,0.2,0.4c0,0,0,0,0,0l0.1,0c0.3,0.2,0.5,0.3,0.7,0.6l46.7,29.7
+ c1,0.6,2.2,1.2,3.3,1.6c4.6-0.1,21.4-2.8,52.5-35.7c1.2-1.2,3-1.5,4.4-0.8C164.4,269.8,164.9,269.7,165.4,269.7z M55.6,274.3
+ l0.3,0.2C55.8,274.4,55.7,274.4,55.6,274.3z M165.5,172.7C165.5,172.7,165.5,172.7,165.5,172.7c-1.4,0-2.6-0.7-3.3-1.8
+ c-0.7-1.1-1.4-2.1-2.1-3.2c-0.4-0.5-0.7-1.1-1.1-1.6c-0.1,0-0.2,0-0.3,0l-2,0c0,0,0,0,0,0c-2.1,0-3.8-1.7-3.8-3.8
+ c0-2.1,1.7-3.9,3.8-3.9l1.3,0c0.6,0,1.2,0,1.7,0h10c1.4,0,2.7,0.8,3.4,2s0.6,2.7-0.1,3.9l-1,1.5c-1.1,1.7-2.2,3.4-3.3,5.1
+ C168,172.1,166.8,172.7,165.5,172.7z"/>
+ </g>
+ <g>
+ <path class="st0" d="M108.7,314.4c-1,0-1.9-0.1-2.7-0.2c-0.4,0-0.6-0.1-1-0.2c-2.2-0.7-4.2-1.8-5.4-2.5l-47.5-30.2
+ c-1.3-0.8-2-2.4-1.7-3.9c0.3-1.5,1.4-2.7,3-3.1c17-3.7,37.5-20.7,66.5-55c1.4-1.6,3.8-1.8,5.4-0.4c1.6,1.4,1.8,3.8,0.4,5.4
+ c-25.9,30.6-45.6,48-62.6,54.9l40.5,25.8c1.1,0.7,2.4,1.3,3.5,1.7c0,0,0,0,0,0c3.9,0.6,19.4-0.2,52.3-35.8
+ c1.4-1.6,3.9-1.7,5.4-0.2c1.6,1.4,1.7,3.9,0.2,5.4C135.2,308.5,117.6,314.4,108.7,314.4z"/>
+ </g>
+ <g>
+ <path class="st0" d="M125,102.5c-1.4,0-2.8-0.8-3.5-2.2C107,69.4,100,42.2,101.1,22.4L58.7,49.8c-1.2,0.7-2.2,1.6-2.9,2.5
+ c-1.3,1.7-3.7,1.9-5.4,0.6c-1.7-1.3-1.9-3.7-0.6-5.4c1.3-1.6,2.9-3,4.9-4.2l49.3-31.8c1.3-0.8,3-0.8,4.3,0.1
+ c1.3,0.9,1.9,2.4,1.6,4C105.9,34,112.5,63,128.4,97c0.9,1.9,0.1,4.2-1.9,5.1C126.1,102.4,125.5,102.5,125,102.5z"/>
+ </g>
+ <g>
+ <path class="st0" d="M322.2,197.7c-1,0-2-0.4-2.7-1.1c-14.6-14.6-47.3-20.9-77.4-25.1c-2.1-0.3-3.6-2.2-3.3-4.3
+ c0.3-2.1,2.3-3.6,4.3-3.3c27.6,3.9,57.5,9.5,75.2,21.8v-48.1c0-1.3-0.2-3-0.4-4.2c-0.8-1.8-7-13.1-46.1-21.5
+ c-2.1-0.4-3.4-2.5-3-4.6c0.4-2.1,2.5-3.4,4.6-3c43,9.2,50.6,22.9,51.9,26.8c0.1,0.2,0.1,0.4,0.1,0.6c0.3,1.7,0.6,3.9,0.6,5.8
+ v56.2c0,1.6-0.9,3-2.4,3.6C323.2,197.6,322.7,197.7,322.2,197.7z"/>
+ </g>
+ <g>
+ <path class="st0" d="M8.6,198.2c-0.5,0-1-0.1-1.5-0.3c-1.4-0.6-2.4-2-2.4-3.6v-56.5c0-2.1,0-4.2,0.7-6.4c0.1-0.2,0.1-0.3,0.2-0.5
+ c3-6.1,24.8-36.1,159.8-36.1c12.3,0,24.4,0.5,33.3,0.8l5.9,0.2c2.1,0.1,3.8,1.8,3.7,4c-0.1,2.1-1.9,3.8-4,3.7l-5.9-0.2
+ c-8.8-0.3-20.8-0.8-33-0.8c-131.2,0-151.1,28.7-152.8,31.6c-0.3,1-0.3,2.2-0.3,3.7v48.4c14-9.7,37.5-16.5,75.7-22.3
+ c24.7-3.5,48.1-5.3,71.6-5.5h10.1c2.1,0,3.8,1.7,3.8,3.8s-1.7,3.8-3.8,3.8h-10c-23.1,0.3-46.1,2-70.5,5.4
+ c-28.7,4.3-63.5,11.1-77.9,25.5C10.6,197.8,9.6,198.2,8.6,198.2z"/>
+ </g>
+ <g>
+ <path class="st0" d="M206.9,225.2c-0.9,0-1.7-0.3-2.5-0.9c-1.6-1.4-1.9-3.8-0.5-5.4c1.8-2.1,5.6-8.2,9.4-14
+ c1.7-2.6,3.4-5.3,4.9-7.7C289.9,86.9,276.7,55,275.1,52c-0.7-0.8-1.6-1.6-2.6-2.2l-42.6-27.5c1.7,38.5-30.8,102.8-61.1,148.6
+ c-1.2,1.8-3.6,2.3-5.3,1.1c-1.8-1.2-2.3-3.6-1.1-5.3c41.2-62.4,64.9-123.2,59-151.2c-0.3-1.5,0.3-3.1,1.6-4
+ c1.3-0.9,3-0.9,4.3-0.1l49.4,31.8c1.8,1.1,3.5,2.5,4.8,4.1c0.1,0.1,0.2,0.3,0.3,0.4c3.4,5.7,16.9,40.1-56.9,153.6
+ c-1.6,2.4-3.2,5-4.9,7.6c-4.1,6.3-7.9,12.3-10,14.8C209.1,224.7,208,225.2,206.9,225.2z"/>
+ </g>
+ <g>
+ <path class="st0" d="M221.9,316c-9.1,0-46.2-7.6-115.5-114.3c-6.5-10.2-15.1-24.3-19.6-31.8l-0.2-0.4c-0.7-1.1-0.7-2.5-0.2-3.6
+ s1.7-2,2.9-2.1c25-3.5,49.1-5.2,71.9-5.2c1.3,0,2.6,0.7,3.3,1.8c0.7,1.1,1.4,2.1,2.1,3.2c0.8,1.1,1.6,2.3,2.3,3.4
+ c12.4,18.8,25.9,36.8,40,53.6c26.2,30.5,50.7,49.6,69,53.9c1.5,0.3,2.6,1.6,2.9,3.1c0.3,1.5-0.4,3-1.7,3.9l-49.1,31.8
+ c-1.4,0.8-3.3,1.9-5.5,2.6c-0.2,0.1-0.4,0.1-0.6,0.1C223.4,315.9,222.8,316,221.9,316z M96.1,170.5c4.7,7.8,11.4,18.7,16.7,27
+ c71.5,110,106.4,110.9,109.5,110.8c1.1-0.4,2.4-1,3.5-1.7l42.2-27.3c-18.6-7.4-41.3-26.2-65.1-53.8c0,0,0,0,0,0
+ c-14.3-17-27.9-35.3-40.6-54.4c-0.7-1.1-1.4-2.2-2.2-3.2c-0.4-0.5-0.7-1.1-1.1-1.6C139.1,166.2,117.9,167.7,96.1,170.5z"/>
+ </g>
+ <g>
+ <path class="st0" d="M134.8,103.1c-0.7,0-1.4-0.2-2.1-0.6c-1.8-1.2-2.3-3.5-1.1-5.3c20-30.7,32.3-44.5,32.8-45.1
+ c1.4-1.6,3.9-1.7,5.4-0.3c1.6,1.4,1.7,3.8,0.3,5.4c-0.1,0.1-12.5,14-32.1,44.1C137.2,102.4,136,103.1,134.8,103.1z"/>
+ </g>
+ <g>
+ <path class="st0" d="M59.7,224c-0.5,0-1-0.1-1.5-0.3c-2-0.8-2.9-3.1-2.1-5c0.7-1.7,17.6-42.5,31.2-54.1c1.6-1.4,4-1.2,5.4,0.4
+ c1.4,1.6,1.2,4-0.4,5.4c-10.1,8.7-24.4,39.9-29.1,51.2C62.6,223.1,61.2,224,59.7,224z"/>
+ </g>
+ <g>
+ <path class="st0" d="M268.5,220.4c-1.6,0-3-1-3.6-2.5c-3.2-8.7-13.3-23.7-28.4-42.2c-1.3-1.6-1.1-4.1,0.5-5.4
+ c1.6-1.3,4.1-1.1,5.4,0.5c11.1,13.5,25.2,32.2,29.7,44.5c0.7,2-0.3,4.2-2.3,4.9C269.4,220.3,268.9,220.4,268.5,220.4z"/>
+ </g>
+ </g>
+</g>
+</svg>
diff --git a/jams-react-client/src/assets/jss/material-dashboard-react/components/sidebarStyle.js b/jams-react-client/src/assets/jss/material-dashboard-react/components/sidebarStyle.js
index 10e7860f..70e80544 100644
--- a/jams-react-client/src/assets/jss/material-dashboard-react/components/sidebarStyle.js
+++ b/jams-react-client/src/assets/jss/material-dashboard-react/components/sidebarStyle.js
@@ -62,18 +62,7 @@ const sidebarStyle = theme => ({
},
logo: {
position: "relative",
- padding: "20px 35px",
- zIndex: "4",
- "&:after": {
- content: '""',
- position: "absolute",
- bottom: "0",
-
- height: "1px",
- right: "15px",
- width: "calc(100% - 30px)",
- backgroundColor: "rgba(" + hexToRgb(grayColor[6]) + ", 0.3)"
- }
+ textAlign: "center",
},
logoLink: {
...defaultFont,
@@ -101,12 +90,16 @@ const sidebarStyle = theme => ({
marginRight: "15px"
},
img: {
- width: "180px",
- top: "10px",
- position: "absolute",
+ width: "100%",
verticalAlign: "middle",
border: "0"
},
+ itemLinkSeparator: {
+ "& > hr": {
+ width: "75%",
+ opacity: "50%"
+ }
+ },
background: {
position: "absolute",
zIndex: "1",
@@ -129,7 +122,6 @@ const sidebarStyle = theme => ({
}
},
list: {
- marginTop: "20px",
paddingLeft: "0",
paddingTop: "0",
paddingBottom: "0",
diff --git a/jams-react-client/src/assets/jss/material-dashboard-react/layouts/adminStyle.js b/jams-react-client/src/assets/jss/material-dashboard-react/layouts/adminStyle.js
index 9d5893e1..77f037fc 100644
--- a/jams-react-client/src/assets/jss/material-dashboard-react/layouts/adminStyle.js
+++ b/jams-react-client/src/assets/jss/material-dashboard-react/layouts/adminStyle.js
@@ -32,7 +32,8 @@ const appStyle = theme => ({
},
container,
map: {
- marginTop: "0px"
+ marginTop: "0px",
+ minHeight: "calc(100vh - 63px)"
}
});
diff --git a/jams-react-client/src/components/Devices/Devices.js b/jams-react-client/src/components/Devices/Devices.js
index f6010614..411af215 100755
--- a/jams-react-client/src/components/Devices/Devices.js
+++ b/jams-react-client/src/components/Devices/Devices.js
@@ -239,7 +239,7 @@ export default function Devices(props) {
<Dialog open={openEdit} onClose={handleClose} aria-labelledby="form-dialog-title">
<DialogTitle id="form-edit-dialog-title">{i18next.t("update_device_information", "Update Device Information")}</DialogTitle>
<Formik initialValues={{
- displayName: '',
+ displayName: selectedDevice.displayName,
}}
>
{({ errors, touched, validateField}) => (
@@ -255,7 +255,7 @@ export default function Devices(props) {
label={i18next.t("device_display_name", "Device Display Name")}
fullWidth
onChange={setDisplayName(field.value)}
- helperText={(errors.displayName && touched.displayName) && errors.displayName}
+ helperText={(errors.displayName && touched.displayName) && errors.displayName}
{...field}
/>
</div>
diff --git a/jams-react-client/src/components/PasswordDialog/PasswordDialog.js b/jams-react-client/src/components/PasswordDialog/PasswordDialog.js
index 2d70194b..1b80b857 100644
--- a/jams-react-client/src/components/PasswordDialog/PasswordDialog.js
+++ b/jams-react-client/src/components/PasswordDialog/PasswordDialog.js
@@ -44,6 +44,9 @@ const styles = (theme) => ({
display: "flex",
justifyContent: "space-between",
},
+ whiteButtonText: {
+ color: "white",
+ }
});
const useStyles = makeStyles(styles);
@@ -267,6 +270,7 @@ export default function PasswordDialog(props) {
type="submit"
disable={!isValid && !dirty}
color="info"
+ className={classes.whiteButtonText}
autoFocus
>
Update password
diff --git a/jams-react-client/src/components/Sidebar/Sidebar.js b/jams-react-client/src/components/Sidebar/Sidebar.js
index 7f130062..fd15bd6d 100755
--- a/jams-react-client/src/components/Sidebar/Sidebar.js
+++ b/jams-react-client/src/components/Sidebar/Sidebar.js
@@ -47,8 +47,19 @@ export default function Sidebar(props) {
return window.location.href.indexOf(routeName) > -1 ? true : false;
}
const { color, logo, image, logoText, routes } = props;
+
+ var brand = (
+ <Link to={"/"}>
+ <img src={logo} alt="logo" className={classes.img} />
+ </Link>
+ );
+
var links = (
<List className={classes.list}>
+ <ListItem
+ className={classes.itemLink}
+ >{brand}</ListItem>
+ <div className={classes.itemLinkSeparator}><hr/></div>
{routes.map((prop, key) => {
if( prop.admin && !auth.hasAdminScope()) return;
if( !prop.admin && auth.hasAdminScope() && prop.path === "/user/admin") return;
@@ -172,21 +183,6 @@ export default function Sidebar(props) {
</List>
);
- var brand = (
- <div className={classes.logo}>
- <a
- href="/"
- className={classNames(classes.logoLink, {
- [classes.logoLinkRTL]: props.rtlActive,
- })}
- target="_blank"
- >
- <div className={classes.logoImage}>
- <img src={logo} alt="logo" className={classes.img} />
- </div>
- </a>
- </div>
- );
return (
<div>
<Hidden mdUp implementation="css">
@@ -204,7 +200,6 @@ export default function Sidebar(props) {
keepMounted: true, // Better open performance on mobile.
}}
>
- {brand}
<div className={classes.sidebarWrapper}>
{links}
{bottomLinks}
@@ -228,7 +223,6 @@ export default function Sidebar(props) {
}),
}}
>
- {brand}
<div className={classes.sidebarWrapper}>{links}</div>
<div className={classes.sidebarWrapper}>{bottomLinks}</div>
{image !== undefined ? (
diff --git a/jams-react-client/src/layouts/BaseLayout.js b/jams-react-client/src/layouts/BaseLayout.js
index f7cc7dec..8196ebfc 100644
--- a/jams-react-client/src/layouts/BaseLayout.js
+++ b/jams-react-client/src/layouts/BaseLayout.js
@@ -236,7 +236,9 @@ export default function Admin(props) {
routes={Routes}
handleDrawerToggle={handleDrawerToggle}
/>
- <div className={classes.map}>{props.component}</div>
+ <div className={classes.map}>
+ {props.component}
+ </div>
<Footer />
</div>
</div>
diff --git a/jams-react-client/src/layouts/SignIn.js b/jams-react-client/src/layouts/SignIn.js
index 43277b07..322dde14 100644
--- a/jams-react-client/src/layouts/SignIn.js
+++ b/jams-react-client/src/layouts/SignIn.js
@@ -16,7 +16,7 @@ import LanguagePicker from "../components/LanguagePicker/LanguagePicker";
import i18next from "i18next";
-import logo from "assets/img/jams_logo.svg";
+import logo from "assets/img/jams_logo_no_gnu_package.svg";
import * as Yup from "yup";
function Alert(props) {
return <MuiAlert elevation={6} variant="filled" {...props} />;
diff --git a/jams-react-client/src/layouts/SignUp.js b/jams-react-client/src/layouts/SignUp.js
index bf8a7296..2a56946e 100644
--- a/jams-react-client/src/layouts/SignUp.js
+++ b/jams-react-client/src/layouts/SignUp.js
@@ -8,7 +8,7 @@ import Container from "@material-ui/core/Container";
import MuiAlert from "@material-ui/lab/Alert";
import Paper from "@material-ui/core/Paper";
-import logo from "assets/img/jams_logo.svg";
+import logo from "assets/img/jams_logo_no_gnu_package.svg";
import CustomizedSteppers from "components/CustomizedSteppers/CustomizedSteppers";
import CreateAdmin from "components/CreateAdmin/CreateAdmin";
diff --git a/jams-react-client/src/views/Blueprint/Blueprint.js b/jams-react-client/src/views/Blueprint/Blueprint.js
index 0805526c..7ea53ff7 100644
--- a/jams-react-client/src/views/Blueprint/Blueprint.js
+++ b/jams-react-client/src/views/Blueprint/Blueprint.js
@@ -78,7 +78,7 @@ export default function Blueprint(props) {
return (
<div>
<AppBar position="static" style={{ background: infoColor[0] }}>
- <Tabs value={value} onChange={handleChange} aria-label="simple tabs example" style={{ margin: "0.7rem"}}>
+ <Tabs value={value} onChange={handleChange} aria-label="simple tabs example">
<Tab label={i18next.t("permissions", "Permissions")} {...a11yProps(0)} />
<Tab label={i18next.t("configuration", "Configuration")} {...a11yProps(1)} />
</Tabs>
diff --git a/jams-react-client/src/views/Blueprints/Blueprints.js b/jams-react-client/src/views/Blueprints/Blueprints.js
index 78dd21e1..6fd57cd5 100644
--- a/jams-react-client/src/views/Blueprints/Blueprints.js
+++ b/jams-react-client/src/views/Blueprints/Blueprints.js
@@ -78,6 +78,9 @@ const styles = {
display: "flex",
alignItems: "center",
},
+ whiteButtonText: {
+ color: "white",
+ }
};
const useStyles = makeStyles(styles);
@@ -280,7 +283,7 @@ export default function Blueprints() {
</DialogContentText>
</DialogContent>
<DialogActions>
- <Button onClick={handleClose} color="info">
+ <Button onClick={handleClose} color="info" className={classes.whiteButtonText}>
Cancel
</Button>
<Button
diff --git a/jams-react-client/src/views/Groups/Groups.js b/jams-react-client/src/views/Groups/Groups.js
index 7ce03df2..a26eb1b3 100644
--- a/jams-react-client/src/views/Groups/Groups.js
+++ b/jams-react-client/src/views/Groups/Groups.js
@@ -84,6 +84,9 @@ const styles = {
display: "flex",
alignItems: "center",
},
+ whiteButtonText: {
+ color: "white",
+ }
};
const useStyles = makeStyles(styles);
@@ -362,7 +365,7 @@ export default function Groups() {
</DialogContentText>
</DialogContent>
<DialogActions>
- <Button onClick={handleCloseCreate} color="info">
+ <Button onClick={handleCloseCreate} color="info" className={classes.whiteButtonText}>
Cancel
</Button>
<Button
diff --git a/jams-react-client/src/views/Settings/Settings.js b/jams-react-client/src/views/Settings/Settings.js
index ec3c61fd..e8dde972 100644
--- a/jams-react-client/src/views/Settings/Settings.js
+++ b/jams-react-client/src/views/Settings/Settings.js
@@ -99,7 +99,6 @@ export default function Settings(props) {
value={value}
onChange={handleChange}
aria-label="simple tabs example"
- style={{ margin: "0.7rem"}}
>
<Tab label={i18next.t("general", "General")} {...a11yProps(0)} />
<Tab label={i18next.t("subscription", "Subscription")} {...a11yProps(1)} />
diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
index 69d7a547..d115c82c 100644
--- a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
+++ b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
@@ -187,6 +187,9 @@ const styles = (theme) => ({
loading: {
width: "100%",
},
+ whiteButtonText: {
+ color: "white",
+ }
});
const useStyles = makeStyles(styles);
@@ -471,7 +474,7 @@ export default function DisplayUserProfile(props) {
<Button onClick={handleClose} color="primary">
{i18next.t("cancel", "Cancel")}
</Button>
- <Button onClick={revokeUser} color="info" autoFocus>
+ <Button onClick={revokeUser} color="info" className={classes.whiteButtonText} autoFocus>
{i18next.t("revoke", "Revoke")}
</Button>
</DialogActions>
@@ -616,6 +619,7 @@ export default function DisplayUserProfile(props) {
{canEdit() && (
<Button
color="info"
+ className={classes.whiteButtonText}
onClick={() => props.setDisplayUser(false)}
>
<EditIcon /> {i18next.t("edit_profile", "Edit Profile")}
@@ -626,6 +630,7 @@ export default function DisplayUserProfile(props) {
{auth.isLocalDirectory() && auth.hasAdminScope() && (
<Button
color="info"
+ className={classes.whiteButtonText}
onClick={() => {
setChangePasswordOpen(true);
}}
@@ -641,6 +646,7 @@ export default function DisplayUserProfile(props) {
{auth.hasAdminScope() && revoked === false && (
<Button
color="info"
+ className={classes.whiteButtonText}
onClick={() => handleClickOpen(user.username)}
>
<DeleteIcon fontSize="small" /> {i18next.t("revoke_user", "Revoke user")}
diff --git a/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js b/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
index 47984eac..cf3cc48e 100644
--- a/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
+++ b/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
@@ -212,6 +212,9 @@ const styles = (theme) => ({
justifyContent: "center",
alignItems: "center"
}
+ },
+ whiteButtonText: {
+ color: "white",
}
});
@@ -557,7 +560,7 @@ export default function EditCreateUserProfile(props) {
</div>
</DialogContent>
<DialogActions>
- <Button onClick={cropProfilePicture} color="info" autoFocus>
+ <Button onClick={cropProfilePicture} color="info" className={classes.whiteButtonText} autoFocus>
{i18next.t("validate", "Validate")}
</Button>
</DialogActions>
@@ -903,7 +906,11 @@ export default function EditCreateUserProfile(props) {
</CardBody>
<CardFooter className={classes.alignRight}>
{!props.createUser && (
- <Button color="info" onClick={handleCancelUpdate}>
+ <Button
+ color="info"
+ className={classes.whiteButtonText}
+ onClick={handleCancelUpdate}
+ >
{i18next.t("cancel", "Cancel")}
</Button>
)}
@@ -912,6 +919,7 @@ export default function EditCreateUserProfile(props) {
type="submit"
disabled={!isValid || !dirty || userExists}
color="info"
+ className={classes.whiteButtonText}
>
{i18next.t("create_profile", "Create Profile")}
</Button>
@@ -920,6 +928,7 @@ export default function EditCreateUserProfile(props) {
type="submit"
disabled={!isValid}
color="info"
+ className={classes.whiteButtonText}
>
{i18next.t("save_profile", "Save Profile")}
</Button>
diff --git a/jams-react-client/src/views/UserProfile/UserProfile.js b/jams-react-client/src/views/UserProfile/UserProfile.js
index 3bd1f7b7..74dad32c 100755
--- a/jams-react-client/src/views/UserProfile/UserProfile.js
+++ b/jams-react-client/src/views/UserProfile/UserProfile.js
@@ -69,7 +69,6 @@ export default function UserProfile(props) {
value={value}
onChange={handleChange}
aria-label="simple tabs example"
- style={{ margin: "0.7rem"}}
>
<Tab label={i18next.t("profile", "Profile")} {...a11yProps(0)} />
<Tab label={i18next.t("devices", "Devices")} {...a11yProps(1)} />
--
GitLab