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: Fixed rtl .custom-list spacing Created June 13, 2016, 6:19 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-unstyled, 68 #content ul
68 .list-unstyled li 69 {
70 margin-top: 10px;
71 margin-bottom: 10px;
72 padding: 0px;
73 position: relative;
74 }
75
76 #content ul,
77 #content li
69 { 78 {
70 margin-left: 0px; 79 margin-left: 0px;
71 margin-right: 0px; 80 margin-right: 0px;
72 padding-left: 0px; 81 padding-left: 0px;
73 padding-right: 0px; 82 padding-right: 0px;
74 } 83 }
75 84
76 .list-unstyled li 85 #content li
77 {
78 list-style-type: none;
79 }
80
81 .list-unstyled li
82 { 86 {
83 padding-bottom: 10px; 87 padding-bottom: 10px;
84 line-height: 20px; 88 line-height: 20px;
85 } 89 list-style-type: none;
86 90 }
87 .list-custom 91
88 { 92 #content li.icon
89 padding-left: 10px; 93 {
90 padding-right: 10px; 94 padding: 20px 0px 0px 40px;
91 overflow: visible; 95 overflow: visible;
92 list-style-type: none; 96 }
93 } 97
94 98 [dir="rtl"] #content li.icon
95 .list-custom ul 99 {
96 { 100 padding: 20px 40px 0px 0px;
97 margin-top: 20px; 101 }
98 } 102
99 103 li.icon::before
100 [dir="ltr"] .list-custom ul 104 {
101 { 105 content: " ";
102 margin-left: 45px; 106 position: absolute;
103 } 107 left: 0px;
104 108 right: auto;
105 [dir="rtl"] .list-custom ul 109 height: 20px;
106 { 110 width: 40px;
107 margin-right: 45px; 111 }
108 } 112
109 113 [dir="rtl"] li.icon::before
110 .list-custom > li 114 {
111 { 115 right: 0px;
112 margin-bottom: 25px; 116 left: auto;
113 } 117 }
114 118
115 .list-custom > li > strong 119 li.icon.check::before
116 { 120 {
117 display: inline-block; 121 background: url("/img/check.png") no-repeat center top;
118 } 122 }
119 123
120 .list-custom .check-item, 124 li.icon.cross::before
121 .list-custom .cross-item 125 {
122 { 126 background: url("/img/cross.png") no-repeat center top;
123 min-height: 20px; 127 }
124 padding-top: 2px; 128
125 } 129 li.icon.cross strong
126 130 {
127 [dir="ltr"] .list-custom .check-item, 131 color: #e11a2c;
128 [dir="ltr"] .list-custom .cross-item
129 {
130 padding-left: 35px;
131 }
132
133 [dir="rtl"] .list-custom .check-item,
134 [dir="rtl"] .list-custom .cross-item
135 {
136 padding-right: 35px;
137 }
138
139 .list-custom .check-item
140 {
141 background: url("/img/check.png") no-repeat left top;
142 }
143
144 .list-custom .cross-item
145 {
146 background: url("/img/cross.png") no-repeat left top;
147 }
148
149 [dir="rtl"] .list-custom .check-item,
150 [dir="rtl"] .list-custom .cross-item
151 {
152 background-position-x: right;
153 } 132 }
154 </style> 133 </style>
155 </head> 134 </head>
156 135
157 # {{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 }}
158 137
159 <div class="text-danger" markdown="1"> 138 <div class="warning" markdown="1">
160 ## {{alert-heading What happened?}} 139 ## {{alert-heading What happened?}}
161 140
162 {{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.}}
163 {: .alert-danger }
164 </div> 142 </div>
165 143
166 ## {{what-is-adware-heading What is Adware?}} 144 ## {{what-is-adware-heading What is Adware?}}
167 145
168 {{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.}}
169 147
170 ## {{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 ?}}
171 149
172 {{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.}}
173 151
174 ## {{how-to-solve-heading How can I solve this?}} 152 ## {{how-to-solve-heading How can I solve this?}}
175 153
176 ### <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 }
177 155
178 {{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.}}
179 157
180 <div class="narrow-list" markdown="1"> 158 <div class="narrow-list-block" markdown="1">
181 159
182 #### {{windows-os Windows}} 160 #### Windows
saroyanm 2016/06/21 14:58:04 Detail: I think we do not need to translate this.
juliandoucette 2016/06/23 16:10:58 Done.
183 161
184 <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.
185 * <a href="{{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-tri al/adblock/en/?c=adblock&s=en&k=trial}}">{{malwarebytes-brand Malwarebytes}}</a> 163 * [HitmanPro](http://www.surfright.nl/hitmanpro)
saroyanm 2016/06/21 14:58:03 Detail: Brand names do not need to be translated.
juliandoucette 2016/06/23 16:10:57 Done.
186 * <a href="{{hitmanpro-win-affiliate-link http://www.surfright.nl/en/hitmanpro}} ">{{hitmanpro-brand HitmanPro}}</a> 164 * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/)
187 * <a href="{{adcleaner-win-affiliate-link https://toolslib.net/downloads/viewdow nload/1-adwcleaner/}}">{{adwcleaner-brand AdwCleaner}}</a>
saroyanm 2016/06/23 08:45:32 Apparently we only need to translate the Malwareby
juliandoucette 2016/06/23 16:10:58 Done.
188 </ul>
189 165
190 </div> 166 </div>
191 <div class="narrow-list" markdown="1"> 167 <div class="narrow-list-block" markdown="1">
192 168
193 #### {{osx-os OS X}} 169 #### OS X
194 170
195 <ul class="list-unstyled" markdown="1"> 171 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">Malwarebytes</a>
196 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">{{malwarebytes-brand Malwarebytes}}</a>
197 </ul>
198 172
199 </div> 173 </div>
200 174
201 {{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.}}
202 176
203 <ul class="list-unstyled" markdown="1"> 177 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)
204 * [{{windows-os Windows}}](http://malwaretips.com/blogs/malware-removal-guide-fo r-windows/) 178 * [OS X](https://support.apple.com/en-us/HT203987)
saroyanm 2016/06/21 14:58:04 Detail: Brand names do not need to be translated.
juliandoucette 2016/06/23 16:10:57 Done.
205 * [{{osx-os OS X}}](https://support.apple.com/en-us/HT203987) 179
saroyanm 2016/06/21 14:58:04 Detail: Brand names do not need to be translated.
juliandoucette 2016/06/23 16:10:59 Done.
206 </ul> 180 ### *2* {{reset-browser-settings-heading Reset your browser settings}} { .icon-h eader }
207
208 ### <span class="badge-success">2</span> {{reset-browser-settings-heading Reset your browser settings}} { .split-section .badge-header }
209 181
210 {{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:}}
211 183
212 <ul class="list-unstyled" markdown="1"> 184 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737)
213 * [{{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)
saroyanm 2016/06/21 14:58:04 Detail: Brand names do not need to be translated.
juliandoucette 2016/06/23 16:10:58 Done.
214 * [{{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)
215 * [{{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/)
216 * [{{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 )
217 * [{{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)
218 * [{{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)
219 * [{{safari-8-9-browser Safari 8 & 9}}](https://discussions.apple.com/message/26 874735) 191
220 </ul> 192 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header }
221 193
222 ## {{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:}}**
223 195 { .icon .check }
224 <ul markdown="1" class="list-custom"> 196 * [Mozilla Firefox](http://www.mozilla.org/firefox)
225 * **{{use-official-channels-heading Use official channels to download your brows er:}}**{: .check-item } 197 * [Google Chrome](https://www.google.com/chrome/browser/desktop/)
226 <ul class="list-unstyled" markdown="1"> 198 * [Opera](http://www.opera.com/)
227 * [{{firefox-browser Mozilla Firefox}}](http://www.mozilla.org/firefox) 199 * [Yandex.Browser](https://browser.yandex.com/)
saroyanm 2016/06/21 14:58:04 Detail: Brand names do not need to be translated.
juliandoucette 2016/06/23 16:10:59 Done.
228 * [{{chrome-browser Google Chrome}}](https://www.google.com/chrome/browser/des ktop/)
229 * [{{opera-browser Opera}}](http://www.opera.com/)
230 * [{{yandex-browser Yandex.Browser}}](https://browser.yandex.com/)
231 </ul>
232 * **{{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/). 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/).
233 {: .check-item } 201 { .icon .check }
234 * **{{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 .}}**
235 {: .check-item } 203 { .icon .check }
236 * </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.}}
237 {: .cross-item } 205 { .icon .cross }
238 * **{{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.}}
239 {: .cross-item} 207 { .icon .cross }
240 </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