Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203646
Change subject: Improvements to Metrolook
......................................................................
Improvements to Metrolook
Change-Id: I36f2037c45d4b017aa320328fc63fcd4acbad16d
---
M README.md
M components/mobile.less
M components/navigation.less
M composer.json
M skin.json
5 files changed, 83 insertions(+), 160 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/46/203646/1
diff --git a/README.md b/README.md
index 1f1f6ed..4a2bb69 100644
--- a/README.md
+++ b/README.md
@@ -184,11 +184,6 @@
}
-ul {
- list-style-type: disc;
- .list-style-image-svg('images/bullet-circle-icon.svg',
'images/bullet-circle-icon.png');
-}
-
@media (max-width: 768px) {
#hamburgerIcon:hover {
background-color: blue;
@@ -207,7 +202,14 @@
}
}
-/* Top Bar colour and hover colour */
+/* To change bullet icon to a circle */
+
+ul {
+ list-style-type: disc;
+ .list-style-image-svg('images/bullet-circle-icon.svg',
'images/bullet-circle-icon.png');
+}
+
+/* Top Bar colour and hover colour end */
```
## Known Issues
@@ -218,7 +220,7 @@
Note plans may change.
-Mobile desgn for MediaWiki 1.22 and 1.23.
+Mobile desgn for MediaWiki 1.23.
## Version
diff --git a/components/mobile.less b/components/mobile.less
index cd063a8..5cbea35 100644
--- a/components/mobile.less
+++ b/components/mobile.less
@@ -9,17 +9,17 @@
}
div#mw-panel {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- -webkit-overflow-scrolling: touch;
- padding-top: 1em;
- width: 9.5em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-top: 1em;
+ width: 9.5em;
+ left: 0;
div.portal {
margin: 0 0.6em 0 0.7em;
@@ -82,18 +82,18 @@
}
div#mw-panel-custom {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- -webkit-overflow-scrolling: touch;
- padding-right: 1em;
- padding-top: 1em;
- width: 11em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-right: 1em;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
div.portal-custom {
margin: 0 0.6em 0 0.7em;
@@ -112,7 +112,7 @@
padding-top: 0;
padding-left: 17px;
padding-bottom: 0;
- margin-bottom:0;
+ margin-bottom: 0;
cursor: default;
border: none;
}
@@ -310,17 +310,17 @@
}
div#mw-panel {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- -webkit-overflow-scrolling: touch;
- padding-top: 1em;
- width: 9.5em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-top: 1em;
+ width: 10em;
+ left: 0;
div.portal {
margin: 0 0.6em 0 0.7em;
@@ -383,18 +383,18 @@
}
div#mw-panel-custom {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- -webkit-overflow-scrolling: touch;
- padding-right: 1em;
- padding-top: 1em;
- width: 11em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-right: 1em;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
div.portal-custom {
margin: 0 0.6em 0 0.7em;
@@ -413,7 +413,7 @@
padding-top: 0;
padding-left: 17px;
padding-bottom: 0;
- margin-bottom:0;
+ margin-bottom: 0;
cursor: default;
border: none;
}
@@ -603,7 +603,7 @@
img.hamburger {
.background-image-svg('images/hamburger.svg', 'images/hamburger.png');
width: 26px; /* width of your image */
- height: 35px; /*height of your image */
+ height: 35px; /* height of your image */
margin: 0; /* If you want no margin */
padding: 0; /* if your want to padding */
background-repeat: no-repeat;
diff --git a/components/navigation.less b/components/navigation.less
index 987839c..e2cf43d 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -73,17 +73,17 @@
/* Panel */
div#mw-panel {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0px;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- -webkit-overflow-scrolling: touch;
- padding-top: 1em;
- width: 11em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0px;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
div.portal {
margin: 0 0.6em 0 0.7em;
@@ -143,100 +143,23 @@
margin-left: 0.5em;
}
}
-}
-
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) {
-/* Panel */
-div#mw-panel {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- -webkit-overflow-scrolling: touch;
- padding-top: 1em;
- width: 9.5em;
- left: 0;
-
- div.portal {
- margin: 0 0.6em 0 0.7em;
- padding: 0.25em 0;
- direction: ltr;
- background-position: top left;
- background-repeat: no-repeat;
- .background-image('images/portal-break.png');
-
- h5 {
- font-family: 'Segoe UI Light', Segoe UI, sans-serif;
- font-weight: 100;
- font-size: 1em;
- color: #444444;
- margin: 0;
- padding: @menu-main-heading-padding;
- cursor: default;
- border: none;
- }
-
- div.body {
- margin: @menu-main-body-margin;
- padding-top: 0;
-
- ul {
- list-style-type: none;
- list-style-image: none;
- margin: 0;
- padding: @menu-main-body-padding;
-
- li {
- line-height: 1.125em;
- margin: 0;
- padding: 0.25em 0;
- font-size: @menu-main-body-font-size;
- word-wrap: break-word;
-
- a {
- color:
@menu-main-body-link-color;
- &:visited {
- color:
@menu-main-body-link-visited-color;
- }
- }
- }
- }
- }
- }
-
- /* First sidebar portlet. Not using :first-of-type for IE<=8 support. */
- #p-logo + div.portal {
- background-image: none;
- margin-top: 0;
- h5 {
- display: none;
- }
- div.body {
- margin-left: 0.5em;
- }
- }
-}
}
/* custom */
-
/* Panel */
div#mw-panel-custom {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- -webkit-overflow-scrolling: touch;
- padding-right: 1em;
- padding-top: 1em;
- width: 11em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-right: 1em;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
div.portal-custom {
margin: 0 0.6em 0 0.7em;
@@ -255,7 +178,7 @@
padding-top: 0;
padding-left: 17px;
padding-bottom: 0;
- margin-bottom:0;
+ margin-bottom: 0;
cursor: default;
border: none;
}
diff --git a/composer.json b/composer.json
index 31bba0e..e8e5d78 100644
--- a/composer.json
+++ b/composer.json
@@ -30,8 +30,7 @@
"irc" : "irc://irc.freenode.org/mediawiki"
},
"require" : {
- "php" : ">=5.3.3",
- "composer/installers": ">1.0.12"
+ "php" : ">=5.3.3"
},
"autoload" : {
"files": [
diff --git a/skin.json b/skin.json
index 50fcd75..eb6c292 100644
--- a/skin.json
+++ b/skin.json
@@ -30,7 +30,6 @@
"SkinMetrolook": "SkinMetrolook.php",
"MetrolookTemplate": "MetrolookTemplate.php"
},
-
"ResourceModules": {
"skins.metrolook.styles": {
"styles": {
--
To view, visit https://gerrit.wikimedia.org/r/203646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36f2037c45d4b017aa320328fc63fcd4acbad16d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
