Isarra has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/255942

Change subject: Changes maybe what
......................................................................

Changes maybe what

Change-Id: I72565634f0b260f935c1aad9a89cf49fa96bcb5a
---
M Example.skin.php
M resources/print.css
M resources/screen-common.less
M resources/screen-desktop.less
M resources/screen-mobile.less
M resources/variables.less
6 files changed, 36 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Example 
refs/changes/42/255942/1

diff --git a/Example.skin.php b/Example.skin.php
index 8c3b165..e8b6b27 100644
--- a/Example.skin.php
+++ b/Example.skin.php
@@ -13,8 +13,7 @@
         *
         * @param $out OutputPage
         */
-       function setupSkinUserCss( OutputPage $out ) {
-               parent::setupSkinUserCss( $out );
+       public function initPage( OutputPage $out ) {
 
                $out->addMeta( 'viewport', 'width=device-width, 
initial-scale=1.0' );
 
@@ -23,6 +22,15 @@
                        'mediawiki.skinning.content.externallinks',
                        'skins.example'
                ) );
-               $out->addModules( array( 'skins.example.js' ) );
+               $out->addModules( array(
+                       'skins.example.js'
+               ) );
+       }
+
+       /**
+        * @param $out OutputPage
+        */
+       function setupSkinUserCss( OutputPage $out ) {
+               parent::setupSkinUserCss( $out );
        }
 }
diff --git a/resources/print.css b/resources/print.css
index 2e0f439..7b23cc3 100644
--- a/resources/print.css
+++ b/resources/print.css
@@ -1,13 +1,9 @@
 /* Styles for print view and printing */
 
+/* Hide some extra stuff from print view (some of the navigation is already 
hidden automatically, but not all) */
+.mw-indicators,
 #p-logo,
 #catlinks,
-#footer-icons {
+#mw-footer {
        display: none;
-}
-
-#mw-footer ul {
-       list-style: none;
-       margin: 0;
-       padding: 0;
 }
diff --git a/resources/screen-common.less b/resources/screen-common.less
index 08d1ac1..de2d12a 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -1,11 +1,11 @@
-/**
- * Basic styling for the Example skin.
- */
+/* Common styling for the Example skin */
 
 @import "variables.less";
 
-/* Page layout */
+// Page layout
+
 #mw-wrapper {
+       max-width: @width;
        margin: 0 auto;
        position: relative;
        padding: 1em;
@@ -15,10 +15,8 @@
        width: 10em;
        float: right;
 
-       /*
-        * Make logo image show up
-        * (the class sets the background image from $wgLogo, but we still need 
to give it a size to show up)
-       */
+       // Make logo image visible
+       // The class sets the background image from $wgLogo, but we still need 
to give it a size in order to show up
        a.mw-wiki-logo {
                display: block;
                content: '';
@@ -30,9 +28,10 @@
 }
 .mw-body {
        position: relative;
+       word-wrap: break-word;
 }
 
-/* Some content stuff */
+// Some content stuff
 .firstHeading {
        margin-top: 0;
 }
@@ -41,7 +40,7 @@
        margin: 1.5em 0 0 1em;
 }
 
-/* Splatter the menus and tools at the bottom */
+// Splatter the menus and tools at the bottom
 #mw-footer,
 #page-tools,
 #p-personal {
@@ -63,7 +62,7 @@
        margin: 1em 0;
 }
 
-/* Footer */
+// Footer
 #mw-footer {
        clear: both;
        border-top: 1px solid @border;
@@ -77,7 +76,7 @@
        margin: 0 0 1em 1em;
 }
 
-/* hidden stuff */
+// hidden stuff
 #page-tools h3,
 #p-search h3,
 #p-personal h3 {
diff --git a/resources/screen-desktop.less b/resources/screen-desktop.less
index b78092b..c677d3b 100644
--- a/resources/screen-desktop.less
+++ b/resources/screen-desktop.less
@@ -2,12 +2,6 @@
 
 @import "variables.less";
 
-/* Contain the width on huge displays */
-#mw-wrapper {
-       max-width: @width;
-}
-
-/* Splatter the site navigation at the bottom because why not */
 #site-navigation {
        ul {
                list-style-type: none;
diff --git a/resources/screen-mobile.less b/resources/screen-mobile.less
index 4804cbc..1a04179 100644
--- a/resources/screen-mobile.less
+++ b/resources/screen-mobile.less
@@ -1,11 +1,12 @@
 /* Styles appear on displays 750 pixels wide and below */
 
-/* @import "variables.less"; */ // Not used here
+// @import "variables.less"; (Not used here)
 
-/* Make the logo smaller because we're dealing with less space here */
 #p-logo {
        width: 6em;
 
+       // Make the logo smaller because we're dealing with less space here
+       // Note that background-size doesn't necessarily work in older 
browsers, but whatever
        a.mw-wiki-logo {
                margin: 0 0 1em 1em;
                width: 5em;
@@ -17,7 +18,7 @@
        display: none;
 }
 
-/* Full-width thumbnails (to avoid really squished text around them) */
+// Full-width thumbnails (to avoid having really squished text around them)
 div.thumb {
        float: none;
 }
@@ -47,8 +48,12 @@
        margin: 0 auto .5em;
 }
 
-/* Keep images from overflowing */
+// Keep images from overflowing
 .mw-body-content a > img {
        height: auto !important;
        max-width: 100% !important;
 }
+
+.nomobile {
+       display: none;
+}
diff --git a/resources/variables.less b/resources/variables.less
index bb33602..caa158d 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -1,9 +1,9 @@
-/* @import "mediawiki.mixins"; */ // Not used yet
+// @import "mediawiki.mixins"; Not used yet
 
 @width: 66em;
 @border: #ccc;
 
-/* To hide objects, but keep them accessible for screen-readers */
+// To hide objects, but keep them accessible for screen-readers
 .hidden() {
        position: absolute;
        top: -9999px;

-- 
To view, visit https://gerrit.wikimedia.org/r/255942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72565634f0b260f935c1aad9a89cf49fa96bcb5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Example
Gerrit-Branch: master
Gerrit-Owner: Isarra <zhoris...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to