From 037e7e0cb54850f77963c8304628e87a49d7babb Mon Sep 17 00:00:00 2001
From: MatmaRex <matma.rex@gmail.com>
Date: Sat, 17 Nov 2012 18:54:51 +0100
Subject: [PATCH] (bug 26617) clean up usages of list-style in Vector&Monobook
 CSS

* remove list-style-*: none from non-list elements
* remove duplicate declarations
* always use list-style-type:none; list-style-image:none; instead of
  list-style:none to work around an IE bug
* set list-style-type to square for Monobook and to disc for Vector
  to resemble the icons used

Change-Id: I0d10acc9f07f1bf4239c70b476baea9a0ae40391
---
 skins/monobook/main.css | 14 +++++++-------
 skins/vector/screen.css | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 5866d97d04..f6b212c2d6 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -71,6 +71,7 @@ a.new,
 }
 
 ul {
+	list-style-type: square;
 	/* @embed */
 	list-style-image: url(bullet.gif);
 }
@@ -268,9 +269,6 @@ table.rimage {
 }
 .portlet ul {
 	line-height: 1.5em;
-	list-style-type: square;
-	/* @embed */
-	list-style-image: url(bullet.gif);
 	font-size: 95%;
 }
 .portlet li {
@@ -372,7 +370,8 @@ input.searchButton {
 	padding: 0 2em 0 3em;
 	margin: 0;
 	text-align: right;
-	list-style: none;
+	list-style-type: none;
+	list-style-image: none;
 	z-index: 0;
 	background: none;
 	cursor: default;
@@ -432,11 +431,11 @@ li#pt-login {
 	background: none;
 	border-collapse: collapse;
 	padding-left: 1em;
-	list-style: none;
 	font-size: 95%;
 }
 #p-cactions ul {
-	list-style: none;
+	list-style-type: none;
+	list-style-image: none;
 }
 #p-cactions li {
 	display: inline;
@@ -824,7 +823,8 @@ div#searchTarget {
 }
 
 div#searchTarget ul li {
-	list-style: none;
+	list-style-type: none;
+	list-style-image: none;
 }
 
 div#searchTarget ul li:before {
diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index de5c247ae3..787c4dfc18 100644
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -81,7 +81,8 @@ div.emptyPortlet {
 	display: none;
 }
 #p-personal ul {
-	list-style: none;
+	list-style-type: none;
+	list-style-image: none;
 	margin: 0;
 	padding-left: 10em; /* Keep from overlapping logo */
 }
@@ -131,7 +132,8 @@ div.vectorTabs ul {
 }
 div.vectorTabs ul {
 	height: 100%;
-	list-style: none;
+	list-style-type: none;
+	list-style-image: none;
 	margin: 0;
 	padding: 0;
 }
@@ -304,9 +306,8 @@ div.vectorMenu ul {
 	background-color: white;
 	border: solid 1px silver;
 	border-top-width: 0;
-	list-style: none;
-	list-style-image: none;
 	list-style-type: none;
+	list-style-image: none;
 	padding: 0;
 	margin: 0;
 	margin-left: -1px;
@@ -485,9 +486,8 @@ div#mw-panel div.portal div.body {
 	background-position: top left;
 }
 div#mw-panel div.portal div.body ul {
-	list-style: none;
-	list-style-image: none;
 	list-style-type: none;
+	list-style-image: none;
 	padding: 0;
 	margin: 0;
 }
@@ -517,9 +517,8 @@ div#footer {
 	direction: ltr;
 }
 div#footer ul {
-	list-style: none;
-	list-style-image: none;
 	list-style-type: none;
+	list-style-image: none;
 	margin: 0;
 	padding: 0;
 }
@@ -687,6 +686,7 @@ div#content {
 }
 
 ul {
+	list-style-type: disc;
 	/* @embed */
 	list-style-image: url(images/bullet-icon.png);
 }
-- 
2.20.1