Merge branch 'resizeHamaraLogo_Calamares' into 'hamara-sugam'

packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc

@@ -14,13 +14,13 @@ strings:
     releaseNotesUrl:     https://www.hamaralinux.org/beta-release-of-hamara-sugam-2-0/
 
 images:
-    productLogo:         "hamara-logo.png"
-    productIcon:         "hamara-logo.png"
+    productLogo:         "emblem-hamara.svg"
+    productIcon:         "emblem-hamara.svg"
     productWelcome:      "welcome.png"
 
 slideshow:               "show.qml"
 
 style:
-   sidebarBackground:    "#2c3133"
+   sidebarBackground:    "#282828"
    sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#4d7079"
+   sidebarTextSelect:    "#282828"

packages/calamares-settings-hamara/calamares/branding/hamara/emblem-hamara.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Layer_1"
+   data-name="Layer 1"
+   width="150"
+   height="150"
+   viewBox="0 0 150 150"
+   version="1.1"
+   sodipodi:docname="favi icon_v.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>favi icon</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs19" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="101.51537"
+     inkscape:cy="82.489857"
+     inkscape:window-x="0"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" />
+  <title
+     id="title2">favi icon</title>
+  <g
+     id="g21"
+     transform="matrix(8,0,0,8,11,-885)">
+    <circle
+       id="circle4"
+       style="fill:#ffb500"
+       r="8"
+       cy="120"
+       cx="8" />
+    <g
+       transform="matrix(0.23985838,0,0,0.23985838,5.1509173,118.44068)"
+       id="g864">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 3.0176874,8.140526 a 2.45,2.45 0 0 1 -2.46000003,-2.46 v -18.89 a 2.46,2.46 0 0 1 4.92000003,0 v 18.79 a 2.37,2.37 0 0 1 -2.46,2.56 z"
+         style="fill:#ffffff"
+         id="path16" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 10.317687,5.670526 a 2.45,2.45 0 0 1 -2.4599996,-2.46 v -19.42 a 2.46,2.46 0 0 1 4.9199996,0 v 19.42 a 2.45,2.45 0 0 1 -2.46,2.46 z"
+         style="fill:#ffffff"
+         id="path18" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 17.497687,8.230526 a 2.45,2.45 0 0 1 -2.46,-2.46 v -19 a 2.46,2.46 0 0 1 4.92,0 v 18.9 a 2.42,2.42 0 0 1 -2.46,2.56 z"
+         style="fill:#ffffff"
+         id="path20" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 10.317687,31.670526 a 17,17 0 0 1 -16.9999996,-17 v -22.86 a 2.46,2.46 0 0 1 4.92,0 v 22.89 a 11.95,11.95 0 0 0 23.8899996,0 7.77,7.77 0 0 1 4.74,-7.48 2.47,2.47 0 1 1 2.1,4.47 3,3 0 0 0 -1.82,3 16.85,16.85 0 0 1 -16.83,16.98 z"
+         style="fill:#ffffff"
+         id="path22" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 10.317687,22.910526 a 6.75,6.75 0 1 1 6.75,-6.75 6.73,6.73 0 0 1 -6.75,6.75 z m 0,-8.48 a 1.73,1.73 0 1 0 1.73,1.73 1.79,1.79 0 0 0 -1.73,-1.73 z"
+         style="fill:#ffffff"
+         id="path24" />
+    </g>
+  </g>
+</svg>