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

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

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 11 matching lines...) Expand all Loading...
22 [dir="rtl"] .narrow-list-block	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-block 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
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 {	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-custom,	68 #content ul
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 {	69 {

71 margin-top: 10px;	70 margin-top: 10px;

72 margin-bottom: 10px;	71 margin-bottom: 10px;

73 padding: 0px;	72 padding: 0px;

74 }	73 position: relative;

75	74 }

76 .list-custom ul	75
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 {	76 #content ul,

78 margin-bottom: 0px;	77 #content li

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 {	78 {

86 margin-left: 0px;	79 margin-left: 0px;

87 margin-right: 0px;	80 margin-right: 0px;

88 padding-left: 0px;	81 padding-left: 0px;

89 padding-right: 0px;	82 padding-right: 0px;

90 }	83 }

91	84

92 .list-unstyled li,	85 #content 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 {	86 {

101 padding-bottom: 10px;	87 padding-bottom: 10px;

102 line-height: 20px;	88 line-height: 20px;

103 }	89 list-style-type: none;

104	90 }

105 .list-custom	91

106 {	92 #content li.icon

107 position: relative;	93 {

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

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

110 overflow: visible;	95 overflow: visible;

111 list-style-type: none;	96 }

112 }	97

113	98 [dir="rtl"] #content li.icon

114 [dir="ltr"] .list-custom	99 {
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 {	100 padding: 20px 40px 0px 0px;

116 padding-left: 40px;	101 }

117 }	102

118	103 li.icon::before

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

120 {	105 content: " ";

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;	106 position: absolute;

133 left: auto;	107 left: 0px;

134 right: auto;	108 right: auto;

135 height: 20px;	109 height: 20px;

136 width: 40px;	110 width: 40px;

137 }	111 }

138	112

139 [dir="ltr"] .list-custom .check-item,	113 [dir="rtl"] li.icon::before

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

141 {	115 right: 0px;

142 left: 0;	116 left: auto;

143 }	117 }

144	118

145 [dir="rtl"] .list-custom .check-item,	119 li.icon.check::before

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

147 {

148 right: 0;

149 }

150

151 .list-custom .check-item

152 {	120 {

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

154 }	122 }

155	123

156 .list-custom .cross-item	124 li.icon.cross::before

157 {	125 {

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

	127 }

	128

	129 li.icon.cross strong

	130 {

	131 color: #e11a2c;

159 }	132 }

160 </style>	133 </style>

161 </head>	134 </head>

162	135

163 # {{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 }}

164	137

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

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

167	140

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

169 {: .alert-danger }

170 </div>	142 </div>

171	143

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

173	145

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

175	147

176 ## {{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 ?}}

177	149

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

179	151

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

181	153

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

183	155

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

185	157

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

187	159

188 #### Windows	160 #### Windows

189	161

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>	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 @Julian: before pushing the changes can you please be sure that the Malwarebyte links are not translatable, while they implemented redirection according to the user Browser setup, please implement this in same fashion that other similar links, same goes to the one below. In case this are only changes that needs to be done, otherwise please update the patch. juliandoucette 2016/07/07 20:26:54 Will do. Show quoted text On 2016/07/07 13:02:26, saroyanm wrote: > @Julian: before pushing the changes can you please be sure that the Malwarebyte > links are not translatable, while they implemented redirection according to the > user Browser setup, please implement this in same fashion that other similar > links, same goes to the one below. In case this are only changes that needs to > be done, otherwise please update the patch. Will do.
192 * <a href="{{hitmanpro-win-affiliate-link http://www.surfright.nl/en/hitmanpro}} ">HitmanPro</a>	163 * [HitmanPro](http://www.surfright.nl/hitmanpro)
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>	164 * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/)

194 </ul>

195	165

196 </div>	166 </div>

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

198	168

199 #### OS X	169 #### OS X

200	170

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

202 * <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>

203 </ul>

204	172

205 </div>	173 </div>

206	174

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

208	176

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

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

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

212 </ul>	179

213	180 ### 2 {{reset-browser-settings-heading Reset your browser settings}} { .icon-h eader }

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

215	181

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

217	183

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

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

220 * [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)

221 * [Google Chrome](https://support.google.com/chrome/answer/3296214)	186 * [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/)	187 * [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 )	188 * [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)	189 * [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)	190 * [Safari 8 & 9](https://discussions.apple.com/message/26874735)

226 </ul>	191

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

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

229	194 * {{use-official-channels-heading Use official channels to download your brows er:}}

230 <ul class="list-custom" markdown="1">	195 { .icon .check }

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)	196 * [Mozilla Firefox](http://www.mozilla.org/firefox)

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

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

235 * [Yandex.Browser](https://browser.yandex.com/)	199 * [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 /).	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/).

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

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.}}	202 * {{update-os-heading Keep your operating system and other software up-to-date .}}

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.}}	203 { .icon .check }

240 </ul>	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.}}

	205 { .icon .cross }

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

	207 { .icon .cross }

LEFT	RIGHT