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

Delta Between Two Patch Sets: pages/adware.md

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)
Left Patch Set: moved meta tags, re-wrote in markdown, moved css, optimized images Created May 23, 2016, 7:49 p.m.
Right Patch Set: Refactored away obsolute HTML tags in markdown Created July 4, 2016, 7:27 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | static/img/check.png » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 title=About adware 1 title=About adware
2 description=What is adware and how to get rid of it 2 description=What is adware and how to get rid of it
3 noheading=true 3 noheading=true
4 4
5 # {{page-header I’m using Adblock Plus but I still see suspicious ads}} 5 <head>
6 6 <style>
7 <div class="text-danger" markdown="1"> 7 .separate-section
8 {
9 margin-top: 20px;
10 padding-top: 20px;
11 border-top: 1px solid #ccc;
12 }
13
14 .narrow-list-block
15 {
16 display: inline-block;
17 width: 250px;
18 margin: 0px 35px 10px 0px;
19 vertical-align: top;
20 }
21
22 [dir="rtl"] .narrow-list-block
23 {
24 margin: 0px 0px 10px 35px;
25 }
26
27 .narrow-list-block ul
28 {
29 margin-bottom: 0px;
30 }
31
32 .warning
33 {
34 color: #e11a2c;
35 }
36
37 .warning p
38 {
39 padding: 15px;
40 border: 2px solid;
41 border-color: #e11a2c;
42 background-color: #fff;
43 }
44
45 .icon-header
46 {
47 vertical-align: middle;
48 line-height: 34px;
49 }
50
51 .icon-header em
52 {
53 display: inline-block;
54 vertical-align: top;
55 text-align: center;
56 line-height: 20px;
57 margin-right: 7px;
58 padding: 7px 0px;
59 width: 34px;
60 border-radius: 4px;
61 color: #fff;
62 background-color: #53b044;
63 font-weight: bold;
64 font-style: normal;
65 font-size: 20px;
66 }
67
68 #content ul
69 {
70 margin-top: 10px;
71 margin-bottom: 10px;
72 padding: 0px;
73 position: relative;
74 }
75
76 #content ul,
77 #content li
78 {
79 margin-left: 0px;
80 margin-right: 0px;
81 padding-left: 0px;
82 padding-right: 0px;
83 }
84
85 #content li
86 {
87 padding-bottom: 10px;
88 line-height: 20px;
89 list-style-type: none;
90 }
91
92 #content li.icon
93 {
94 padding: 20px 0px 0px 40px;
95 overflow: visible;
96 }
97
98 [dir="rtl"] #content li.icon
99 {
100 padding: 20px 40px 0px 0px;
101 }
102
103 li.icon::before
104 {
105 content: " ";
106 position: absolute;
107 left: 0px;
108 right: auto;
109 height: 20px;
110 width: 40px;
111 }
112
113 [dir="rtl"] li.icon::before
114 {
115 right: 0px;
116 left: auto;
117 }
118
119 li.icon.check::before
120 {
121 background: url("/img/check.png") no-repeat center top;
122 }
123
124 li.icon.cross::before
125 {
126 background: url("/img/cross.png") no-repeat center top;
127 }
128
129 li.icon.cross strong
130 {
131 color: #e11a2c;
132 }
133 </style>
134 </head>
135
136 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }}
137
138 <div class="warning" markdown="1">
8 ## {{alert-heading What happened?}} 139 ## {{alert-heading What happened?}}
9 140
10 {{alert-content Adblock Plus has detected ads that are likely injected with Adwa re, which may have infected your computer.}} 141 {{alert-content <fix>Adblock Plus</fix> has detected ads that are likely injecte d with Adware, which may have infected your computer.}}
11 {: .alert-danger }
12 </div> 142 </div>
13 143
14 ## {{what-is-adware-heading What is Adware?}} 144 ## {{what-is-adware-heading What is Adware?}}
15 145
16 {{what-is-adware-content Adware is one type of Malware, short for "Malicious Sof tware.” It is a term generally used for software installed on your computer that is designed to infiltrate or damage a computer system without your consent. In many cases you obtained this software without knowing it, as these applications are often bundled in other software installers.}} 146 {{what-is-adware-content Adware is one type of Malware, short for "Malicious Sof tware.” It is a term generally used for software installed on your computer that is designed to infiltrate or damage a computer system without your consent. In many cases you obtained this software without knowing it, as these applications are often bundled in other software installers.}}
17 147
18 ## {{why-not-blocked-heading Why doesn't Adblock Plus block these ads?}} 148 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}}
19 149
20 {{why-not-blocked-content Adblock Plus is designed to block ads that are deliver ed from websites or their advertising partners. Malicious software can inject ad s in such a way that the ads can not reliably be blocked by Adblock Plus. The be st way to stop these ads is to remove the Malware that displays them.}} 150 {{why-not-blocked-content <fix>Adblock Plus</fix> is designed to block ads that are delivered from websites or their advertising partners. Malicious software ca n inject ads in such a way that the ads can not reliably be blocked by <fix>Adbl ock Plus</fix>. The best way to stop these ads is to remove the Malware that dis plays them.}}
21 151
22 ## {{how-to-solve-heading How can I solve this?}} 152 ## {{how-to-solve-heading How can I solve this?}}
23 153
24 ### <span class="badge-success">1</span> {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .split-section .badge-header } 154 ### *1* {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .sep arate-section .icon-header }
25 155
26 {{remove-unwanted-programs-content For users unfamiliar with the administration of their computer's operating system, it’s recommended to run automated checks f or Malware with one of the programs listed below, which also allow to remove the found unwanted software. All of the programs are free (for at least a trial per iod) with full functionality, and safe to install alongside your antivirus solut ion.}} 156 {{remove-unwanted-programs-content For users unfamiliar with the administration of their computer's operating system, it’s recommended to run automated checks f or Malware with one of the programs listed below, which also allow to remove the found unwanted software. All of the programs are free (for at least a trial per iod) with full functionality, and safe to install alongside your antivirus solut ion.}}
27 157
28 <div class="narrow-list" markdown="1"> 158 <div class="narrow-list-block" markdown="1">
29 159
30 #### {{windows-os Windows}} 160 #### Windows
31 161
32 <ul class="list-unstyled" markdown="1"> 162 * <a href="{{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-tri al/adblock/en/?c=adblock&s=en&k=trial}}">Malwarebytes</a>
saroyanm 2016/07/07 13:02:26 @Julian: before pushing the changes can you please
juliandoucette 2016/07/07 20:26:54 Will do.
33 * [{{malwarebytes-brand Malwarebytes}}]({{malwarebytes-win-affiliate-link http:/ /buy.malwarebytes.com/get-trial/adblock/en/?c=adblock&s=en&k=trial}}) 163 * [HitmanPro](http://www.surfright.nl/hitmanpro)
34 * [{{hitmanpro-brand HitmanPro}}]({{hitmanpro-win-affiliate-link http://www.surf right.nl/en/hitmanpro}}) 164 * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/)
35 * [{{adwcleaner-brand AdwCleaner}}]({{adcleaner-win-affiliate-link https://tools lib.net/downloads/viewdownload/1-adwcleaner/}})
36 </ul>
37 165
38 </div> 166 </div>
39 <div class="narrow-list" markdown="1"> 167 <div class="narrow-list-block" markdown="1">
40 168
41 #### {{osx-os OS X}} 169 #### OS X
42 170
43 <ul class="list-unstyled" markdown="1"> 171 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">Malwarebytes</a>
44 * [{{malwarebytes-brand Malwarebytes}}]({{malwarebytes-osx affiliate-link https: //www.malwarebytes.org/antimalware/mac/)
45 </ul>
46 172
47 </div> 173 </div>
48 174
49 {{advanced-users-content For advanced users, refer to the guides below to remov e Malware and other programs on your computer that you don't remember installing . To regain control of your browsing experience, you must uninstall any maliciou s programs. For more help on uninstalling malicious programs from your computer, click one of the links below.}} 175 {{advanced-users-content For advanced users, refer to the guides below to remov e Malware and other programs on your computer that you don't remember installing . To regain control of your browsing experience, you must uninstall any maliciou s programs. For more help on uninstalling malicious programs from your computer, click one of the links below.}}
50 176
51 <ul class="list-unstyled" markdown="1"> 177 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)
52 * [{{windows-os Windows}}](http://malwaretips.com/blogs/malware-removal-guide-fo r-windows/) 178 * [OS X](https://support.apple.com/en-us/HT203987)
53 * [{{osx-os OS X}}](https://support.apple.com/en-us/HT203987) 179
54 </ul> 180 ### *2* {{reset-browser-settings-heading Reset your browser settings}} { .icon-h eader }
55
56 ### <span class="badge badge-success">2</span> {{reset-browser-settings-heading Reset your browser settings}} { .split-section .badge-header }
57 181
58 {{reset-browser-settings-content Oftentimes uninstalling unwanted software does not restore your browser settings to their original state. Follow these guides t o do this manually:}} 182 {{reset-browser-settings-content Oftentimes uninstalling unwanted software does not restore your browser settings to their original state. Follow these guides t o do this manually:}}
59 183
60 <ul class="list-unstyled" markdown="1"> 184 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737)
61 * [{{internet-explorer-browser Internet Explorer}}](https://support.microsoft.co m/en-us/kb/923737) 185 * [Mozilla Firefox](https://support.mozilla.org/kb/reset-firefox-easily-fix-most -problems)
62 * [{{firefox-browser Mozilla Firefox}}](https://support.mozilla.org/kb/reset-fir efox-easily-fix-most-problems) 186 * [Google Chrome](https://support.google.com/chrome/answer/3296214)
63 * [{{chrome-browser Google Chrome}}](https://support.google.com/chrome/answer/32 96214) 187 * [Opera](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-d efaults/)
64 * [{{opera-browser Opera}}](http://winaero.com/blog/how-to-reset-opera-browser-s ettings-to-their-defaults/) 188 * [Yandex.Browser](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset )
65 * [{{yandex-browser Yandex.Browser}}](https://help.yandex.com/newbrowser/faq/faq -settings.xml#reset) 189 * [Safari 6 & 7](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-b rowser-to-its-default-settings-on-Macintosh)
66 * [{{safari-6-7-browser Safari 6 & 7}}](http://help.coupons.com/articles/177-How -do-I-reset-my-Safari-browser-to-its-default-settings-on-Macintosh) 190 * [Safari 8 & 9](https://discussions.apple.com/message/26874735)
67 * [{{safari-8-9-browser Safari 8 & 9}}](https://discussions.apple.com/message/26 874735) 191
68 </ul> 192 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header }
69 193
70 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .split-section .badge-header } 194 * **{{use-official-channels-heading Use official channels to download your brows er:}}**
71 195 { .icon .check }
72 <ul markdown="1" class="list-custom"> 196 * [Mozilla Firefox](http://www.mozilla.org/firefox)
73 * **{{use-official-channels-heading Use official channels to download your brows er:}}**{: .check-item } 197 * [Google Chrome](https://www.google.com/chrome/browser/desktop/)
74 <ul class="list-unstyled" markdown="1"> 198 * [Opera](http://www.opera.com/)
75 * [{{firefox-browser Mozilla Firefox}}](http://www.mozilla.org/firefox) 199 * [Yandex.Browser](https://browser.yandex.com/)
76 * [{{chrome-browser Google Chrome}}](https://www.google.com/chrome/browser/des ktop/) 200 * **{{install-abp-heading Install <fix>Adblock Plus</fix>.}}** {{install-abp-con tent <fix>Adblock Plus</fix> can help to block and hide ads that trick you into installing potentially unwanted programs. Get <fix>Adblock Plus</fix> from}} [ht tps://adblockplus.org/](https://adblockplus.org/).
77 * [{{opera-browser Opera}}](http://www.opera.com/) 201 { .icon .check }
78 * [{{yandex-browser Yandex.Browser}}](https://browser.yandex.com/)
79 </ul>
80 * **{{install-abp-heading Install Adblock Plus.}}** {{install-abp-content Adbloc k Plus can help to block and hide ads that trick you into installing potentially unwanted programs. Get Adblock Plus from}} [https://adblockplus.org/](https://a dblockplus.org/).
81 {: .check-item }
82 * **{{update-os-heading Keep your operating system and other software up-to-date .}}** 202 * **{{update-os-heading Keep your operating system and other software up-to-date .}}**
83 {: .check-item } 203 { .icon .check }
84 * </span> **{{avoid-popups-heading Don't click inside misleading pop-up windows. }}**{ .text-danger } {{avoid-popups-content Many malicious websites try to insta ll Malware on your system by making images look like pop-up windows, or by displ aying an animation of the website scanning your computer.}} 204 * **{{avoid-popups-heading Don't click inside misleading pop-up windows.}}**{ .t ext-danger } {{avoid-popups-content Many malicious websites try to install Malwa re on your system by making images look like pop-up windows, or by displaying an animation of the website scanning your computer.}}
85 {: .cross-item } 205 { .icon .cross }
86 * **{{dont-install-untrusted-heading Don't install untrusted software.}}**{: .te xt-danger} {{dont-install-untrusted-content Some websites offer you software to accelerate your browser, to help you search the web, or to add toolbars that do things your browser already does. Some unwanted programs also come bundled in so ftware packages. Usually, these programs gather information on your browsing beh avior that serve only the people who designed them. Make sure you only install a dd-ons, extensions and plug-ins from your browser’s web store website and that y ou uncheck unwanted programs in software installation wizards.}} 206 * **{{dont-install-untrusted-heading Don't install untrusted software.}}**{: .te xt-danger} {{dont-install-untrusted-content Some websites offer you software to accelerate your browser, to help you search the web, or to add toolbars that do things your browser already does. Some unwanted programs also come bundled in so ftware packages. Usually, these programs gather information on your browsing beh avior that serve only the people who designed them. Make sure you only install a dd-ons, extensions and plug-ins from your browser’s web store website and that y ou uncheck unwanted programs in software installation wizards.}}
87 {: .cross-item} 207 { .icon .cross }
88 </ul>
LEFTRIGHT
« no previous file | static/img/check.png » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld