Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: pages/adware.html

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)
Patch Set: Created April 26, 2016, 5:05 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | static/img/check.png » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 title=About adware
saroyanm 2016/05/03 10:06:30 We usually using Markdown where it's possible, wha
juliandoucette 2016/05/11 00:45:39 If this document was .md then we could replace: -
saroyanm 2016/05/17 10:19:42 There is a benefit, because I assume soon or later
2 noheading=true
3
4 <head>
5 <meta name="description" content="What is adware and how to get rid of it">
saroyanm 2016/05/03 10:06:30 we can also use open graph version for this tag.
juliandoucette 2016/05/11 00:45:38 For what reason? This is the standard meta tag.
saroyanm 2016/05/17 10:19:42 For Social media: https://developers.facebook.com/
6 <meta name="author" content="Eyeo GmbH / Adblock Plus">
saroyanm 2016/05/03 10:06:31 I think we can use this meta tag in the Template i
juliandoucette 2016/05/11 00:45:39 Nope. It's not in the default template. Would you
saroyanm 2016/05/17 10:19:43 I assume this is relevant to all other documentati
7 <meta property="og:image" content="/img/adblockplus_128.png">
8 <meta name="twitter:card" content="summary">
saroyanm 2016/05/03 10:06:32 Seems like the twitter cards should also use @ sig
juliandoucette 2016/05/11 00:45:41 Good catch.
9 <meta name="twitter:site" content="adblockplus">
10 <meta name="twitter:creator" content="adblockplus">
11 <style>
12 .text-danger
saroyanm 2016/05/03 10:06:32 You can have a wrapper for this reason, ex.: "warn
juliandoucette 2016/05/11 00:45:39 I agree.
13 {
14 color: #E11A2C
saroyanm 2016/05/03 10:06:31 Detail: please use lower case for the css values -
juliandoucette 2016/05/11 00:45:39 I don't think we should follow that rule. Done an
saroyanm 2016/05/17 10:19:42 Why ? We are using this general rules in our Codin
15 }
16
17 .alert-danger
18 {
19 padding: 15px;
20 border: 2px solid;
21 border-color: #E11A2C;
22 background-color: #fff;
23 }
24
25 .badge-success
26 {
27 display: inline-block;
28 width: 34px;
29 color: #fff;
30 background-color: #53B044;
31 border-radius: 4px;
32 font-weight: bold;
33 font-size: 20px;
34 line-height: 20px;
35 vertical-align: top;
36 text-align: center;
37 padding: 7px 0;
saroyanm 2016/05/03 10:06:30 Detail: Please reorder the properties according to
juliandoucette 2016/05/11 00:45:40 I don't think we should follow that rule. Done an
saroyanm 2016/05/17 10:19:42 Same as above, we are using that rule as you can s
38 margin-right: 7px;
39 }
40
41 .table-unstyled
42 {
43 width: 100%;
44 margin-bottom: 25px;
45 }
46
47 .table-unstyled th
48 {
49 text-align: left;
50 font-size: 18px;
51 line-height: 20px;
52 font-weight: bold;
53 padding-bottom: 20px;
54 }
55
56 .list-unstyled,
57 .list-unstyled li
58 {
59 margin-left: 0;
60 padding-left: 0;
61 }
62
63 .list-unstyled li
64 {
65 list-style-type: none;
66 }
67
68 .table-unstyled td,
69 .list-unstyled li
70 {
71 line-height: 20px;
72 padding-bottom: 10px;
73 }
74
75 .list-custom
76 {
77 padding-left: 40px;
78 }
79
80 .list-custom li
81 {
82 list-style-type: none;
83 margin-bottom: 25px;
84 }
85
86 .list-custom .list-unstyled
87 {
88 margin-top: 20px;
89 }
90
91 .list-custom .list-unstyled li
92 {
93 margin-bottom: 0;
94 }
95
96 .list-custom .li-yes:before,
saroyanm 2016/05/03 10:06:32 Please do not use element related class names.
juliandoucette 2016/05/11 00:45:40 If not li-yes, li-no is check-item, cross-item ok?
saroyanm 2016/05/17 10:19:42 The idea behind is that you can assign the rule to
97 .list-custom .li-no:before
98 {
99 padding: 0;
100 margin: 0 0 0 -45px;
101 content: '';
102 display: inline-block;
103 height: 14px;
104 width: 40px;
saroyanm 2016/05/03 10:06:31 Width of the icon should be same size as the icon
juliandoucette 2016/05/11 00:45:39 - I do have 2 separate icon selectors .li-yes, .li
saroyanm 2016/05/17 10:19:43 SVG is not supported in the browser that we still
105 background-position: center center;
106 background-size: contain;
107 background-repeat: no-repeat;
108 }
109
110 .list-custom .li-yes:before
111 {
112 background-image: url("/img/check.png");
saroyanm 2016/05/03 10:06:30 The image size according to style-guide is 20x14px
juliandoucette 2016/05/11 00:45:40 The image should be SVG or higher resolution (the
saroyanm 2016/05/17 10:19:43 Same as the comment above,
113 }
114
115 .list-custom .li-no:before
116 {
117 height: 18px;
118 margin-bottom: -3px;
119 background-image: url("/img/cross.png");
120 }
121
122 #content .hr-top
saroyanm 2016/05/03 10:06:32 You can apply this style to the section element it
juliandoucette 2016/05/11 00:45:39 You mean "section" not "select" :D ... That confus
123 {
124 border-top: 1px solid #ccc;
125 }
126
127 #content h3
saroyanm 2016/05/03 10:06:30 In general would be great to have as less page spe
juliandoucette 2016/05/11 00:45:40 I agree / acknowledge. In this case, I think H3
128 {
129 line-height: 34px;
130 vertical-align: middle;
131 }
132 </style>
133 </head>
134
135 <body>
136 <h1>{{adware-page-header I’m using Adblock Plus but I still see suspicious ads }}</h1>
saroyanm 2016/05/03 10:06:31 Detail: No need to use adware in the string name t
juliandoucette 2016/05/11 00:45:40 Thanks! I didn't know this at the time.
137
138 <section>
139 <h2 class="text-danger short">{{adware-alert-heading What happened?}}</h2>
saroyanm 2016/05/03 10:06:31 No style is assigned to class "short"
juliandoucette 2016/05/11 00:45:40 Good catch! That was a leftover :-) .
140 <p class="alert-danger text-danger">{{adware-alert-content Adblock Plus has detected ads that are likely injected with Adware, which may have infected your computer.}}</p>
141 </section>
142
143 <section>
144 <h2>{{what-is-adware-heading What is Adware?}}</h2>
145 <p>{{what-is-adware-content Adware is one type of Malware, short for "Malici ous Software.” It is a term generally used for software installed on your comput er that is designed to infiltrate or damage a computer system without your conse nt. In many cases you obtained this software without knowing it, as these applic ations are often bundled in other software installers.}}</p>
146 </section>
147
148 <section>
149 <h2>{{why-not-blocked-heading Why doesn't Adblock Plus block these ads?}}</h 2>
150 <p>{{why-not-blocked-content Adblock Plus is designed to block ads that are delivered from websites or their advertising partners. Malicious software can in ject ads in such a way that the ads can not reliably be blocked by Adblock Plus. The best way to stop these ads is to remove the Malware that displays them.}}</ p>
151 </section>
152
153 <section>
154 <h2>{{how-to-solve-heading How can I solve this?}}</h2>
155
156 <section class="hr-top">
157 <h3><span class="badge-success">1</span> {{remove-unwanted-programs-headin g Get rid of unwanted programs}}</h3>
158 <p>{{remove-unwanted-programs-content For users unfamiliar with the admini stration of their computer's operating system, it’s recommended to run automated checks for Malware with one of the programs listed below, which also allow to r emove the found unwanted software. All of the programs are free (for at least a trial period) with full functionality, and safe to install alongside your antivi rus solution.}}</p>
159 <table class="table-unstyled">
saroyanm 2016/05/03 10:06:32 Please do not use Table for layouting, by changing
juliandoucette 2016/05/11 00:45:40 I believe this is tabular data? (It also looks fi
saroyanm 2016/05/17 10:19:42 Unfortunately Tables are not responsive at all and
160 <thead>
161 <th>{{windows-os Windows}}</th>
162 <th>{{osx-os OS X}}</th>
163 </thead>
164 <tbody>
165 <tr>
166 <td><a href="{{malwarebytes-win-affiliate-link buy.malwarebytes.com/ get-trial/adblock/en/?c=adblock&s=en&k=trial}}">{{malwarebytes-brand Malwarebyte s}}</a></td>
saroyanm 2016/05/03 10:06:31 1. I think this is wrong, I think we shouldn't tra
juliandoucette 2016/05/11 00:45:39 I disagree. We do not have affiliate links for al
saroyanm 2016/05/17 10:19:43 Sorry I think I couldn't describe my point well, w
167 <td><a href="{{malwarebytes-osx affiliate-link https://www.malwareby tes.org/antimalware/mac/">{{malwarebytes-brand Malwarebytes}}</a></td>
168 </tr>
169 <tr><td><a href="http://www.surfright.nl/en/hitmanpro">{{hitmanpro-bra nd HitmanPro}}</a></td></tr>
170 <tr><td><a href="https://toolslib.net/downloads/viewdownload/1-adwclea ner/">{{adwcleaner-brand AdwCleaner}}</a></td></tr>
171 </tbody>
172 </table>
173 <p>{{advanced-users-content For advanced users, refer to the guides below to remove Malware and other programs on your computer that you don't remember i nstalling. To regain control of your browsing experience, you must uninstall any malicious programs. For more help on uninstalling malicious programs from your computer, click one of the links below.}}</p>
174 <ul class="list-unstyled">
175 <li><a href="http://malwaretips.com/blogs/malware-removal-guide-for-wind ows/">{{windows-os Windows}}</a></li>
176 <li><a href="https://support.apple.com/en-us/HT203987">{{osx-os OS X}}</ a></li>
177 </ul>
178 </section>
179
180 <section class="hr-top">
181 <h3><span class="badge badge-success">2</span> {{reset-browser-settings-he ading Reset your browser settings}}</h3>
182 <p>{{reset-browser-settings-content Oftentimes uninstalling unwanted softw are does not restore your browser settings to their original state. Follow these guides to do this manually:}}</p>
183 <ul class="list-unstyled">
184 <li><a href="https://support.microsoft.com/en-us/kb/923737">{{internet-e xplorer-browser Internet Explorer}}</a></li>
185 <li><a href="https://support.mozilla.org/kb/reset-firefox-easily-fix-mos t-problems">{{firefox-browser Mozilla Firefox}}</a></li>
186 <li><a href="https://support.google.com/chrome/answer/3296214">{{chrome- browser Google Chrome}}</a></li>
187 <li><a href="http://winaero.com/blog/how-to-reset-opera-browser-settings -to-their-defaults/">{{opera-browser Opera}}</a></li>
188 <li><a href="https://help.yandex.com/newbrowser/faq/faq-settings.xml#res et">{{yandex-browser Yandex.Browser}}</a></li>
189 <li><a href="http://help.coupons.com/articles/177-How-do-I-reset-my-Safa ri-browser-to-its-default-settings-on-Macintosh">{{safari-6-7-browser Safari 6 & 7}}</a></li>
190 <li><a href="https://discussions.apple.com/message/26874735">{{safari-8- 9-browser Safari 8 & 9}}</a></li>
191 </ul>
192 </section>
193
194 <section class="hr-top">
195 <h2>{{prevent-infection-heading How do I prevent my computer from getting infected with Malware in the future?}}</h2>
196 <ul class="list-custom">
197 <li class="li-yes">
198 <strong>{{use-official-channels-heading Use official channels to downl oad your browser:}}</strong>
199 <ul class="list-unstyled">
200 <li><a href="http://www.mozilla.org/firefox">{{firefox-browser Mozil la Firefox}}</a></li>
201 <li><a href="https://www.google.com/chrome/browser/desktop/">{{chrom e-browser Google Chrome}}</a></li>
202 <li><a href="http://www.opera.com/">{{opera-browser Opera}}</a></li>
203 <li><a href="https://browser.yandex.com/">{{yandex-browser Yandex.Br owser}}</a></li>
204 </ul>
205 </li>
206 <li class="li-yes">
207 <strong>{{install-abp-heading Install Adblock Plus.}}</strong>
208 {{install-abp-content Adblock Plus can help to block and hide ads that trick you into installing potentially unwanted programs. Get Adblock Plus from} } <a href="https://adblockplus.org/">https://adblockplus.org/</a>.
209 </li>
210 <li class="li-yes">
211 <strong>{{update-os-heading Keep your operating system and other softw are up-to-date.}}</strong>
212 </li>
213 <li class="li-no">
214 <strong class="text-danger">{{avoid-popups-heading Don't click inside misleading pop-up windows.}}</strong>
215 {{avoid-popups-content Many malicious websites try to install Malware on your system by making images look like pop-up windows, or by displaying an an imation of the website scanning your computer.}}
216 </li>
217 <li class="li-no">
218 <strong class="text-danger">{{dont-install-untrusted-heading Don't ins tall untrusted software.}}</strong>
219 {{dont-install-untrusted-content Some websites offer you software to a ccelerate your browser, to help you search the web, or to add toolbars that do t hings your browser already does. Some unwanted programs also come bundled in sof tware packages. Usually, these programs gather information on your browsing beha vior that serve only the people who designed them. Make sure you only install ad d-ons, extensions and plug-ins from your browser’s web store website and that yo u uncheck unwanted programs in software installation wizards.}}
220 </li>
221 </ul>
222 </section>
223 </body>
OLDNEW
« no previous file with comments | « no previous file | static/img/check.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld