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

Unified Diff: pages/adware.md

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)
Patch Set: Changed a couple class names to be more descriptive and reduced nested list padding Created June 23, 2016, 4:56 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | static/img/check.png » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pages/adware.md
===================================================================
new file mode 100644
--- /dev/null
+++ b/pages/adware.md
@@ -0,0 +1,240 @@
+title=About adware
+description=What is adware and how to get rid of it
+noheading=true
+
+<head>
+ <style>
+ .separate-section
+ {
+ margin-top: 20px;
+ padding-top: 20px;
+ border-top: 1px solid #ccc;
+ }
+
+ .narrow-list-block
+ {
+ display: inline-block;
+ width: 250px;
+ margin: 0px 35px 10px 0px;
+ vertical-align: top;
+ }
+
+ [dir="rtl"] .narrow-list-block
+ {
+ margin: 0px 0px 10px 35px;
+ }
+
+ .narrow-list-block ul
+ {
+ margin-bottom: 0px;
+ }
+
+ .text-danger
+ {
+ color: #e11a2c;
+ }
+
+ .alert-danger
+ {
+ padding: 15px;
+ border: 2px solid;
+ border-color: #e11a2c;
+ background-color: #fff;
+ }
+
+ .badge-header
+ {
+ vertical-align: middle;
+ line-height: 34px;
+ }
+
+ .badge-success
saroyanm 2016/06/27 17:12:31 I think you can use ".badge-header span" selector
juliandoucette 2016/06/30 19:05:49 Done.
+ {
+ display: inline-block;
+ vertical-align: top;
+ text-align: center;
+ line-height: 20px;
+ margin-right: 7px;
+ padding: 7px 0px;
+ width: 34px;
+ border-radius: 4px;
+ color: #fff;
+ background-color: #53b044;
+ font-weight: bold;
+ font-size: 20px;
+ }
+
+ .list-custom,
saroyanm 2016/06/27 17:12:30 Seems like this applies to all "UL" elements on th
juliandoucette 2016/06/30 19:05:49 Done.
+ .list-unstyled,
+ .list-custom ul
+ {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding: 0px;
+ }
+
+ .list-custom ul
saroyanm 2016/06/27 17:12:31 .list-custom, doesn't say anything about the style
juliandoucette 2016/06/30 19:05:49 Done.
+ {
+ margin-bottom: 0px;
+ }
+
+ .list-unstyled,
+ .list-unstyled li,
+ .list-custom ul,
+ .list-custom ul li
saroyanm 2016/06/27 17:12:29 I think while we have specific style ".list-unstyl
juliandoucette 2016/06/30 19:05:50 This style is used in several other places outside
juliandoucette 2016/06/30 19:05:54 Since these two styles cover all of the ul element
+ {
+ margin-left: 0px;
+ margin-right: 0px;
+ padding-left: 0px;
+ padding-right: 0px;
+ }
+
+ .list-unstyled li,
saroyanm 2016/06/27 17:12:30 This selectors can be merged with the one below, a
juliandoucette 2016/06/30 19:05:50 Done.
+ .list-custom li
+ {
+ list-style-type: none;
+ }
+
+ .list-unstyled li,
+ .list-custom li
+ {
+ padding-bottom: 10px;
+ line-height: 20px;
+ }
+
+ .list-custom
+ {
+ position: relative;
+ margin: 0px;
+ padding: 20px 0px 0px 0px;
+ overflow: visible;
+ list-style-type: none;
+ }
+
+ [dir="ltr"] .list-custom
saroyanm 2016/06/27 17:12:30 No need to mention "ltr" direction specifically, t
juliandoucette 2016/06/30 19:05:50 Done.
+ {
+ padding-left: 40px;
+ }
+
+ [dir="rtl"] .list-custom
+ {
+ padding-right: 40px;
+ }
+
+ .list-custom > li
+ {
+ padding-bottom: 25px;
+ }
+
+ .list-custom .check-item,
saroyanm 2016/06/27 17:12:30 All .check-item and .cross-item are inside of the
juliandoucette 2016/06/30 19:05:54 Good idea. I'll do you 1 better though. We can us
+ .list-custom .cross-item
+ {
+ position: absolute;
+ left: auto;
+ right: auto;
+ height: 20px;
+ width: 40px;
+ }
+
+ [dir="ltr"] .list-custom .check-item,
+ [dir="ltr"] .list-custom .cross-item
+ {
+ left: 0;
+ }
+
+ [dir="rtl"] .list-custom .check-item,
+ [dir="rtl"] .list-custom .cross-item
+ {
+ right: 0;
+ }
+
+ .list-custom .check-item
+ {
+ background: url("/img/check.png") no-repeat center top;
+ }
+
+ .list-custom .cross-item
+ {
+ background: url("/img/cross.png") no-repeat center top;
+ }
+ </style>
+</head>
+
+# {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads}}
+
+<div class="text-danger" markdown="1">
+## {{alert-heading What happened?}}
+
+{{alert-content <fix>Adblock Plus</fix> has detected ads that are likely injected with Adware, which may have infected your computer.}}
+{: .alert-danger }
+</div>
+
+## {{what-is-adware-heading What is Adware?}}
+
+{{what-is-adware-content Adware is one type of Malware, short for "Malicious Software.” 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.}}
+
+## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads?}}
+
+{{why-not-blocked-content <fix>Adblock Plus</fix> is designed to block ads that are delivered from websites or their advertising partners. Malicious software can inject ads in such a way that the ads can not reliably be blocked by <fix>Adblock Plus</fix>. The best way to stop these ads is to remove the Malware that displays them.}}
+
+## {{how-to-solve-heading How can I solve this?}}
+
+### <span class="badge-success">1</span> {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .separate-section .badge-header }
+
+{{remove-unwanted-programs-content For users unfamiliar with the administration 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 remove 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 antivirus solution.}}
+
+<div class="narrow-list-block" markdown="1">
+
+#### Windows
+
+<ul class="list-unstyled" markdown="1">
+* <a href="{{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-trial/adblock/en/?c=adblock&s=en&k=trial}}">Malwarebytes</a>
+* <a href="{{hitmanpro-win-affiliate-link http://www.surfright.nl/en/hitmanpro}}">HitmanPro</a>
saroyanm 2016/06/27 17:12:29 As mentioned here "https://codereview.adblockplus.
juliandoucette 2016/06/30 19:05:50 Done.
+* <a href="{{adcleaner-win-affiliate-link https://toolslib.net/downloads/viewdownload/1-adwcleaner/}}">AdwCleaner</a>
+</ul>
+
+</div>
+<div class="narrow-list-block" markdown="1">
+
+#### OS X
+
+<ul class="list-unstyled" markdown="1">
+* <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antimalware/mac/}}">Malwarebytes</a>
+</ul>
+
+</div>
+
+{{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 installing. 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.}}
+
+<ul class="list-unstyled" markdown="1">
+* [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)
+* [OS X](https://support.apple.com/en-us/HT203987)
+</ul>
+
+### <span class="badge-success">2</span> {{reset-browser-settings-heading Reset your browser settings}} { .badge-header }
+
+{{reset-browser-settings-content Oftentimes uninstalling unwanted software does not restore your browser settings to their original state. Follow these guides to do this manually:}}
+
+<ul class="list-unstyled" markdown="1">
+* [Internet Explorer](https://support.microsoft.com/en-us/kb/923737)
+* [Mozilla Firefox](https://support.mozilla.org/kb/reset-firefox-easily-fix-most-problems)
+* [Google Chrome](https://support.google.com/chrome/answer/3296214)
+* [Opera](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-defaults/)
+* [Yandex.Browser](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset)
+* [Safari 6 & 7](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-browser-to-its-default-settings-on-Macintosh)
+* [Safari 8 & 9](https://discussions.apple.com/message/26874735)
+</ul>
+
+## {{prevent-infection-heading How do I prevent my computer from getting infected with Malware in the future?}} { .separate-section .badge-header }
+
+<ul class="list-custom" markdown="1">
+* <span class="check-item"></span> **{{use-official-channels-heading Use official channels to download your browser:}}**
+ * [Mozilla Firefox](http://www.mozilla.org/firefox)
+ * [Google Chrome](https://www.google.com/chrome/browser/desktop/)
+ * [Opera](http://www.opera.com/)
+ * [Yandex.Browser](https://browser.yandex.com/)
+* <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/).
+* <span class="check-item"></span> **{{update-os-heading Keep your operating system and other software up-to-date.}}**
+* <span class="cross-item"></span> **{{avoid-popups-heading Don't click inside misleading pop-up windows.}}**{ .text-danger } {{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 animation of the website scanning your computer.}}
+* <span class="cross-item"></span> **{{dont-install-untrusted-heading Don't install untrusted software.}}**{: .text-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 software packages. Usually, these programs gather information on your browsing behavior that serve only the people who designed them. Make sure you only install add-ons, extensions and plug-ins from your browser’s web store website and that you uncheck unwanted programs in software installation wizards.}}
+</ul>
« 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