pages/adware.md - Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org

Side by Side Diff: pages/adware.md

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)

Patch Set: Fixed CSS NITs Created July 1, 2016, 6:03 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
(Empty)
	1 title=About adware

	2 description=What is adware and how to get rid of it

	3 noheading=true

	4

	5 <head>

	6 <style>

	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 .text-danger
	saroyanm 2016/07/04 17:38:05 Detail: What about having a container name as "war Detail: What about having a container name as "warning", so you will not need to assing separate styles to the items, something like: .warning { color: #e11a2c; } .warning p { padding: 15px; border: 2px solid; border-color: #e11a2c; background-color: #fff; } juliandoucette 2016/07/04 18:07:15 The original intention was to create these classes Show quoted text On 2016/07/04 17:38:05, saroyanm wrote: > Detail: What about having a container name as "warning", so you will not need to > assing separate styles to the items, something like: > .warning > { > color: #e11a2c; > } > .warning p > { > padding: 15px; > border: 2px solid; > border-color: #e11a2c; > background-color: #fff; > } The original intention was to create these classes in a general way such that they could integrate into main.css. Thus, a class for _just making red text_ made sense. If we want to take the opposite approach then your suggestion is valid. I will implement it. saroyanm 2016/07/04 18:36:14 In future if we will use it more often yes we will Show quoted text On 2016/07/04 18:07:15, juliandoucette wrote: > On 2016/07/04 17:38:05, saroyanm wrote: > > Detail: What about having a container name as "warning", so you will not need > to > > assing separate styles to the items, something like: > > .warning > > { > > color: #e11a2c; > > } > > .warning p > > { > > padding: 15px; > > border: 2px solid; > > border-color: #e11a2c; > > background-color: #fff; > > } > > The original intention was to create these classes in a general way such that > they could integrate into main.css. Thus, a class for _just making red text_ > made sense. > > If we want to take the opposite approach then your suggestion is valid. I will > implement it. In future if we will use it more often yes we will need to make it more generic, currently I'm not sure if this will be used anywhere else, but yes in case we will start to use it often will use current approach or modify it. Anyway we can make it more generic while not creating two separate classes that will apply to the related to each other "Parent" and "child".
	33 {

	34 color: #e11a2c;

	35 }

	36

	37 .alert-danger

	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 span

	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-size: 20px;

	65 }

	66

	67 #content ul

	68 {

	69 margin-top: 10px;

	70 margin-bottom: 10px;

	71 padding: 0px;

	72 }

	73

	74 #content ul,

	75 #content li

	76 {

	77 margin-left: 0px;

	78 margin-right: 0px;

	79 padding-left: 0px;

	80 padding-right: 0px;

	81 }

	82

	83 #content li

	84 {

	85 padding-bottom: 10px;

	86 line-height: 20px;

	87 list-style-type: none;

	88 }

	89

	90 #content .icon-list

	91 {

	92 position: relative;

	93 margin: 0px;

	94 padding: 20px 0px 0px 40px;

	95 overflow: visible;

	96 list-style-type: none;

	97 }

	98

	99 [dir="rtl"] #content .icon-list

	100 {

	101 padding: 20px 40px 0px 0px;

	102 }

	103

	104 #content .icon-list > li

	105 {

	106 padding-bottom: 25px;

	107 }

	108

	109 .icon-list > li > span

	110 {

	111 position: absolute;

	112 left: 0;
	saroyanm 2016/07/04 17:38:05 Detail: CSS number values should specify units whe Detail: CSS number values should specify units where possible, same goes to the one below juliandoucette 2016/07/04 18:07:15 Done. Show quoted text On 2016/07/04 17:38:05, saroyanm wrote: > Detail: CSS number values should specify units where possible, same goes to the > one below Done.
	113 right: auto;

	114 height: 20px;

	115 width: 40px;

	116 }

	117

	118 [dir="rtl"] .icon-list > li > span

	119 {

	120 right: 0;

	121 left: auto;

	122 }

	123

	124 .check-item

	125 {

	126 background: url("/img/check.png") no-repeat center top;

	127 }

	128

	129 .cross-item

	130 {

	131 background: url("/img/cross.png") no-repeat center top;

	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="text-danger" markdown="1">

	139 ## {{alert-heading What happened?}}

	140

	141 {{alert-content <fix>Adblock Plus</fix> has detected ads that are likely injecte d with Adware, which may have infected your computer.}}

	142 {: .alert-danger }

	143 </div>

	144

	145 ## {{what-is-adware-heading What is Adware?}}

	146

	147 {{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.}}

	148

	149 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}}

	150

	151 {{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.}}

	152

	153 ## {{how-to-solve-heading How can I solve this?}}

	154

	155 ### <span>1</span> {{remove-unwanted-programs-heading Get rid of unwanted progra ms}} { .separate-section .icon-header }

	156

	157 {{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.}}

	158

	159 <div class="narrow-list-block" markdown="1">

	160

	161 #### Windows

	162

	163 <ul markdown="1">

	164 * <a href="{{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-tri al/adblock/en/?c=adblock&s=en&k=trial}}">Malwarebytes</a>

	165 * <a href="http://www.surfright.nl/hitmanpro">HitmanPro</a>
	saroyanm 2016/07/04 17:38:05 Detail: Please use the markdown where its possible Detail: Please use the markdown where its possible: * [HitmanPro](http://www.surfright.nl/hitmanpro/) * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/) juliandoucette 2016/07/04 18:07:14 Done. Show quoted text On 2016/07/04 17:38:05, saroyanm wrote: > Detail: > Please use the markdown where its possible: > * [HitmanPro](http://www.surfright.nl/hitmanpro/) > * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/) Done.
	166 * <a href="https://toolslib.net/downloads/viewdownload/1-adwcleaner/">AdwCleaner </a>

	167 </ul>

	168

	169 </div>

	170 <div class="narrow-list-block" markdown="1">

	171

	172 #### OS X

	173

	174 <ul markdown="1">

	175 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">Malwarebytes</a>

	176 </ul>

	177

	178 </div>

	179

	180 {{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.}}

	181

	182 <ul markdown="1">

	183 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)

	184 * [OS X](https://support.apple.com/en-us/HT203987)

	185 </ul>

	186

	187 ### <span>2</span> {{reset-browser-settings-heading Reset your browser settings} } { .icon-header }

	188

	189 {{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:}}

	190

	191 <ul markdown="1">

	192 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737)

	193 * [Mozilla Firefox](https://support.mozilla.org/kb/reset-firefox-easily-fix-most -problems)

	194 * [Google Chrome](https://support.google.com/chrome/answer/3296214)

	195 * [Opera](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-d efaults/)

	196 * [Yandex.Browser](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset )

	197 * [Safari 6 & 7](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-b rowser-to-its-default-settings-on-Macintosh)

	198 * [Safari 8 & 9](https://discussions.apple.com/message/26874735)

	199 </ul>

	200

	201 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header }

	202

	203 <ul class="icon-list" markdown="1">

	204 * <span class="check-item"></span> {{use-official-channels-heading Use officia l channels to download your browser:}}
	saroyanm 2016/07/04 17:38:06 What about having a class on list item, so you can What about having a class on list item, so you can replace HTML implementation ex.: * {{use-official-channels-heading Use official channels to download your browser:}} {.icon.check} .icon::before { content: ""; position: absolute; left: 0; right: auto; height: 20px; width: 40px; } .check::before { background: url("/img/check.png") no-repeat center top; } .cross::before { background: url("/img/cross.png") no-repeat center top; } juliandoucette 2016/07/04 18:07:15 Good catch. I'll do you one better. Since each li Show quoted text On 2016/07/04 17:38:06, saroyanm wrote: > What about having a class on list item, so you can replace HTML implementation > ex.: > * {{use-official-channels-heading Use official channels to download your > browser:}} > {.icon.check} > > .icon::before > { > content: ""; > position: absolute; > left: 0; > right: auto; > height: 20px; > width: 40px; > } > > .check::before > { > background: url("/img/check.png") no-repeat center top; > } > > .cross::before > { > background: url("/img/cross.png") no-repeat center top; > } Good catch. I'll do you one better. Since each list item in an .icon-list contains an .icon, we don't need the .icon class anymore. .icon-list > li makes more sense. saroyanm 2016/07/04 18:36:14 I thought it's more readable, when you have as a c Show quoted text On 2016/07/04 18:07:15, juliandoucette wrote: > On 2016/07/04 17:38:06, saroyanm wrote: > > What about having a class on list item, so you can replace HTML implementation > > ex.: > > * {{use-official-channels-heading Use official channels to download your > > browser:}} > > {.icon.check} > > > > .icon::before > > { > > content: ""; > > position: absolute; > > left: 0; > > right: auto; > > height: 20px; > > width: 40px; > > } > > > > .check::before > > { > > background: url("/img/check.png") no-repeat center top; > > } > > > > .cross::before > > { > > background: url("/img/cross.png") no-repeat center top; > > } > > Good catch. > > I'll do you one better. Since each list item in an .icon-list contains an .icon, > we don't need the .icon class anymore. .icon-list > li makes more sense. I thought it's more readable, when you have as a class "icon" and "check" or "cross", which make it more intentional for user writing Markdown to use, but this implementation still looks fine for me, my initial intention was to get rid of the HTML tags.
	205 * [Mozilla Firefox](http://www.mozilla.org/firefox)

	206 * [Google Chrome](https://www.google.com/chrome/browser/desktop/)

	207 * [Opera](http://www.opera.com/)

	208 * [Yandex.Browser](https://browser.yandex.com/)

	209 * <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 /).

	210 * <span class="check-item"></span> {{update-os-heading Keep your operating sys tem and other software up-to-date.}}

	211 * <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.}}

	212 * <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.}}

	213 </ul>

OLD	NEW

« no previous file with comments | « no previous file | static/img/check.png » ('j') | no next file with comments »