Skip to content

Commit

Permalink
Merge pull request #2025 from uProxy/linkfix
Browse files Browse the repository at this point in the history
Fix faqs link on anonymous metrics welcome page
  • Loading branch information
lucyhe committed Nov 3, 2015
2 parents f1fa624 + ae62c1a commit b554f9f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/generic_ui/polymer/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ <h2 class="i18n" data-i18n="DOES_UPROXY_PROTECT">Does uProxy protect me from vir

</section>

<section class="faq" id="whyIsUptoxyAsking">
<section class="faq" id="whyIsUproxyAsking">
<h2 class="i18n" data-i18n="WHY_IS_UPROXY_ASKING">Why is uProxy asking for these Chrome permissions?</h2>
<p class="i18n" data-i18n="WHY_IS_UPROXY_ASKING_ANSWER">When you install uProxy on Chrome, it asks for permission to (1) read and change all your data on the websites you visit, and (2) Communicate with cooperating websites. These permissions are necessary for uProxy to route your traffic through your friend's computer. No data about the websites you visit is ever sent to the uProxy team or the social networks you connect to.</p>

Expand Down
10 changes: 3 additions & 7 deletions src/generic_ui/polymer/root.html
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,6 @@
uproxy-action-dialog uproxy-button {
margin-bottom: 3px;
}
uproxy-faq .linkText {
text-decoration: underline;
color: rgba(0,0,0,0.40);
}
#disconnectDialog {
text-align: center;
}
Expand Down Expand Up @@ -208,7 +204,7 @@
#statsDialog uproxy-button {
margin: 1.5em 0.75em;
}
#statsDialog uproxy-faq {
#statsDialog uproxy-faq-link {
width: 100%;
padding-top: 1em;
padding-bottom: 1em;
Expand Down Expand Up @@ -457,9 +453,9 @@ <h1>{{ "WELCOME" | $$ }}</h1>
<uproxy-button id='enableStatsButton' on-tap='{{ enableStats }}'>{{ "IM_IN" | $$ }}</uproxy-button>
<uproxy-button id='disableStatsButton' on-tap='{{ disableStats }}'>{{ "NO_THANKS" | $$ }}</uproxy-button>
</div>
<uproxy-faq anchor='doesUproxyLogData'>
<uproxy-faq-link anchor='doesUproxyLogData'>
{{ "MORE_ABOUT_METRICS" | $$ }}
</uproxy-faq>
</uproxy-faq-link>
</core-overlay>

<uproxy-action-dialog id='disconnectDialog' backdrop layered="false"
Expand Down

0 comments on commit b554f9f

Please sign in to comment.