Explorar o código

minor changes to section C, added yellow button for buttons

wes %!s(int64=4) %!d(string=hai) anos
pai
achega
107014156d

+ 53 - 51
Qwixx/frontend/inkScape/base.svg

@@ -25,10 +25,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.4"
-     inkscape:cx="207.36142"
-     inkscape:cy="214.34598"
+     inkscape:cx="225.7994"
+     inkscape:cy="119.41467"
      inkscape:document-units="mm"
-     inkscape:current-layer="svg8"
+     inkscape:current-layer="layer17"
      inkscape:document-rotation="0"
      showgrid="false"
      borderlayer="false"
@@ -54,7 +54,8 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="a"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
        inkscape:groupmode="layer"
        id="layer12"
@@ -63,13 +64,13 @@
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\lobby.svg"
          xlink:href="lobby.svg"
-         preserveAspectRatio="none"
-         inkscape:svg-dpi="96"
-         width="140.00003"
-         height="60.000092"
-         id="image987"
+         y="20"
          x="10"
-         y="20" />
+         id="image987"
+         height="60.000092"
+         width="140.00003"
+         inkscape:svg-dpi="96"
+         preserveAspectRatio="none" />
     </g>
     <g
        inkscape:groupmode="layer"
@@ -105,13 +106,13 @@
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\createGame.svg"
          xlink:href="createGame.svg"
-         preserveAspectRatio="none"
-         inkscape:svg-dpi="96"
-         width="140.00003"
-         height="60.000092"
-         id="image1251"
+         y="20"
          x="10"
-         y="20" />
+         id="image1251"
+         height="60.000092"
+         width="140.00003"
+         inkscape:svg-dpi="96"
+         preserveAspectRatio="none" />
     </g>
     <g
        inkscape:groupmode="layer"
@@ -122,14 +123,14 @@
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\options.svg"
          xlink:href="options.svg"
-         preserveAspectRatio="none"
-         inkscape:svg-dpi="96"
-         width="140.00003"
-         height="60.000092"
-         id="image1403"
-         x="10"
+         style="display:inline"
          y="20"
-         style="display:inline" />
+         x="10"
+         id="image1403"
+         height="60.000092"
+         width="140.00003"
+         inkscape:svg-dpi="96"
+         preserveAspectRatio="none" />
     </g>
     <g
        inkscape:groupmode="layer"
@@ -140,13 +141,13 @@
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\endScreen.svg"
          xlink:href="endScreen.svg"
-         y="20"
-         x="10"
-         id="image1245"
-         height="60.000092"
-         width="140.00003"
+         preserveAspectRatio="none"
          inkscape:svg-dpi="96"
-         preserveAspectRatio="none" />
+         width="140.00003"
+         height="60.000092"
+         id="image1245"
+         x="10"
+         y="20" />
     </g>
     <g
        inkscape:groupmode="layer"
@@ -157,14 +158,14 @@
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\endScreen.svg"
          xlink:href="endScreen.svg"
-         y="20"
-         x="10"
-         id="image1027"
-         height="60.000092"
-         width="140.00003"
-         inkscape:svg-dpi="96"
+         style="display:inline"
          preserveAspectRatio="none"
-         style="display:inline" />
+         inkscape:svg-dpi="96"
+         width="140.00003"
+         height="60.000092"
+         id="image1027"
+         x="10"
+         y="20" />
     </g>
   </g>
   <g
@@ -232,9 +233,9 @@
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\sectionC\cButton.svg"
          xlink:href="sectionC/cButton.svg"
-         y="0"
+         y="-1.335144e-05"
          x="50"
-         id="image1334"
+         id="image1214"
          height="20.000013"
          width="100.00007"
          inkscape:svg-dpi="96"
@@ -288,24 +289,24 @@
         <image
            sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\sectionDecoration\decoration.svg"
            xlink:href="sectionDecoration/decoration.svg"
-           preserveAspectRatio="none"
-           inkscape:svg-dpi="96"
-           width="10.000007"
-           height="89.999878"
-           id="image1369"
+           y="0"
            x="150"
-           y="0" />
+           id="image1369"
+           height="89.999878"
+           width="10.000007"
+           inkscape:svg-dpi="96"
+           preserveAspectRatio="none" />
       </g>
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\sectionDecoration\decoration.svg"
          xlink:href="sectionDecoration/decoration.svg"
