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: Forgot red text in icon list
Created July 4, 2016, 6:22 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.
« 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') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 .separate-section | 7 .separate-section |
| 8 { | 8 { |
| 9 margin-top: 20px; | 9 margin-top: 20px; |
| 10 padding-top: 20px; | 10 padding-top: 20px; |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 border-color: #e11a2c; | 41 border-color: #e11a2c; |
| 42 background-color: #fff; | 42 background-color: #fff; |
| 43 } | 43 } |
| 44 | 44 |
| 45 .icon-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 .icon-header span | 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 #content ul | 68 #content ul |
| 68 { | 69 { |
| 69 margin-top: 10px; | 70 margin-top: 10px; |
| 70 margin-bottom: 10px; | 71 margin-bottom: 10px; |
| 71 padding: 0px; | 72 padding: 0px; |
| 73 position: relative; | |
| 72 } | 74 } |
| 73 | 75 |
| 74 #content ul, | 76 #content ul, |
| 75 #content li | 77 #content li |
| 76 { | 78 { |
| 77 margin-left: 0px; | 79 margin-left: 0px; |
| 78 margin-right: 0px; | 80 margin-right: 0px; |
| 79 padding-left: 0px; | 81 padding-left: 0px; |
| 80 padding-right: 0px; | 82 padding-right: 0px; |
| 81 } | 83 } |
| 82 | 84 |
| 83 #content li | 85 #content li |
| 84 { | 86 { |
| 85 padding-bottom: 10px; | 87 padding-bottom: 10px; |
| 86 line-height: 20px; | 88 line-height: 20px; |
| 87 list-style-type: none; | 89 list-style-type: none; |
| 88 } | 90 } |
| 89 | 91 |
| 90 #content .icon-list | 92 #content li.icon |
| 91 { | 93 { |
| 92 position: relative; | |
| 93 margin: 0px; | |
| 94 padding: 20px 0px 0px 40px; | 94 padding: 20px 0px 0px 40px; |
| 95 overflow: visible; | 95 overflow: visible; |
| 96 list-style-type: none; | 96 } |
| 97 } | 97 |
| 98 | 98 [dir="rtl"] #content li.icon |
| 99 [dir="rtl"] #content .icon-list | |
| 100 { | 99 { |
| 101 padding: 20px 40px 0px 0px; | 100 padding: 20px 40px 0px 0px; |
| 102 } | 101 } |
| 103 | 102 |
| 104 #content .icon-list > li | 103 li.icon::before |
| 105 { | |
| 106 padding-bottom: 25px; | |
| 107 } | |
| 108 | |
| 109 .icon-list > li::before | |
| 110 { | 104 { |
| 111 content: " "; | 105 content: " "; |
| 112 position: absolute; | 106 position: absolute; |
| 113 left: 0px; | 107 left: 0px; |
| 114 right: auto; | 108 right: auto; |
| 115 height: 20px; | 109 height: 20px; |
| 116 width: 40px; | 110 width: 40px; |
| 117 } | 111 } |
| 118 | 112 |
| 119 [dir="rtl"] .icon-list > li::before | 113 [dir="rtl"] li.icon::before |
| 120 { | 114 { |
| 121 right: 0px; | 115 right: 0px; |
| 122 left: auto; | 116 left: auto; |
| 123 } | 117 } |
| 124 | 118 |
| 125 .icon-list > .check::before | 119 li.icon.check::before |
| 126 { | 120 { |
| 127 background: url("/img/check.png") no-repeat center top; | 121 background: url("/img/check.png") no-repeat center top; |
| 128 } | 122 } |
| 129 | 123 |
| 130 .icon-list > .cross::before | 124 li.icon.cross::before |
| 131 { | 125 { |
| 132 background: url("/img/cross.png") no-repeat center top; | 126 background: url("/img/cross.png") no-repeat center top; |
| 133 } | 127 } |
| 134 | 128 |
| 135 .icon-list > .cross strong | 129 li.icon.cross strong |
| 136 { | 130 { |
| 137 color: #e11a2c; | 131 color: #e11a2c; |
| 138 } | 132 } |
| 139 </style> | 133 </style> |
| 140 </head> | 134 </head> |
| 141 | 135 |
| 142 # {{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 }} |
| 143 | 137 |
| 144 <div class="warning" markdown="1"> | 138 <div class="warning" markdown="1"> |
| 145 ## {{alert-heading What happened?}} | 139 ## {{alert-heading What happened?}} |
| 146 | 140 |
| 147 {{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.}} |
| 148 </div> | 142 </div> |
| 149 | 143 |
| 150 ## {{what-is-adware-heading What is Adware?}} | 144 ## {{what-is-adware-heading What is Adware?}} |
| 151 | 145 |
| 152 {{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.}} |
| 153 | 147 |
| 154 ## {{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 ?}} |
| 155 | 149 |
| 156 {{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.}} |
| 157 | 151 |
| 158 ## {{how-to-solve-heading How can I solve this?}} | 152 ## {{how-to-solve-heading How can I solve this?}} |
| 159 | 153 |
| 160 ### <span>1</span> {{remove-unwanted-programs-heading Get rid of unwanted progra ms}} { .separate-section .icon-header } | 154 ### *1* {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .sep arate-section .icon-header } |
| 161 | 155 |
| 162 {{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.}} |
| 163 | 157 |
| 164 <div class="narrow-list-block" markdown="1"> | 158 <div class="narrow-list-block" markdown="1"> |
| 165 | 159 |
| 166 #### Windows | 160 #### Windows |
| 167 | 161 |
| 168 <ul markdown="1"> | |
| 169 * <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.
| |
| 170 * [HitmanPro](http://www.surfright.nl/hitmanpro) | 163 * [HitmanPro](http://www.surfright.nl/hitmanpro) |
| 171 * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/) | 164 * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/) |
| 172 </ul> | |
| 173 | 165 |
| 174 </div> | 166 </div> |
| 175 <div class="narrow-list-block" markdown="1"> | 167 <div class="narrow-list-block" markdown="1"> |
| 176 | 168 |
| 177 #### OS X | 169 #### OS X |
| 178 | 170 |
| 179 <ul markdown="1"> | |
| 180 * <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> |
| 181 </ul> | |
| 182 | 172 |
| 183 </div> | 173 </div> |
| 184 | 174 |
| 185 {{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.}} |
| 186 | 176 |
| 187 <ul markdown="1"> | |
| 188 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/) | 177 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/) |
| 189 * [OS X](https://support.apple.com/en-us/HT203987) | 178 * [OS X](https://support.apple.com/en-us/HT203987) |
| 190 </ul> | 179 |
| 191 | 180 ### *2* {{reset-browser-settings-heading Reset your browser settings}} { .icon-h eader } |
| 192 ### <span>2</span> {{reset-browser-settings-heading Reset your browser settings} } { .icon-header } | |
| 193 | 181 |
| 194 {{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:}} |
| 195 | 183 |
| 196 <ul markdown="1"> | |
| 197 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737) | 184 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737) |
| 198 * [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) |
| 199 * [Google Chrome](https://support.google.com/chrome/answer/3296214) | 186 * [Google Chrome](https://support.google.com/chrome/answer/3296214) |
| 200 * [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/) |
| 201 * [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 ) |
| 202 * [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) |
| 203 * [Safari 8 & 9](https://discussions.apple.com/message/26874735) | 190 * [Safari 8 & 9](https://discussions.apple.com/message/26874735) |
| 204 </ul> | |
| 205 | 191 |
| 206 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header } | 192 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header } |
| 207 | 193 |
| 208 <ul class="icon-list" markdown="1"> | |
| 209 * **{{use-official-channels-heading Use official channels to download your brows er:}}** | 194 * **{{use-official-channels-heading Use official channels to download your brows er:}}** |
| 210 { .check } | 195 { .icon .check } |
| 211 * [Mozilla Firefox](http://www.mozilla.org/firefox) | 196 * [Mozilla Firefox](http://www.mozilla.org/firefox) |
| 212 * [Google Chrome](https://www.google.com/chrome/browser/desktop/) | 197 * [Google Chrome](https://www.google.com/chrome/browser/desktop/) |
| 213 * [Opera](http://www.opera.com/) | 198 * [Opera](http://www.opera.com/) |
| 214 * [Yandex.Browser](https://browser.yandex.com/) | 199 * [Yandex.Browser](https://browser.yandex.com/) |
| 215 * **{{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/). |
| 216 { .check } | 201 { .icon .check } |
| 217 * **{{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 .}}** |
| 218 { .check } | 203 { .icon .check } |
| 219 * **{{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.}} | 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.}} |
| 220 { .cross } | 205 { .icon .cross } |
| 221 * **{{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.}} |
| 222 { .cross } | 207 { .icon .cross } |
| 223 </ul> | |
| LEFT | RIGHT |
« no previous file
|
static/img/check.png » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
