Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92000
Change subject: Hygiene: Kill navigation.js
......................................................................
Hygiene: Kill navigation.js
Change-Id: I37c54023b0829cf97ea989cdc03ac0d6db6cdb71
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
M less/common/common-js.less
A less/common/headers.less
D less/common/navigation.less
M less/common/ui.less
A less/desktop/images/geo.png
A less/desktop/mobileBridge.less
8 files changed, 93 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/00/92000/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 11fbeb4..2b410d7 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -112,8 +112,6 @@
'less/common/typography.less',
'less/common/footer.less',
'less/modules/toggle.less',
- // FIXME: move to module mobile.stable.styles for some
reason it breaks RTL when in that module
- 'less/common/navigation.less',
'less/common/hacks.less',
'less/common/pageactions.less',
),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 7471c5b..6b7a6d3 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -412,7 +412,6 @@
$modules['mobile'] = array(
'mobile.head',
- 'mobile.startup',
'mobile.site',
// FIXME: separate mobile.stable into more meaningful
groupings
'mobile.stable',
diff --git a/less/common/common-js.less b/less/common/common-js.less
index 32de6ac..0c93d6c 100644
--- a/less/common/common-js.less
+++ b/less/common/common-js.less
@@ -1,5 +1,10 @@
@import "../mixins.less";
+.error {
+ color: #C85353;
+ background: #FAE1E1 !important;
+}
+
.loading {
img,
a {
diff --git a/less/common/headers.less b/less/common/headers.less
new file mode 100644
index 0000000..2547ef1
--- /dev/null
+++ b/less/common/headers.less
@@ -0,0 +1,17 @@
+@import "mediawiki.mixins";
+
+.header {
+ // .header needs position: relative, it's not always at the top of the
page
+ // (Zero banners, campaigns)
+ position: relative;
+ .vertical-gradient( @searchBoxColor, @searchBoxColorTo );
+ border-bottom: 1px solid #e2e2e2;
+ line-height: (@headerHeight - 2px);
+ text-align: center;
+ min-height: (@headerHeight - 2px);
+ padding: 2px 10px 0 @searchBarPaddingLeft;
+
+ h1, h2 {
+ font-size: @baseFontSize * 1.6;
+ }
+}
diff --git a/less/common/navigation.less b/less/common/navigation.less
deleted file mode 100644
index e0ba1c9..0000000
--- a/less/common/navigation.less
+++ /dev/null
@@ -1,41 +0,0 @@
-// FIXME: what is the purpose of this file?
-// those rules should probably go somewhere else
-@import "../mixins.less";
-
-// FIXME: this is here only because non-JS version doesn't load watchstar.less
-.watch-this-article {
- background: url(../common/images/watch.png) 50% 50% no-repeat;
- text-indent: -9999px;
-
- &.watched {
- background-image: url(../common/images/watched.png);
- }
-}
-
-.search.error,
-.error {
- color: #C85353;
- background: #FAE1E1;
-}
-
-.alert {
- padding: 1em @contentMarginLeft;
- margin: 0 0 1em;
-
- &.warning {
- color: #850;
- background: #feb
- }
-
- h2 {
- font: bold 100% @fontFamily;
- padding: 0;
- margin: 0 0 .5em 0;
- }
-}
-
-html,
-body {
- background: #fff;
- height: 100%;
-}
diff --git a/less/common/ui.less b/less/common/ui.less
index 29ea672..1fab43b 100644
--- a/less/common/ui.less
+++ b/less/common/ui.less
@@ -2,6 +2,30 @@
@import "buttons.less";
@import 'mainmenu.less';
+// Used for messages on login screen, page lists and uploads and when showing
old revisions
+.alert {
+ padding: 1em @contentMarginLeft;
+ margin: 0 0 1em;
+
+ &.warning {
+ color: #850;
+ background: #feb
+ }
+
+ h2 {
+ font: bold 100% @fontFamily;
+ padding: 0;
+ margin: 0 0 .5em 0;
+ }
+}
+
+// FIXME: Not clear on purpose of these rules
+html,
+body {
+ background: #fff;
+ height: 100%;
+}
+
.header {
// .header needs position: relative, it's not always at the top of the
page
// (Zero banners, campaigns)
@@ -118,6 +142,16 @@
display: none;
}
+// FIXME: this is here only because non-JS version doesn't load watchstar.less
+.watch-this-article {
+ background: url(../common/images/watch.png) 50% 50% no-repeat;
+ text-indent: -9999px;
+
+ &.watched {
+ background-image: url(../common/images/watched.png);
+ }
+}
+
// FIXME: Move to beta/alpha only place?
.alpha,
.beta {
diff --git a/less/desktop/images/geo.png b/less/desktop/images/geo.png
new file mode 100644
index 0000000..4620bf7
--- /dev/null
+++ b/less/desktop/images/geo.png
Binary files differ
diff --git a/less/desktop/mobileBridge.less b/less/desktop/mobileBridge.less
new file mode 100644
index 0000000..d244aa1
--- /dev/null
+++ b/less/desktop/mobileBridge.less
@@ -0,0 +1,37 @@
+@import '../common/headers.less';
+@import '../common/buttons.less';
+@import "../common/common-js.less";
+
+
+.overlay-enabled {
+ .skin-vector {
+ background-color: white;
+
+ #mw-navigation,
+ #content,
+ #mw-head-base {
+ display: none;
+ }
+ }
+}
+
+.skin-vector {
+ .mw-mf-overlay {
+
+ .page-list {
+ margin: 0;
+ line-height: inherit;
+ }
+
+ .content {
+ margin: .8em @contentMarginRight 0 @contentMarginLeft;
+ }
+ }
+
+ #page-secondary-actions {
+ .button.nearby {
+ background-image: url(images/geo.png);
+ .secondaryPageActionButton();
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/92000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37c54023b0829cf97ea989cdc03ac0d6db6cdb71
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