-         preserveAspectRatio="none"
-         inkscape:svg-dpi="96"
-         width="10.000007"
-         height="89.999878"
-         id="image1127"
+         y="0"
          x="0"
-         y="0" />
+         id="image1127"
+         height="89.999878"
+         width="10.000007"
+         inkscape:svg-dpi="96"
+         preserveAspectRatio="none" />
     </g>
   </g>
   <g
@@ -316,7 +317,8 @@
     <g
        inkscape:groupmode="layer"
        id="layer11"
-       inkscape:label="highlight 4">
+       inkscape:label="highlight 4"
+       style="display:inline">
       <rect
          style="fill:#280b0b;stroke-width:0.234253"
          id="rect23"

+ 44 - 11
Qwixx/frontend/inkScape/buttons/button.svg

@@ -13,7 +13,10 @@
    version="1.1"
    id="svg8"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
-   sodipodi:docname="button.svg">
+   sodipodi:docname="button.svg"
+   inkscape:export-filename="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\yellowOptions.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <defs
      id="defs2">
     <inkscape:path-effect
@@ -229,11 +232,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="64.085554"
-     inkscape:cy="68.850576"
+     inkscape:zoom="2.4601423"
+     inkscape:cx="59.729456"
+     inkscape:cy="92.946412"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer4"
+     inkscape:current-layer="layer9"
      inkscape:document-rotation="0"
      showgrid="false"
      inkscape:pagecheckerboard="true"
@@ -274,13 +277,12 @@
      inkscape:groupmode="layer"
      id="layer8"
      inkscape:label="colors"
-     sodipodi:insensitive="true"
-     style="display:none">
+     style="display:inline">
     <g
        inkscape:groupmode="layer"
        id="layer9"
        inkscape:label="green"
-       style="display:inline"
+       style="display:none"
        sodipodi:insensitive="true">
       <rect
          style="opacity:1;fill:#70c1b3;fill-opacity:1;stroke-width:1.11767;stroke-miterlimit:4;stroke-dasharray:none"
@@ -291,6 +293,20 @@
          y="5.6141505"
          ry="1.1462885" />
     </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer12"
+       inkscape:label="yellow"
+       sodipodi:insensitive="true">
+      <rect
+         style="display:inline;opacity:1;fill:#ffe066;fill-opacity:1;stroke-width:1.11767;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect8612-2"
+         width="31.702999"
+         height="14.647"
+         x="7.3828988"
+         y="5.6145725"
+         ry="1.1462885" />
+    </g>
     <g
        inkscape:groupmode="layer"
        id="layer11"
@@ -310,8 +326,7 @@
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     inkscape:label="text"
-     sodipodi:insensitive="true">
+     inkscape:label="text">
     <g
        inkscape:groupmode="layer"
        id="layer5"
@@ -329,6 +344,24 @@
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525"
            id="tspan948">Join</tspan></text>
     </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer2"
+       inkscape:label="options"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <text
+         xml:space="preserve"
+         style="font-size:7.581px;line-height:1.25;font-family:'Javanese Text';-inkscape-font-specification:'Javanese Text';text-align:center;text-anchor:middle;display:inline;stroke-width:0.189525"
+         x="22.905857"
+         y="15.443126"
+         id="text8604-4-8"><tspan
+           sodipodi:role="line"
+           id="tspan8602-9-5"
+           x="22.905857"
+           y="15.443126"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525">Options</tspan></text>
+    </g>
     <g
        inkscape:groupmode="layer"
        id="layer4"
@@ -351,7 +384,7 @@
        inkscape:groupmode="layer"
        id="layer6"
        inkscape:label="exit"
-       style="display:inline"
+       style="display:none"
        sodipodi:insensitive="true">
       <text
          xml:space="preserve"

BIN=BIN
Qwixx/frontend/inkScape/buttons/yellowOptions.png


+ 77 - 51
Qwixx/frontend/inkScape/sectionC/cButton.svg

@@ -19,26 +19,26 @@
      id="defs2">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient1019">
+       id="linearGradient889">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#000000;stop-opacity:0;"
          offset="0"
-         id="stop1015" />
+         id="stop887" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         style="stop-color:#000000;stop-opacity:1;"
          offset="1"
