jenkins-bot has submitted this change and it was merged.
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/buttons.less
M less/common/common.less
A less/common/reset.less
M less/modules/uploads.less
M less/specials/uploads.less
M less/specials/userlogin.less
M stylesheets/common/common.css
A stylesheets/common/reset.css
M stylesheets/common/ui.css
D stylesheets/externals/reset.css
M stylesheets/modules/uploads.css
M stylesheets/specials/uploads.css
M stylesheets/specials/userlogin.css
14 files changed, 142 insertions(+), 92 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 6b6ff17..3b9a110 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -110,7 +110,7 @@
'mobile.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
- 'stylesheets/externals/reset.css',
+ 'stylesheets/common/reset.css',
'stylesheets/common/common.css',
'stylesheets/common/ui.css',
'stylesheets/common/typography.css',
diff --git a/less/common/buttons.less b/less/common/buttons.less
index f08f6b5..74eaf36 100644
--- a/less/common/buttons.less
+++ b/less/common/buttons.less
@@ -1,12 +1,6 @@
@import "../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/common.less b/less/common/common.less
index 7912d68..f6a6763 100644
--- a/less/common/common.less
+++ b/less/common/common.less
@@ -9,13 +9,6 @@
display: inline-block;
}
-// FIXME: Separate form css from common.css into its own file?
-/* FIXME: make our own customized rest CSS and move it there */
-input, textarea, button {
- font-size: 100%;
- font-family: inherit;
-}
-
input {
word-break: normal;
}
@@ -267,12 +260,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..a8b1215
--- /dev/null
+++ b/less/common/reset.less
@@ -0,0 +1,41 @@
+/* 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,
+audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ font-family: inherit;
+ vertical-align: baseline;
+}
+button {
+ border: none;
+ background-color: transparent;
+}
+body {
+ line-height: 1;
+}
+input {
+ line-height: normal;
+}
+ol, ul {
+ list-style: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
diff --git a/less/modules/uploads.less b/less/modules/uploads.less
index cfdb88f..331345d 100644
--- a/less/modules/uploads.less
+++ b/less/modules/uploads.less
@@ -95,11 +95,6 @@
}
}
- // FIXME: this should not be necessary
- ul {
- list-style: none;
- }
-
li {
clear: both;
min-height: @checkboxSize;
diff --git a/less/specials/uploads.less b/less/specials/uploads.less
index 1fdd0cd..db7b6cd 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/less/specials/userlogin.less b/less/specials/userlogin.less
index 9fc920f..47e18ea 100644
--- a/less/specials/userlogin.less
+++ b/less/specials/userlogin.less
@@ -41,10 +41,12 @@
input {
width: 100%;
+ display: block;
}
div.wpInputs,
div.wpCaptcha {
+ padding: 1px;
border: solid 1px #E1E1E1;
border-radius: 5px;
diff --git a/stylesheets/common/common.css b/stylesheets/common/common.css
index 7a8afd7..435bbca 100644
--- a/stylesheets/common/common.css
+++ b/stylesheets/common/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;
}
@@ -228,10 +221,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..6b7c4c6
--- /dev/null
+++ b/stylesheets/common/reset.css
@@ -0,0 +1,87 @@
+/* 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,
+audio,
+video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ font-family: inherit;
+ vertical-align: baseline;
+}
+button {
+ border: none;
+ background-color: transparent;
+}
+body {
+ line-height: 1;
+}
+input {
+ line-height: normal;
+}
+ol,
+ul {
+ list-style: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
diff --git a/stylesheets/common/ui.css b/stylesheets/common/ui.css
index 052899a..c2e6a66 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/modules/uploads.css b/stylesheets/modules/uploads.css
index e20f2df..eaba7c0 100644
--- a/stylesheets/modules/uploads.css
+++ b/stylesheets/modules/uploads.css
@@ -101,9 +101,6 @@
-webkit-background-size: 32px auto;
background-size: 32px auto;
}
-.photo-nag ul {
- list-style: none;
-}
.photo-nag li {
clear: both;
min-height: 50px;
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 {
diff --git a/stylesheets/specials/userlogin.css
b/stylesheets/specials/userlogin.css
index b1cd9db..ef2a283 100644
--- a/stylesheets/specials/userlogin.css
+++ b/stylesheets/specials/userlogin.css
@@ -39,9 +39,11 @@
}
form.user-login input {
width: 100%;
+ display: block;
}
form.user-login div.wpInputs,
form.user-login div.wpCaptcha {
+ padding: 1px;
border: solid 1px #E1E1E1;
border-radius: 5px;
}
--
To view, visit https://gerrit.wikimedia.org/r/79431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia83d09eca3dab87a9b960bb11f74178b142a6682
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
