Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79431
Change subject: Hygiene: Use our own custom reset file
......................................................................
Hygiene: Use our own custom reset file
Address some reset related FIXMES
Change-Id: Ia83d09eca3dab87a9b960bb11f74178b142a6682
---
M includes/Resources.php
M less/common/mf-buttons.less
M less/common/mf-common.less
A less/common/reset.less
M less/specials/uploads.less
M stylesheets/common/mf-common.css
A stylesheets/common/reset.css
M stylesheets/common/ui.css
D stylesheets/externals/reset.css
M stylesheets/specials/uploads.css
10 files changed, 151 insertions(+), 83 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/31/79431/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 0f404a2..083d860 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -104,7 +104,7 @@
'mobile.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
- 'stylesheets/externals/reset.css',
+ 'stylesheets/common/reset.css',
'stylesheets/common/mf-common.css',
'stylesheets/common/ui.css',
'stylesheets/common/mf-typography.css',
diff --git a/less/common/mf-buttons.less b/less/common/mf-buttons.less
index 5182143..372a7f6 100644
--- a/less/common/mf-buttons.less
+++ b/less/common/mf-buttons.less
@@ -1,12 +1,6 @@
@import "../mf-mixins.less";
/* reuses https://github.com/wikimedia/agora */
-// FIXME: Add to custom reset.css file
-button {
- border: none;
- background-color: transparent;
-}
-
.button,
button,
input[type=submit] {
diff --git a/less/common/mf-common.less b/less/common/mf-common.less
index 573f2b1..f45848e 100644
--- a/less/common/mf-common.less
+++ b/less/common/mf-common.less
@@ -9,12 +9,6 @@
display: inline-block;
}
-/* FIXME: make our own customized rest CSS and move it there */
-input, textarea, button {
- font-size: 100%;
- font-family: inherit;
-}
-
input {
word-break: normal;
}
@@ -255,12 +249,13 @@
}
}
-ul {
- list-style: square inside;
-}
-
-ol {
- list-style: decimal inside;
+.content_block {
+ ul {
+ list-style: square inside;
+ }
+ ol {
+ list-style: decimal inside;
+ }
}
em,
diff --git a/less/common/reset.less b/less/common/reset.less
new file mode 100644
index 0000000..d8be03e
--- /dev/null
+++ b/less/common/reset.less
@@ -0,0 +1,45 @@
+/* Fork of http://meyerweb.com/eric/tools/css/reset/
+ v2.0 | 20110126
+ License: none (public domain)
+*/
+
+html, body, div, span,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, ins, em, img,
+small, strike, strong, sub, sup, tt,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+input, textarea, button,
+table, caption, tbody, tfoot, thead, tr, th, td,
+time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+button {
+ border: none;
+ background-color: transparent;
+}
+body {
+ line-height: 1;
+}
+ol, ul {
+ list-style: none;
+}
+blockquote, q {
+ quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: '';
+ content: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
diff --git a/less/specials/uploads.less b/less/specials/uploads.less
index 5ec6831..27432dd 100644
--- a/less/specials/uploads.less
+++ b/less/specials/uploads.less
@@ -121,8 +121,6 @@
}
ul.mobileUserGallery {
- // FIXME: this shouldn't be needed with reset.css
- list-style: none;
margin: 20px @contentMarginRight 0 @contentMarginLeft;
li {
diff --git a/stylesheets/common/mf-common.css b/stylesheets/common/mf-common.css
index 0af8f2d..c4138d1 100644
--- a/stylesheets/common/mf-common.css
+++ b/stylesheets/common/mf-common.css
@@ -13,13 +13,6 @@
padding: 10px;
display: inline-block;
}
-/* FIXME: make our own customized rest CSS and move it there */
-input,
-textarea,
-button {
- font-size: 100%;
- font-family: inherit;
-}
input {
word-break: normal;
}
@@ -219,10 +212,10 @@
display: inline-block;
margin-right: 8px;
}
-ul {
+.content_block ul {
list-style: square inside;
}
-ol {
+.content_block ol {
list-style: decimal inside;
}
em,
diff --git a/stylesheets/common/reset.css b/stylesheets/common/reset.css
new file mode 100644
index 0000000..94376df
--- /dev/null
+++ b/stylesheets/common/reset.css
@@ -0,0 +1,96 @@
+/* Fork of http://meyerweb.com/eric/tools/css/reset/
+ v2.0 | 20110126
+ License: none (public domain)
+*/
+html,
+body,
+div,
+span,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+ins,
+em,
+img,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+input,
+textarea,
+button,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+time,
+mark,
+audio,
+video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+button {
+ border: none;
+ background-color: transparent;
+}
+body {
+ line-height: 1;
+}
+ol,
+ul {
+ list-style: none;
+}
+blockquote,
+q {
+ quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+ content: '';
+ content: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
diff --git a/stylesheets/common/ui.css b/stylesheets/common/ui.css
index 9f174b1..eb913f6 100644
--- a/stylesheets/common/ui.css
+++ b/stylesheets/common/ui.css
@@ -6,10 +6,6 @@
* See README.mediawiki for details on installing.
*/
/* reuses https://github.com/wikimedia/agora */
-button {
- border: none;
- background-color: transparent;
-}
.button,
button,
input[type=submit] {
diff --git a/stylesheets/externals/reset.css b/stylesheets/externals/reset.css
deleted file mode 100644
index e29c0f5..0000000
--- a/stylesheets/externals/reset.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
- v2.0 | 20110126
- License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- font: inherit;
- vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
- display: block;
-}
-body {
- line-height: 1;
-}
-ol, ul {
- list-style: none;
-}
-blockquote, q {
- quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
- content: '';
- content: none;
-}
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
diff --git a/stylesheets/specials/uploads.css b/stylesheets/specials/uploads.css
index 7574e00..c0b3b3e 100644
--- a/stylesheets/specials/uploads.css
+++ b/stylesheets/specials/uploads.css
@@ -115,7 +115,6 @@
transform: translate3d(100%, 0, 0);
}
ul.mobileUserGallery {
- list-style: none;
margin: 20px 16px 0 16px;
}
ul.mobileUserGallery li {
--
To view, visit https://gerrit.wikimedia.org/r/79431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia83d09eca3dab87a9b960bb11f74178b142a6682
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
