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

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: Fixed zombie list item Created June 23, 2016, 4:46 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 <head> 5 <head>
6 <style> 6 <style>
7 .split-section 7 .separate-section
8 { 8 {
9 margin-top: 20px; 9 margin-top: 20px;
10 padding-top: 20px; 10 padding-top: 20px;
11 border-top: 1px solid #ccc; 11 border-top: 1px solid #ccc;
12 } 12 }
13 13
14 .narrow-list 14 .narrow-list-block
15 { 15 {
16 display: inline-block; 16 display: inline-block;
17 width: 250px; 17 width: 250px;
18 margin: 0px 35px 10px 0px; 18 margin: 0px 35px 10px 0px;
19 vertical-align: top; 19 vertical-align: top;
20 } 20 }
21 21
22 [dir="rtl"] .narrow-list 22 [dir="rtl"] .narrow-list-block
23 { 23 {
24 margin: 0px 0px 10px 35px; 24 margin: 0px 0px 10px 35px;
25 } 25 }
26 26
27 .narrow-list ul 27 .narrow-list-block ul
28 { 28 {
29 margin-bottom: 0px; 29 margin-bottom: 0px;
30 } 30 }
31 31
32 .text-danger 32 .warning
33 { 33 {
34 color: #e11a2c; 34 color: #e11a2c;
35 } 35 }
36 36
37 .alert-danger 37 .warning p
38 { 38 {
39 padding: 15px; 39 padding: 15px;
40 border: 2px solid; 40 border: 2px solid;
41 border-color: #e11a2c; 41 border-color: #e11a2c;
42 background-color: #fff; 42 background-color: #fff;
43 } 43 }
44 44
45 .badge-header 45 .icon-header
46 { 46 {
47 vertical-align: middle; 47 vertical-align: middle;
48 line-height: 34px; 48 line-height: 34px;
49 } 49 }
50 50
51 .badge-success 51 .icon-header em
52 { 52 {
53 display: inline-block; 53 display: inline-block;
54 vertical-align: top; 54 vertical-align: top;
55 text-align: center; 55 text-align: center;
56 line-height: 20px; 56 line-height: 20px;
57 margin-right: 7px; 57 margin-right: 7px;
58 padding: 7px 0px; 58 padding: 7px 0px;
59 width: 34px; 59 width: 34px;
60 border-radius: 4px; 60 border-radius: 4px;
61 color: #fff; 61 color: #fff;
62 background-color: #53b044; 62 background-color: #53b044;
63 font-weight: bold; 63 font-weight: bold;
64 font-style: normal;
64 font-size: 20px; 65 font-size: 20px;
65 } 66 }
66 67
67 .list-custom, 68 #content ul
68 .list-unstyled,
69 .list-custom ul
70 { 69 {
71 margin-top: 10px; 70 margin-top: 10px;
72 margin-bottom: 10px; 71 margin-bottom: 10px;
73 padding: 0px; 72 padding: 0px;
74 } 73 position: relative;
75 74 }
76 .list-unstyled, 75
77 .list-unstyled li, 76 #content ul,
78 .list-custom ul, 77 #content li
79 .list-custom ul li
80 { 78 {
81 margin-left: 0px; 79 margin-left: 0px;
82 margin-right: 0px; 80 margin-right: 0px;
83 padding-left: 0px; 81 padding-left: 0px;
84 padding-right: 0px; 82 padding-right: 0px;
85 } 83 }
86 84
87 .list-unstyled li, 85 #content li
88 .list-custom li
89 {
90 list-style-type: none;
91 }
92
93 .list-unstyled li,
94 .list-custom li
95 { 86 {
96 padding-bottom: 10px; 87 padding-bottom: 10px;
97 line-height: 20px; 88 line-height: 20px;
98 } 89 list-style-type: none;
99 90 }
100 .list-custom 91
101 { 92 #content li.icon
102 position: relative; 93 {
103 margin: 0px; 94 padding: 20px 0px 0px 40px;
104 padding: 20px 0px 0px 0px;
105 overflow: visible; 95 overflow: visible;
106 list-style-type: none; 96 }
107 } 97
108 98 [dir="rtl"] #content li.icon
109 [dir="ltr"] .list-custom 99 {
110 { 100 padding: 20px 40px 0px 0px;
111 padding-left: 40px; 101 }
112 } 102
113 103 li.icon::before
114 [dir="rtl"] .list-custom 104 {
115 { 105 content: " ";
116 padding-right: 40px;
117 }
118
119 .list-custom > li
120 {
121 padding-bottom: 25px;
122 }
123
124 .list-custom .check-item,
125 .list-custom .cross-item
126 {
127 position: absolute; 106 position: absolute;
128 left: auto; 107 left: 0px;
129 right: auto; 108 right: auto;
130 height: 20px; 109 height: 20px;
131 width: 40px; 110 width: 40px;
132 } 111 }
133 112
134 [dir="ltr"] .list-custom .check-item, 113 [dir="rtl"] li.icon::before
135 [dir="ltr"] .list-custom .cross-item 114 {
136 { 115 right: 0px;
137 left: 0; 116 left: auto;
138 } 117 }
139 118
140 [dir="rtl"] .list-custom .check-item, 119 li.icon.check::before
141 [dir="rtl"] .list-custom .cross-item
142 {
143 right: 0;
144 }
145
146 .list-custom .check-item
147 { 120 {
148 background: url("/img/check.png") no-repeat center top; 121 background: url("/img/check.png") no-repeat center top;
149 } 122 }
150 123
151 .list-custom .cross-item 124 li.icon.cross::before
152 { 125 {
153 background: url("/img/cross.png") no-repeat center top; 126 background: url("/img/cross.png") no-repeat center top;
127 }
128
129 li.icon.cross strong
130 {
131 color: #e11a2c;
154 } 132 }
155 </style> 133 </style>
156 </head> 134 </head>
157 135
158 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }} 136 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }}
159 137
160 <div class="text-danger" markdown="1"> 138 <div class="warning" markdown="1">
161 ## {{alert-heading What happened?}} 139 ## {{alert-heading What happened?}}
162 140
163 {{alert-content <fix>Adblock Plus</fix> has detected ads that are likely injecte d with Adware, 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.}}
164 {: .alert-danger }
165 </div> 142 </div>
166 143
167 ## {{what-is-adware-heading What is Adware?}} 144 ## {{what-is-adware-heading What is Adware?}}
168 145
169 {{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.}}
170 147
171 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}} 148 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}}
172 149
173 {{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.}} 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.}}
174 151
175 ## {{how-to-solve-heading How can I solve this?}} 152 ## {{how-to-solve-heading How can I solve this?}}
176 153
177 ### <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 }
178 155
179 {{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.}}
180 157
181 <div class="narrow-list" markdown="1"> 158 <div class="narrow-list-block" markdown="1">
182 159
183 #### Windows 160 #### Windows
184 161
185 <ul class="list-unstyled" markdown="1">
186 * <a href="{{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-tri al/adblock/en/?c=adblock&s=en&k=trial}}">Malwarebytes</a> 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.
187 * <a href="{{hitmanpro-win-affiliate-link http://www.surfright.nl/en/hitmanpro}} ">HitmanPro</a> 163 * [HitmanPro](http://www.surfright.nl/hitmanpro)
188 * <a href="{{adcleaner-win-affiliate-link https://toolslib.net/downloads/viewdow nload/1-adwcleaner/}}">AdwCleaner</a> 164 * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/)
189 </ul>
190 165
191 </div> 166 </div>
192 <div class="narrow-list" markdown="1"> 167 <div class="narrow-list-block" markdown="1">
193 168
194 #### OS X 169 #### OS X
195 170
196 <ul class="list-unstyled" markdown="1">
197 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">Malwarebytes</a> 171 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">Malwarebytes</a>
198 </ul>
199 172
200 </div> 173 </div>
201 174
202 {{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.}}
203 176
204 <ul class="list-unstyled" markdown="1">
205 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/) 177 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)
206 * [OS X](https://support.apple.com/en-us/HT203987) 178 * [OS X](https://support.apple.com/en-us/HT203987)
207 </ul> 179
208 180 ### *2* {{reset-browser-settings-heading Reset your browser settings}} { .icon-h eader }
209 ### <span class="badge-success">2</span> {{reset-browser-settings-heading Reset your browser settings}} { .split-section .badge-header }
210 181
211 {{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:}}
212 183
213 <ul class="list-unstyled" markdown="1">
214 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737) 184 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737)
215 * [Mozilla Firefox](https://support.mozilla.org/kb/reset-firefox-easily-fix-most -problems) 185 * [Mozilla Firefox](https://support.mozilla.org/kb/reset-firefox-easily-fix-most -problems)
216 * [Google Chrome](https://support.google.com/chrome/answer/3296214) 186 * [Google Chrome](https://support.google.com/chrome/answer/3296214)
217 * [Opera](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-d efaults/) 187 * [Opera](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-d efaults/)
218 * [Yandex.Browser](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset ) 188 * [Yandex.Browser](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset )
219 * [Safari 6 & 7](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-b rowser-to-its-default-settings-on-Macintosh) 189 * [Safari 6 & 7](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-b rowser-to-its-default-settings-on-Macintosh)
220 * [Safari 8 & 9](https://discussions.apple.com/message/26874735) 190 * [Safari 8 & 9](https://discussions.apple.com/message/26874735)
221 </ul> 191
222 192 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header }
223 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .split-section .badge-header } 193
224 194 * **{{use-official-channels-heading Use official channels to download your brows er:}}**
225 <ul class="list-custom" markdown="1"> 195 { .icon .check }
226 * <span class="check-item"></span> **{{use-official-channels-heading Use officia l channels to download your browser:}}**
227 * [Mozilla Firefox](http://www.mozilla.org/firefox) 196 * [Mozilla Firefox](http://www.mozilla.org/firefox)
228 * [Google Chrome](https://www.google.com/chrome/browser/desktop/) 197 * [Google Chrome](https://www.google.com/chrome/browser/desktop/)
229 * [Opera](http://www.opera.com/) 198 * [Opera](http://www.opera.com/)
230 * [Yandex.Browser](https://browser.yandex.com/) 199 * [Yandex.Browser](https://browser.yandex.com/)
231 * <span class="check-item"></span> **{{install-abp-heading Install <fix>Adblock Plus</fix>.}}** {{install-abp-content <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}} [https://adblockplus.org/](https://adblockplus.org /). 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/).
232 * <span class="check-item"></span> **{{update-os-heading Keep your operating sys tem and other software up-to-date.}}** 201 { .icon .check }
233 * <span class="cross-item"></span> **{{avoid-popups-heading Don't click inside m isleading pop-up windows.}}**{ .text-danger } {{avoid-popups-content Many malici ous websites try to install Malware on your system by making images look like po p-up windows, or by displaying an animation of the website scanning your compute r.}} 202 * **{{update-os-heading Keep your operating system and other software up-to-date .}}**
234 * <span class="cross-item"></span> **{{dont-install-untrusted-heading Don't inst all untrusted software.}}**{: .text-danger} {{dont-install-untrusted-content Som e 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 software packages. Usually, these programs gather information on your browsing behavior that serve only the people who designed t hem. Make sure you only install add-ons, extensions and plug-ins from your brows er’s web store website and that you uncheck unwanted programs in software instal lation wizards.}} 203 { .icon .check }
235 </ul> 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.}}
205 { .icon .cross }
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.}}
207 { .icon .cross }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld