Merge branch 'testing' into feature/server-side-render-parser-3021

ereuse_devicehub/static/css/style.css

@@ -19,12 +19,12 @@ body {
 }
 
 a {
-  color: #4154f1;
+  color: #6c757d ;
   text-decoration: none;
 }
 
 a:hover {
-  color: #717ff5;
+  color: #cc0066;
   text-decoration: none;
 }
 
@@ -56,7 +56,7 @@ h1, h2, h3, h4, h5, h6 {
   font-size: 24px;
   margin-bottom: 0;
   font-weight: 600;
-  color: #012970;
+  color: #993365;
 }
 
 /*--------------------------------------------------------------
@@ -176,6 +176,31 @@ h1, h2, h3, h4, h5, h6 {
     opacity: 0;
   }
 }
+
+.btn-primary {
+  background-color: #993365;
+  border-color: #993365;
+  color: #fff;
+}
+
+.btn-primary:hover {
+  background-color: #cc0066;
+  border-color: #cc0066;
+  color: #fff;
+}
+
+.btn-danger {
+  background-color: #b3b1b1;
+  border-color: #b3b1b1;
+  color: #fff;
+}
+
+.btn-danger:hover {
+  background-color: #645e5f;
+  border-color: #645e5f;
+  color: #fff;
+}
+
 /* Light Backgrounds */
 .bg-primary-light {
   background-color: #cfe2ff;
@@ -370,7 +395,7 @@ h1, h2, h3, h4, h5, h6 {
   font-size: 32px;
   padding-left: 10px;
   cursor: pointer;
-  color: #012970;
+  color: #993365;
 }
 .header .search-bar {
   min-width: 360px;
@@ -439,7 +464,7 @@ h1, h2, h3, h4, h5, h6 {
   color: #012970;
 }
 .header-nav .nav-profile {
-  color: #012970;
+  color: #993365;
 }
 .header-nav .nav-profile img {
   max-height: 36px;
@@ -618,7 +643,7 @@ h1, h2, h3, h4, h5, h6 {
   color: #4154f1;
 }
 .sidebar-nav .nav-link.collapsed {
-  color: #012970;
+  color: #6c757d;
   background: #fff;
 }
 .sidebar-nav .nav-link.collapsed i {

ereuse_devicehub/static/img/logo_usody_clock.svg

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="188.02727mm"
+   height="48.976315mm"
+   viewBox="0 0 188.02727 48.976315"
+   version="1.1"
+   id="svg20276"
+   sodipodi:docname="logo_usody_clock.svg"
+   inkscape:version="1.1.1 (3bf5ae0, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview20278"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.82671156"
+     inkscape:cx="332.03842"
+     inkscape:cy="-66.528645"
+     inkscape:window-width="1680"
+     inkscape:window-height="1013"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs20273" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-82.275303,-65.555746)">
+    <text
+       xml:space="preserve"
+       style="font-size:50.8px;line-height:1.25;font-family:sans-serif;stroke-width:0.264583"
+       x="126.75784"
+       y="103.84124"
+       id="text1904"><tspan
+         sodipodi:role="line"
+         id="tspan1902"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.8px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583"
+         x="126.75784"
+         y="103.84124">Usod<tspan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.8px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#993265;fill-opacity:1"
+   id="tspan8044">y</tspan></tspan></text>
+    <g
+       id="g14774-8"
+       style="fill:#993264;fill-opacity:1;stroke:#993265;stroke-opacity:1"
+       transform="matrix(0.083748,0,0,0.08393574,81.384743,64.67498)">
+      <g
+         id="g14772-6"
+         style="fill:#993264;fill-opacity:1;stroke:#993265;stroke-opacity:1">
+        <path
+           d="M 499.5,230.1 C 485.2,95.8 364.4,-2 230,12.4 157,20.2 92,59.8 51.5,121.1 c -6.2,9.4 -3.6,22.1 5.8,28.3 9.4,6.2 22.1,3.6 28.3,-5.8 33.8,-51.1 88,-84.1 148.8,-90.5 111.9,-11.9 212.6,69.4 224.5,181.3 5.8,54.2 -9.9,107.4 -44.2,149.9 -34.3,42.4 -83,69 -137.2,74.7 -74,8 -146.6,-25.6 -188.9,-86 l 37.7,8.1 c 11.1,2.3 21.9,-4.6 24.3,-15.7 2.4,-11 -4.6,-21.9 -15.7,-24.3 L 53.4,323.6 c -11,-2.4 -21.9,4.6 -24.3,15.7 l -17.5,81.5 c -2.4,11 4.7,21.7 15.7,24.3 12.4,2.9 22.2,-6.1 24.3,-15.7 L 57.9,400 c 46.1,63.3 120.2,101 198.3,101 8.5,0 17.1,-0.4 25.7,-1.4 65.1,-6.9 123.6,-38.8 164.7,-89.7 41,-50.8 59.8,-114.7 52.9,-179.8 z"
+           id="path14768-0"
+           style="fill:#993264;fill-opacity:1;stroke:#993265;stroke-opacity:1" />
+        <path
+           d="m 271.8,140.3 c -11.3,0 -20.4,9.1 -20.4,20.4 V 256 c 0,5.4 2.2,10.6 6,14.4 l 95.3,95.3 c 9.5,10.7 24.9,4 28.9,0 8,-8 8,-20.9 0,-28.9 l -89.3,-89.3 v -86.8 c -0.1,-11.2 -9.2,-20.4 -20.5,-20.4 z"
+           id="path14770-4"
+           style="fill:#993264;fill-opacity:1;stroke:#993265;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       id="g14772"
+       transform="matrix(0.083748,0,0,0.08393574,81.384743,64.67498)">
+      <path
+         id="path14768"
+         d="M 255.01758,10.996094 C 246.74651,11.038013 238.4,11.500391 230,12.400391 c -73,7.8 -138,47.399218 -178.5,108.699219 -6.2,9.4 -3.599219,22.10078 5.800781,28.30078 9.4,6.2 22.098828,3.59922 28.298828,-5.80078 33.800001,-51.100001 88.000781,-84.100001 148.800781,-90.500001 111.9,-11.9 212.6,69.400781 224.5,181.300781 5.8,54.2 -9.90117,107.40039 -44.20117,149.90039 C 380.39922,426.70078 331.7,453.3 277.5,459 c -8.97135,0.96988 -17.92013,1.30083 -26.79883,1.07422 l 0.0449,40.76172 c 1.81975,0.041 3.62871,0.16406 5.45313,0.16406 8.5,0 17.10117,-0.40039 25.70117,-1.40039 65.1,-6.9 123.59922,-38.79922 164.69922,-89.69922 41,-50.8 59.80039,-114.70078 52.90039,-179.80078 C 486.09375,104.19336 379.08362,10.36731 255.01758,10.996094 Z" />
+      <path
+         d="m 271.8,140.3 c -11.3,0 -20.4,9.1 -20.4,20.4 V 256 c 0,5.4 2.2,10.6 6,14.4 l 95.3,95.3 c 9.5,10.7 24.9,4 28.9,0 8,-8 8,-20.9 0,-28.9 l -89.3,-89.3 v -86.8 c -0.1,-11.2 -9.2,-20.4 -20.5,-20.4 z"
+         id="path14770" />
+    </g>
+  </g>
+</svg>

ereuse_devicehub/templates/ereuse_devicehub/base_site.html

@@ -6,7 +6,7 @@
 
   <div class="d-flex align-items-center justify-content-between">
     <a href="{{ url_for('inventory.devicelist')}}" class="logo d-flex align-items-center">
-      <img src="{{ url_for('static', filename='img/usody-logo-black.svg') }}" alt="">
+      <img src="{{ url_for('static', filename='img/logo_usody_clock.png') }}" alt="">
     </a>
     <i class="bi bi-list toggle-sidebar-btn"></i>
   </div><!-- End Logo -->