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: Changed a couple class names to be more descriptive and reduced nested list padding Created June 23, 2016, 4:56 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

	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 .badge-header

	46 {

	47 vertical-align: middle;

	48 line-height: 34px;

	49 }

	50

	51 .badge-success
	saroyanm 2016/06/27 17:12:31 I think you can use ".badge-header span" selector I think you can use ".badge-header span" selector here and remove the ".badge-success" from element while .badge-success is always related to the ".badge-header". juliandoucette 2016/06/30 19:05:49 Done. Show quoted text On 2016/06/27 17:12:31, saroyanm wrote: > I think you can use ".badge-header span" selector here and remove the > ".badge-success" from element while .badge-success is always related to the > ".badge-header". Done.
	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 .list-custom,
	saroyanm 2016/06/27 17:12:30 Seems like this applies to all "UL" elements on th Seems like this applies to all "UL" elements on the page, so you can use "ul" as a selector here: ul { margin-top: 10px; margin-bottom: 10px; padding: 0px; } juliandoucette 2016/06/30 19:05:49 Done. Show quoted text On 2016/06/27 17:12:30, saroyanm wrote: > Seems like this applies to all "UL" elements on the page, so you can use "ul" as > a selector here: > ul > { > margin-top: 10px; > margin-bottom: 10px; > padding: 0px; > } Done.
	68 .list-unstyled,

	69 .list-custom ul

	70 {

	71 margin-top: 10px;

	72 margin-bottom: 10px;

	73 padding: 0px;

	74 }

	75

	76 .list-custom ul
	saroyanm 2016/06/27 17:12:31 .list-custom, doesn't say anything about the style .list-custom, doesn't say anything about the style, so I'll subbest to change the name to "badged" for example, so that will describe that it's holding the "check" and "cross" "icons". juliandoucette 2016/06/30 19:05:49 Done. Show quoted text On 2016/06/27 17:12:31, saroyanm wrote: > .list-custom, doesn't say anything about the style, so I'll subbest to change > the name to "badged" for example, so that will describe that it's holding the > "check" and "cross" "icons". Done.
	77 {

	78 margin-bottom: 0px;

	79 }

	80

	81 .list-unstyled,

	82 .list-unstyled li,

	83 .list-custom ul,

	84 .list-custom ul li
	saroyanm 2016/06/27 17:12:29 I think while we have specific style ".list-unstyl I think while we have specific style ".list-unstyled" it's better to apply the style to the ".list-custom ul" element I think while it's just one element. juliandoucette 2016/06/30 19:05:50 This style is used in several other places outside Show quoted text On 2016/06/27 17:12:29, saroyanm wrote: > I think while we have specific style ".list-unstyled" it's better to apply the > style to the ".list-custom ul" element I think while it's just one element. This style is used in several other places outside of .list-custom juliandoucette 2016/06/30 19:05:54 Since these two styles cover all of the ul element Show quoted text On 2016/06/27 17:12:29, saroyanm wrote: > I think while we have specific style ".list-unstyled" it's better to apply the > style to the ".list-custom ul" element I think while it's just one element. Since these two styles cover all of the ul elements on this page, we can change it to #content ul, #content li
	85 {

	86 margin-left: 0px;

	87 margin-right: 0px;

	88 padding-left: 0px;

	89 padding-right: 0px;

	90 }

	91

	92 .list-unstyled li,
	saroyanm 2016/06/27 17:12:30 This selectors can be merged with the one below, a This selectors can be merged with the one below, also looks like this applies to all "li"s: ul li { list-style-type: none; padding-bottom: 10px; line-height: 20px; } Also this can be moved below "ul" rule to make styles more readable. juliandoucette 2016/06/30 19:05:50 Done. Show quoted text On 2016/06/27 17:12:30, saroyanm wrote: > This selectors can be merged with the one below, also looks like this applies to > all "li"s: > ul li > { > list-style-type: none; > padding-bottom: 10px; > line-height: 20px; > } > > Also this can be moved below "ul" rule to make styles more readable. Done.
	93 .list-custom li

	94 {

	95 list-style-type: none;

	96 }

	97

	98 .list-unstyled li,

	99 .list-custom li

	100 {

	101 padding-bottom: 10px;

	102 line-height: 20px;

	103 }

	104

	105 .list-custom

	106 {

	107 position: relative;

	108 margin: 0px;

	109 padding: 20px 0px 0px 0px;

	110 overflow: visible;

	111 list-style-type: none;

	112 }

	113

	114 [dir="ltr"] .list-custom
	saroyanm 2016/06/27 17:12:30 No need to mention "ltr" direction specifically, t No need to mention "ltr" direction specifically, this style will apply by default regardless of the direction. Same goes to user "ltr" specific styles. juliandoucette 2016/06/30 19:05:50 Done. Show quoted text On 2016/06/27 17:12:30, saroyanm wrote: > No need to mention "ltr" direction specifically, this style will apply by > default regardless of the direction. > Same goes to user "ltr" specific styles. Done.
	115 {

	116 padding-left: 40px;

	117 }

	118

	119 [dir="rtl"] .list-custom

	120 {

	121 padding-right: 40px;

	122 }

	123

	124 .list-custom > li

	125 {

	126 padding-bottom: 25px;

	127 }

	128

	129 .list-custom .check-item,
	saroyanm 2016/06/27 17:12:30 All .check-item and .cross-item are inside of the All .check-item and .cross-item are inside of the ".list-custom" elements, so I think we do not need specifically mention them and also you should be able to get rid of the one selectors below: .check-item, .cross-item { position: absolute; left: 0px; (we do not need to specify right direction while it's default value is auto) height: 20px; width: 40px; } [dir="rtl"] .check-item, [dir="rtl"] .cross-item { right: 0px; } .check-item { background: url("/img/check.png") no-repeat center top; } .cross-item { background: url("/img/cross.png") no-repeat center top; } Alternatively you can .icon.cross and .icon.check, so you can have one selector (.icon) for the styles above, which will be more generic for this page. juliandoucette 2016/06/30 19:05:54 Good idea. I'll do you 1 better though. We can us Show quoted text On 2016/06/27 17:12:30, saroyanm wrote: > All .check-item and .cross-item are inside of the ".list-custom" elements, so I > think we do not need specifically mention them and also you should be able to > get rid of the one selectors below: > .check-item, > .cross-item > { > position: absolute; > left: 0px; (we do not need to specify right direction while it's default value > is auto) > height: 20px; > width: 40px; > } > > [dir="rtl"] .check-item, > [dir="rtl"] .cross-item > { > right: 0px; > } > > .check-item > { > background: url("/img/check.png") no-repeat center top; > } > > .cross-item > { > background: url("/img/cross.png") no-repeat center top; > } > > Alternatively you can .icon.cross and .icon.check, so you can have one selector > (.icon) for the styles above, which will be more generic for this page. Good idea. I'll do you 1 better though. We can use .icon-list > li > span.
	130 .list-custom .cross-item

	131 {

	132 position: absolute;

	133 left: auto;

	134 right: auto;

	135 height: 20px;

	136 width: 40px;

	137 }

	138

	139 [dir="ltr"] .list-custom .check-item,

	140 [dir="ltr"] .list-custom .cross-item

	141 {

	142 left: 0;

	143 }

	144

	145 [dir="rtl"] .list-custom .check-item,

	146 [dir="rtl"] .list-custom .cross-item

	147 {

	148 right: 0;

	149 }

	150

	151 .list-custom .check-item

	152 {

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

	154 }

	155

	156 .list-custom .cross-item

	157 {

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

	159 }

	160 </style>

	161 </head>

	162

	163 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }}

	164

	165 <div class="text-danger" markdown="1">

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

	167

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

	169 {: .alert-danger }

	170 </div>

	171

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

	173

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

	175

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

	177

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

	179

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

	181

	182 ### <span class="badge-success">1</span> {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .separate-section .badge-header }

	183

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

	185

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

	187

	188 #### Windows

	189

	190 <ul class="list-unstyled" markdown="1">

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

	192 * <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. As mentioned here "https://codereview.adblockplus.org/29340844/diff/29345778/pages/adware.md#newcode187", we need to only translate the malwarebytes links. Same goes to other non malwarebyte links. juliandoucette 2016/06/30 19:05:50 Done. Show quoted text On 2016/06/27 17:12:29, saroyanm wrote: > As mentioned here > "https://codereview.adblockplus.org/29340844/diff/29345778/pages/adware.md#newcode187", > we need to only translate the malwarebytes links. Same goes to other non > malwarebyte links. Done.
	193 * <a href="{{adcleaner-win-affiliate-link https://toolslib.net/downloads/viewdow nload/1-adwcleaner/}}">AdwCleaner</a>

	194 </ul>

	195

	196 </div>

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

	198

	199 #### OS X

	200

	201 <ul class="list-unstyled" markdown="1">

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

	203 </ul>

	204

	205 </div>

	206

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

	208

	209 <ul class="list-unstyled" markdown="1">

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

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

	212 </ul>

	213

	214 ### <span class="badge-success">2</span> {{reset-browser-settings-heading Reset your browser settings}} { .badge-header }

	215

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

	217

	218 <ul class="list-unstyled" markdown="1">

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

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

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

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

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

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

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

	226 </ul>

	227

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

	229

	230 <ul class="list-custom" markdown="1">

	231 * <span class="check-item"></span> {{use-official-channels-heading Use officia l channels to download your browser:}}

	232 * [Mozilla Firefox](http://www.mozilla.org/firefox)

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

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

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

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

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

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

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

	240 </ul>

OLD	NEW

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