JGonera has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95694
Change subject: Hygiene: Merge @contentMarginLeft/Right into @contentMargin
......................................................................
Hygiene: Merge @contentMarginLeft/Right into @contentMargin
Change-Id: I46e67bf9fc0a83692ca957a359d336c99db7c774
---
M less/common/drawer.less
M less/common/enwp.less
M less/common/footer.less
M less/common/pageactions.less
M less/common/pagelist.less
M less/common/typography.less
M less/common/ui.less
M less/desktop/mobileBridge.less
M less/modules/tutorials.less
M less/modules/uploads.less
M less/specials/uploads.less
M less/variables.less
12 files changed, 16 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/94/95694/1
diff --git a/less/common/drawer.less b/less/common/drawer.less
index 2f006e6..5003579 100644
--- a/less/common/drawer.less
+++ b/less/common/drawer.less
@@ -2,7 +2,7 @@
.drawer {
text-align: center;
- padding: 0 @contentMarginRight 1em;
+ padding: 0 @contentMargin 1em;
&.text {
line-height: 1;
@@ -31,7 +31,7 @@
}
a.button {
- margin: 1em @contentMarginLeft;
+ margin: 1em @contentMargin;
}
a.signup {
diff --git a/less/common/enwp.less b/less/common/enwp.less
index d38fa49..3e11695 100644
--- a/less/common/enwp.less
+++ b/less/common/enwp.less
@@ -158,7 +158,7 @@
// FIXME [Templates]: Inline styles force us to use
!important
width: auto !important;
float: right !important;
- margin-left: @contentMarginRight !important;
+ margin-left: @contentMargin !important;
clear: right !important;
}
}
diff --git a/less/common/footer.less b/less/common/footer.less
index efbe05b..db78699 100644
--- a/less/common/footer.less
+++ b/less/common/footer.less
@@ -5,7 +5,7 @@
@import "../variables.less";
#footer {
- padding: 2em @contentMarginRight 1.5em @contentMarginLeft;
+ padding: 2em @contentMargin 1.5em @contentMargin;
margin: 2em 0 0;
border-top: 1px solid #aaa;
font-size: 0.9em;
diff --git a/less/common/pageactions.less b/less/common/pageactions.less
index c8ad9dd..f91c93d 100644
--- a/less/common/pageactions.less
+++ b/less/common/pageactions.less
@@ -11,14 +11,14 @@
}
#section_0 {
- padding: 12px @contentMarginRight 7px @contentMarginLeft;
+ padding: 12px @contentMargin 7px;
border-bottom: dotted 1px #CACACA;
}
#page-actions {
@verticalMargin: 8px;
- padding: @verticalMargin @contentMarginRight @verticalMargin
@contentMarginLeft - 8;
+ padding: @verticalMargin @contentMargin @verticalMargin @contentMargin
- 8;
// end hacks
border-bottom: solid 1px #CACACA;
diff --git a/less/common/pagelist.less b/less/common/pagelist.less
index 71051a2..1df8b50 100644
--- a/less/common/pagelist.less
+++ b/less/common/pagelist.less
@@ -31,7 +31,7 @@
color: #666;
position: relative;
border-bottom: solid 1px #eee;
- padding: 18px @contentMarginRight;
+ padding: 18px @contentMargin;
// avoid the gap between thumbnails
margin: 0 0 -1px;
line-height: 1;
diff --git a/less/common/typography.less b/less/common/typography.less
index faea6e5..f91ceb9 100644
--- a/less/common/typography.less
+++ b/less/common/typography.less
@@ -27,7 +27,7 @@
}
.content {
- margin: .8em @contentMarginRight 0 @contentMarginLeft;
+ margin: .8em @contentMargin 0;
h1, h2, h3, h4, h5, h6 {
line-height: @headingLineHeight;
diff --git a/less/common/ui.less b/less/common/ui.less
index 23e2bff..ba4aefc 100644
--- a/less/common/ui.less
+++ b/less/common/ui.less
@@ -10,7 +10,7 @@
// Used for messages on login screen, page lists and uploads and when showing
old revisions
.alert {
- padding: 1em @contentMarginLeft;
+ padding: 1em @contentMargin;
margin: 0 0 1em;
&.warning {
@@ -156,7 +156,7 @@
.beta {
.top-bar {
background-color: #F3F3F3;
- padding: 8px @contentMarginLeft;
+ padding: 8px @contentMargin;
display: block;
color: #666;
a {
diff --git a/less/desktop/mobileBridge.less b/less/desktop/mobileBridge.less
index c3aff42..7b7ce85 100644
--- a/less/desktop/mobileBridge.less
+++ b/less/desktop/mobileBridge.less
@@ -48,7 +48,7 @@
}
.content {
- margin: .8em @contentMarginRight 0
@contentMarginLeft;
+ margin: .8em @contentMargin 0;
}
}
}
diff --git a/less/modules/tutorials.less b/less/modules/tutorials.less
index 1eb46a6..2129296 100644
--- a/less/modules/tutorials.less
+++ b/less/modules/tutorials.less
@@ -2,7 +2,7 @@
/* Tutorial overlay styling */
.tutorial {
- padding: 1em @contentMarginLeft;
+ padding: 1em @contentMargin;
line-height: 1.4;
font-size: .9em;
background: @colorTutorial;
diff --git a/less/modules/uploads.less b/less/modules/uploads.less
index 2a7c552..677231a 100644
--- a/less/modules/uploads.less
+++ b/less/modules/uploads.less
@@ -59,7 +59,7 @@
li {
clear: both;
min-height: @checkboxSize;
- padding: 0 0 1em @checkboxSize + @contentMarginLeft;
+ padding: 0 0 1em @checkboxSize + @contentMargin;
line-height: 1.25;
}
@@ -71,7 +71,7 @@
float: left;
width: @checkboxSize;
height: @checkboxSize;
- margin: 0 0 0 -(@checkboxSize + @contentMarginLeft);
+ margin: 0 0 0 -(@checkboxSize + @contentMargin);
font-size: @checkboxSize * .8;
font-weight: bold;
line-height: @checkboxSize;
diff --git a/less/specials/uploads.less b/less/specials/uploads.less
index f6ff83a..3a7f922 100644
--- a/less/specials/uploads.less
+++ b/less/specials/uploads.less
@@ -1,7 +1,7 @@
@import "../mixins.less";
ul.mobileUserGallery {
- margin: 20px @contentMarginRight 0 @contentMarginLeft;
+ margin: 20px @contentMargin 0;
li {
text-align: center;
diff --git a/less/variables.less b/less/variables.less
index 5490eba..0f4ad32 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -16,9 +16,7 @@
// page actions
@watchStarSize: 22px;
-// FIXME: rename to contentMargin and remove one of those, they're always the
same
-@contentMarginRight: 16px;
-@contentMarginLeft: @contentMarginRight;
+@contentMargin: 16px;
// colors
@blueBase : #3366BB;
--
To view, visit https://gerrit.wikimedia.org/r/95694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46e67bf9fc0a83692ca957a359d336c99db7c774
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