-         id="stop1017" />
+         id="stop885" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1019"
-       id="linearGradient1021"
-       x1="0.63476449"
-       y1="-12.093946"
-       x2="50.814621"
-       y2="-12.093946"
+       xlink:href="#linearGradient889"
+       id="linearGradient891"
+       x1="-0.85483247"
+       y1="-21.774599"
+       x2="99.145168"
+       y2="-21.774599"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.9889373,0,1.0692398e-8,0.99213313,-101.06465,1.8752981)" />
+       gradientTransform="translate(0.85483247,31.774599)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -48,8 +48,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.979899"
-     inkscape:cx="60.147851"
-     inkscape:cy="31.64605"
+     inkscape:cx="121.90512"
+     inkscape:cy="10.058372"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      inkscape:document-rotation="0"
@@ -60,7 +60,11 @@
      inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid858" />
+  </sodipodi:namedview>
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -77,62 +81,84 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="background"
+     style="display:inline"
      sodipodi:insensitive="true">
-    <path
-       style="fill:#50514f;fill-opacity:1;stroke-width:1.40472"
-       id="rect942"
-       width="99.805496"
-       height="19.75421"
-       x="0.097257577"
-       y="0.12289556"
-       ry="0"
-       sodipodi:type="rect"
-       d="M 0.09725758,0.12289556 H 99.902754 V 19.877105 H 0.09725758 Z" />
-    <rect
-       style="opacity:0.606452;fill:url(#linearGradient1021);fill-opacity:1;stroke-width:1.40474"
-       id="rect942-7"
-       width="99.804588"
-       height="19.754938"
-       x="-99.802147"
-       y="-20.000975"
-       ry="0"
-       transform="matrix(-0.99999696,0.00246513,-0.00990747,-0.99995092,0,0)" />
+    <g
+       inkscape:groupmode="layer"
+       id="layer6"
+       inkscape:label="color"
+       sodipodi:insensitive="true">
+      <rect
+         style="opacity:1;fill:#50514f;fill-opacity:1;stroke-width:5.34505"
+         id="rect860"
+         width="100"
+         height="20"
+         x="0"
+         y="0"
+         ry="0" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="leftToRightGradient"
+       style="display:inline"
+       sodipodi:insensitive="true">
+      <rect
+         style="opacity:1;fill:url(#linearGradient891);fill-opacity:1;stroke-width:5.34506"
+         id="rect860-0"
+         width="100"
+         height="20"
+         x="0"
+         y="0"
+         ry="0" />
+    </g>
   </g>
   <g
      inkscape:label="buttonLayout1"
      inkscape:groupmode="layer"
      id="layer1"
+     style="display:inline"
      sodipodi:insensitive="true">
     <image
        sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\greenCreate.png"
        xlink:href="../buttons/greenCreate.png"
-       width="14.117456"
-       height="6.2500238"
-       preserveAspectRatio="none"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)"
+       y="6.5474601"
+       x="8.2822094"
        id="image909"
-       x="7.4231067"
-       y="6.3432536"
-       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
+       preserveAspectRatio="none"
+       height="6.2500238"
+       width="14.117456" />
     <image
        sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\greenJoin.png"
        xlink:href="../buttons/greenJoin.png"
-       width="14.117456"
-       height="6.2500238"
-       preserveAspectRatio="none"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)"
+       y="14.914148"
+       x="8.2822094"
        id="image923"
-       x="7.4231067"
-       y="14.709943"
-       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
+       preserveAspectRatio="none"
+       height="6.2500238"
+       width="14.117456" />
     <image
        sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\redExit.png"
        xlink:href="../buttons/redExit.png"
-       width="13.979107"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)"
+       y="34.303997"
+       x="82.822098"
+       id="image937"
+       preserveAspectRatio="none"
        height="6.1887741"
+       width="13.979107" />
+    <image
+       sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\yellowOptions.png"
+       xlink:href="../buttons/yellowOptions.png"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)"
+       y="23.505341"
+       x="79.085068"
+       id="image931"
        preserveAspectRatio="none"
-       id="image937"
-       x="85.653839"
-       y="34.430103"
-       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
+       height="11.107579"
+       width="22.998825" />
   </g>
   <g
      inkscape:groupmode="layer"