Merge branch 'master' into mling-update-anonmetrics

UWNetworksLab · Feb 9, 2016 · 6561ea4 · 6561ea4
2 parents 9663de9 + 60de662
commit 6561ea4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/generic_ui/polymer/faq.html b/src/generic_ui/polymer/faq.html
@@ -134,10 +134,12 @@ <h2 class="i18n" data-i18n="HOW_DO_I_FIND"></h2>
               <p class="i18n" data-i18n="HOW_DO_I_FIND_ANSWER"></p>
             </section>
 
+            <!-- TODO: uncomment once Quiver is launched on webstore
             <section class="faq" id="whatIsUproxyNetwork">
               <h2 class="i18n" data-i18n="WHAT_IS_UPROXY_NETWORK"></h2>
               <p class="i18n" data-i18n="WHAT_IS_UPROXY_NETWORK_ANSWER"></p>
             </section>
+            -->
 
             <section class="faq" id="whatIsGitHub">
               <h2 class="i18n" data-i18n="WHAT_IS_GITHUB"></h2>

diff --git a/src/generic_ui/polymer/icons.html b/src/generic_ui/polymer/icons.html
@@ -140,9 +140,20 @@
         </g>
       </g>
 
-      <g id="Quiver-small">
-        <circle fill="#10C9B1" cx="12" cy="12" r="12"/>
-        <path fill="#FFFFFF" d="M16.4,10.4c-0.4-1.9-2-3.4-4-3.4c-1.6,0-3,1-3.7,2.3C7,9.5,5.7,10.9,5.7,12.6C5.7,14.4,7.2,16,9,16h7c1.5,0,2.9-1.3,2.9-2.9C18.9,11.7,17.8,10.5,16.4,10.4z"/>
+      <g id="Quiver-small" transform="scale(2)">
+        <g>
+          <circle fill="#10C9B1" cx="6" cy="6" r="6"/>
+        </g>
+        <g opacity="0.75">
+          <path fill="#FFFFFF" d="M5.8,10.1C3.8,10.1,2,8.4,2,6.3C2,6,2.2,5.7,2.5,5.7S3.1,6,3.1,6.3C3.1,7.8,4.3,9,5.8,9s2.7-1.2,2.7-2.7
+            c0-0.3,0.2-0.6,0.6-0.6S9.6,6,9.6,6.3C9.7,8.4,8,10.1,5.8,10.1z"/>
+        </g>
+        <g opacity="0.25">
+          <path fill="#FFFFFF" d="M9.1,6.8c-0.3,0-0.6-0.2-0.6-0.6c0-1.5-1.2-2.7-2.7-2.7S3.2,4.8,3.2,6.3c0,0.3-0.2,0.6-0.5,0.6S2,6.6,2,6.3
+            c0-2.1,1.7-3.8,3.8-3.8s3.8,1.7,3.8,3.8C9.7,6.6,9.4,6.8,9.1,6.8z"/>
+        </g>
+        <circle fill="#FFFFFF" cx="2.6" cy="6.3" r="0.9"/>
+        <circle fill="#FFFFFF" cx="9.1" cy="6.3" r="0.9"/>
       </g>
 
     </defs>