Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/106843
Change subject: [WIP] Hygiene: Change how we manage importing LESS files ...................................................................... [WIP] Hygiene: Change how we manage importing LESS files Drop less suffix Ensure all less files import variables and mixins separately Use a global LESS import directory Change-Id: I48f5a57700bfee43626d168e6623289723075233 --- M Makefile M MobileFrontend.php M less/common/OverlayNew.less M less/common/buttons.less M less/common/common-js.less M less/common/common.less M less/common/drawer.less M less/common/footer.less M less/common/mainmenu.less M less/common/mainmenuAnimation.less M less/common/mainpage.less M less/common/overlays.less M less/common/pageactions.less M less/common/pagelist.less M less/common/secondaryPageActions.less M less/common/toast.less M less/common/typography.less M less/common/ui.less M less/common/uiNew.less M less/desktop/mobileBridge.less R less/minerva.less/minerva.mixins.less R less/minerva.less/minerva.variables.less M less/modules/NotificationsOverlay.less M less/modules/editor.less M less/modules/editorNew.less M less/modules/issues.less M less/modules/languages.less M less/modules/mediaViewer.less M less/modules/references.less M less/modules/search.less M less/modules/searchNew/SearchOverlay.less M less/modules/talk.less M less/modules/toggle.less M less/modules/tutorials.less M less/modules/uploads.less M less/modules/uploads/PhotoUploaderButton.less M less/modules/uploads/UploadTutorial.less M less/modules/uploadsNew/PhotoUploadOverlay.less M less/modules/watchstar.less M less/specials/common.less M less/specials/mobilediff.less M less/specials/mobileoptions.less M less/specials/nearby.less M less/specials/notifications.less M less/specials/search.less M less/specials/uploads.less M less/specials/userlogin.less M less/specials/userprofile.less M less/specials/watchlist.less M less/tablet/common.less M less/tablet/hacks.less 51 files changed, 142 insertions(+), 50 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/43/106843/1 diff --git a/Makefile b/Makefile index a929da0..f709dcc 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,10 @@ kss: nodecheck # FIXME: Use more up to date Ruby version - @node_modules/.bin/kss-node less/ less/ -l less/mobile.less -t styleguide-template + ln -s less/minerva.less/minerva.mixins.less less/minerva.mixins.less && \ + ln -s less/minerva.less/minerva.variables.less less/minerva.variables.less + @node_modules/.bin/kss-node less/ less/ -l less/mobile.less -t styleguide-template && \ + rm less/minerva.variables.less && rm less/minerva.mixins.less jsdoc: nodecheck rm -rf docs diff --git a/MobileFrontend.php b/MobileFrontend.php index 701b21c..a0ae599 100644 --- a/MobileFrontend.php +++ b/MobileFrontend.php @@ -149,6 +149,7 @@ function efMobileFrontend_Setup() { global $wgMFNearby, $wgSpecialPages, $wgSpecialPageGroups, $wgResourceLoaderLESSVars, + $wgResourceLoaderLESSImportPaths, $wgMFDeviceWidthTablet, $wgMFDeviceWidthMobileSmall; if ( $wgMFNearby ) { @@ -156,6 +157,10 @@ $wgSpecialPageGroups['Nearby'] = 'pages'; } // Set LESS global variables + $localBasePath = dirname( __DIR__ ); + $wgResourceLoaderLESSImportPaths = array_merge( $wgResourceLoaderLESSImportPaths, array( + "$localBasePath/MobileFrontend/less/minerva.less/", + ) ); $wgResourceLoaderLESSVars = array_merge( $wgResourceLoaderLESSVars, array( // FIXME: this var is evil and necessary only for KSS docs, diff --git a/less/common/OverlayNew.less b/less/common/OverlayNew.less index efe3e35..d1f7e55 100644 --- a/less/common/OverlayNew.less +++ b/less/common/OverlayNew.less @@ -1,5 +1,7 @@ // FIXME: merge with overlays.less when OverlayNew gets to stable -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .overlay-enabled { #mw-mf-page-center { diff --git a/less/common/buttons.less b/less/common/buttons.less index 1ad0969..e6310ef 100644 --- a/less/common/buttons.less +++ b/less/common/buttons.less @@ -1,4 +1,5 @@ -@import "../mixins.less"; +// Component of ui.less +// FIXME: Move to components/ // Buttons // diff --git a/less/common/common-js.less b/less/common/common-js.less index 0ad34cd..0791b65 100644 --- a/less/common/common-js.less +++ b/less/common/common-js.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + // Asynchronous loading diff --git a/less/common/common.less b/less/common/common.less index 80eb240..6824ae9 100644 --- a/less/common/common.less +++ b/less/common/common.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables.less"; +@import "minerva.mixins.less"; + .mw-mf-overlay, #content_wrapper { diff --git a/less/common/drawer.less b/less/common/drawer.less index 024c543..ee616b6 100644 --- a/less/common/drawer.less +++ b/less/common/drawer.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + // Drawers // diff --git a/less/common/footer.less b/less/common/footer.less index ea6777d..d616432 100644 --- a/less/common/footer.less +++ b/less/common/footer.less @@ -1,8 +1,10 @@ +@import "minerva.variables"; +@import "minerva.mixins"; + /* FOOTER initially moved from beta_common.css in Change-Id: I48bcdc43e72f2a9b60e6d1bfe877d79ad80b6d5d */ -@import "../variables.less"; #footer { padding: 2em @contentMargin 1.5em @contentMargin; diff --git a/less/common/mainmenu.less b/less/common/mainmenu.less index 0d7a7cd..87543c8 100644 --- a/less/common/mainmenu.less +++ b/less/common/mainmenu.less @@ -1,4 +1,5 @@ -@import "../mixins.less"; +// Component of ui.less +// FIXME: Move to components/ /* Left menu */ @menuBorder: 12px; diff --git a/less/common/mainmenuAnimation.less b/less/common/mainmenuAnimation.less index 603aaee..fc28fd0 100644 --- a/less/common/mainmenuAnimation.less +++ b/less/common/mainmenuAnimation.less @@ -1,7 +1,9 @@ // FIXME: merge with mainmenu.less when this gets to stable // FIXME: doesn't work in Firefox due to https://bugzilla.mozilla.org/show_bug.cgi?id=625289 // do we want to work around it? -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + @duration: .1s; diff --git a/less/common/mainpage.less b/less/common/mainpage.less index 1335684..879dca5 100644 --- a/less/common/mainpage.less +++ b/less/common/mainpage.less @@ -1,4 +1,6 @@ -@import "../variables.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .page-Main_Page { #section_0 { diff --git a/less/common/overlays.less b/less/common/overlays.less index 2b4c467..eddfdd3 100644 --- a/less/common/overlays.less +++ b/less/common/overlays.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .overlay-enabled { #mw-mf-page-center { diff --git a/less/common/pageactions.less b/less/common/pageactions.less index e116958..e541eaa 100644 --- a/less/common/pageactions.less +++ b/less/common/pageactions.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + // FIXME: hide in stable till talk code is stable .stable #ca-talk, diff --git a/less/common/pagelist.less b/less/common/pagelist.less index a4eb9b0..70b0352 100644 --- a/less/common/pagelist.less +++ b/less/common/pagelist.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + @thumbGap: 15px; @thumbWidth: 70px; diff --git a/less/common/secondaryPageActions.less b/less/common/secondaryPageActions.less index 8c1f844..441b12c 100644 --- a/less/common/secondaryPageActions.less +++ b/less/common/secondaryPageActions.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .client-js { #page-secondary-actions { diff --git a/less/common/toast.less b/less/common/toast.less index eadb121..7d04129 100644 --- a/less/common/toast.less +++ b/less/common/toast.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + @toastNotificationColor: #373737; // Toast notifications diff --git a/less/common/typography.less b/less/common/typography.less index c9f191c..ca80112 100644 --- a/less/common/typography.less +++ b/less/common/typography.less @@ -1,4 +1,6 @@ -@import "../variables.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + // Typography // diff --git a/less/common/ui.less b/less/common/ui.less index 20709e3..7d64257 100644 --- a/less/common/ui.less +++ b/less/common/ui.less @@ -1,6 +1,8 @@ +@import "minerva.variables"; +@import "minerva.mixins"; @import "mediawiki.mixins"; -@import "buttons.less"; -@import 'mainmenu.less'; +@import "components/buttons"; +@import 'components/mainmenu'; html, body { diff --git a/less/common/uiNew.less b/less/common/uiNew.less index 222030a..c11c9a9 100644 --- a/less/common/uiNew.less +++ b/less/common/uiNew.less @@ -1,4 +1,6 @@ @import "mediawiki.mixins"; +@import "minerva.mixins"; +@import "minerva.variables"; @import "buttons.less"; @import 'mainmenu.less'; diff --git a/less/desktop/mobileBridge.less b/less/desktop/mobileBridge.less index bb7a97c..4ea885c 100644 --- a/less/desktop/mobileBridge.less +++ b/less/desktop/mobileBridge.less @@ -1,4 +1,4 @@ -@import '../mixins.less'; +@import 'minerva.mixins'; @import '../common/pagelist.less'; .overlay-enabled { diff --git a/less/mixins.less b/less/minerva.less/minerva.mixins.less similarity index 97% rename from less/mixins.less rename to less/minerva.less/minerva.mixins.less index 39fb187..e158022 100644 --- a/less/mixins.less +++ b/less/minerva.less/minerva.mixins.less @@ -1,5 +1,3 @@ -@import "variables.less"; - .watchlist-heading() { font: inherit; font-weight: bold; diff --git a/less/variables.less b/less/minerva.less/minerva.variables.less similarity index 100% rename from less/variables.less rename to less/minerva.less/minerva.variables.less diff --git a/less/modules/NotificationsOverlay.less b/less/modules/NotificationsOverlay.less index d231713..18b77fd 100644 --- a/less/modules/NotificationsOverlay.less +++ b/less/modules/NotificationsOverlay.less @@ -1,5 +1,7 @@ // FIXME: some of this could be removed if we reused .page-list styling -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .overlay, .mw-mf-overlay { diff --git a/less/modules/editor.less b/less/modules/editor.less index 5172db2..afcac62 100644 --- a/less/modules/editor.less +++ b/less/modules/editor.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .editor-overlay { textarea { diff --git a/less/modules/editorNew.less b/less/modules/editorNew.less index 4b5d49f..faf832d 100644 --- a/less/modules/editorNew.less +++ b/less/modules/editorNew.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .editor-overlay { .preview { diff --git a/less/modules/issues.less b/less/modules/issues.less index 4e1e578..f42e356 100644 --- a/less/modules/issues.less +++ b/less/modules/issues.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + @iconSize: 24px; .icon-24px { diff --git a/less/modules/languages.less b/less/modules/languages.less index d8f9481..ba09f04 100644 --- a/less/modules/languages.less +++ b/less/modules/languages.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + button.languageSelector { margin-top: @headingMargin; diff --git a/less/modules/mediaViewer.less b/less/modules/mediaViewer.less index 0886836..d219c51 100644 --- a/less/modules/mediaViewer.less +++ b/less/modules/mediaViewer.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .mw-mf-overlay.media-viewer { // http://stackoverflow.com/a/10910802/36523i8 diff --git a/less/modules/references.less b/less/modules/references.less index 62080fb..69a1666 100644 --- a/less/modules/references.less +++ b/less/modules/references.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .references { h3 { margin: 0; diff --git a/less/modules/search.less b/less/modules/search.less index e775bc4..1dc95cd 100644 --- a/less/modules/search.less +++ b/less/modules/search.less @@ -2,7 +2,9 @@ moved from beta_common.css in Change-Id: Id7715a83f8dc42cbdb23d8cbf982801606236f7c */ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + @clearSize: 32px; .mw-mf-overlay input.search { diff --git a/less/modules/searchNew/SearchOverlay.less b/less/modules/searchNew/SearchOverlay.less index ce828aa..b56f1cb 100644 --- a/less/modules/searchNew/SearchOverlay.less +++ b/less/modules/searchNew/SearchOverlay.less @@ -1,4 +1,5 @@ -@import "../../variables"; +@import "minerva.mixins"; +@import "minerva.variables"; .search-overlay { background: rgba(255, 255, 255, .8); diff --git a/less/modules/talk.less b/less/modules/talk.less index 3863154..9f449b9 100644 --- a/less/modules/talk.less +++ b/less/modules/talk.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .alpha #page-actions #ca-talk.count { a { diff --git a/less/modules/toggle.less b/less/modules/toggle.less index 5d58611..3764d97 100644 --- a/less/modules/toggle.less +++ b/less/modules/toggle.less @@ -4,7 +4,9 @@ FIXME: Rename section_heading to section-heading and content_block to section-content (Avoid caching problems) */ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .content_block { width: 100%; // bug 41401 - without this content doesn't always take up whole width diff --git a/less/modules/tutorials.less b/less/modules/tutorials.less index af8e892..940e645 100644 --- a/less/modules/tutorials.less +++ b/less/modules/tutorials.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + /* Tutorial overlay styling */ .tutorial, diff --git a/less/modules/uploads.less b/less/modules/uploads.less index 677231a..b42e0ec 100644 --- a/less/modules/uploads.less +++ b/less/modules/uploads.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .photo-overlay { @height: 90px; diff --git a/less/modules/uploads/PhotoUploaderButton.less b/less/modules/uploads/PhotoUploaderButton.less index a770f09..8cbb63a 100644 --- a/less/modules/uploads/PhotoUploaderButton.less +++ b/less/modules/uploads/PhotoUploaderButton.less @@ -1,4 +1,5 @@ -@import "../../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; // Restrict to content to avoid interference with rules in button.less .content .button.photo { diff --git a/less/modules/uploads/UploadTutorial.less b/less/modules/uploads/UploadTutorial.less index cb90d47..dfdb9f6 100644 --- a/less/modules/uploads/UploadTutorial.less +++ b/less/modules/uploads/UploadTutorial.less @@ -1,4 +1,5 @@ -@import "../../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; // FIXME: Make this global - file inputs are notoriously difficult to style // We already use it in several places diff --git a/less/modules/uploadsNew/PhotoUploadOverlay.less b/less/modules/uploadsNew/PhotoUploadOverlay.less index 8b69a8a..77cd030 100644 --- a/less/modules/uploadsNew/PhotoUploadOverlay.less +++ b/less/modules/uploadsNew/PhotoUploadOverlay.less @@ -1,4 +1,5 @@ -@import "../../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; .photo-overlay { @height: 90px; diff --git a/less/modules/watchstar.less b/less/modules/watchstar.less index 0259bf5..34e6335 100644 --- a/less/modules/watchstar.less +++ b/less/modules/watchstar.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + @watchThisArticleSize: 48px; diff --git a/less/specials/common.less b/less/specials/common.less index 86e2502..325d7b0 100644 --- a/less/specials/common.less +++ b/less/specials/common.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + // FIXME: Apply these styles to all special pages .mw-mf-special #content_wrapper { diff --git a/less/specials/mobilediff.less b/less/specials/mobilediff.less index 8e60dce..5334d65 100644 --- a/less/specials/mobilediff.less +++ b/less/specials/mobilediff.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + #mw-mf-diffview { @userInfoHeight: 5em; diff --git a/less/specials/mobileoptions.less b/less/specials/mobileoptions.less index 5bd64d8..b9d90c5 100644 --- a/less/specials/mobileoptions.less +++ b/less/specials/mobileoptions.less @@ -3,7 +3,9 @@ based on http://acidmartin.wordpress.com/2011/06/18/css3-iphone-toggle-buttons/ */ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + /* variables */ @btngrey:#818181; diff --git a/less/specials/nearby.less b/less/specials/nearby.less index 4dbdb14..d0274a9 100644 --- a/less/specials/nearby.less +++ b/less/specials/nearby.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .mw-mf-overlay .message { font-size: 1.2em; diff --git a/less/specials/notifications.less b/less/specials/notifications.less index 15aafc3..d412da0 100644 --- a/less/specials/notifications.less +++ b/less/specials/notifications.less @@ -1,4 +1,6 @@ -@import '../variables.less'; +@import "minerva.variables"; +@import "minerva.mixins"; + #mw-echo-more { diff --git a/less/specials/search.less b/less/specials/search.less index b8373ff..d3e810a 100644 --- a/less/specials/search.less +++ b/less/specials/search.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .mobile .searchresults { ul.mw-search-results { diff --git a/less/specials/uploads.less b/less/specials/uploads.less index 3a7f922..5bdf01a 100644 --- a/less/specials/uploads.less +++ b/less/specials/uploads.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + ul.mobileUserGallery { margin: 20px @contentMargin 0; diff --git a/less/specials/userlogin.less b/less/specials/userlogin.less index 0b57dbc..79808c3 100644 --- a/less/specials/userlogin.less +++ b/less/specials/userlogin.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + // This serves no purpose on the login screen as you are not logged in so cannot use. #user-button { diff --git a/less/specials/userprofile.less b/less/specials/userprofile.less index 3812ed0..5b29ae8 100644 --- a/less/specials/userprofile.less +++ b/less/specials/userprofile.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + // FIXME: Refactor our CSS for errors - 1 class for the text, 1 for the block .error { diff --git a/less/specials/watchlist.less b/less/specials/watchlist.less index 2bcd970..18f9b21 100644 --- a/less/specials/watchlist.less +++ b/less/specials/watchlist.less @@ -1,4 +1,6 @@ -@import "../mixins.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + .page-header-bar { diff --git a/less/tablet/common.less b/less/tablet/common.less index 3b5ba53..45edf2b 100644 --- a/less/tablet/common.less +++ b/less/tablet/common.less @@ -2,7 +2,9 @@ A file for css that optimises the Minerva skin on larger devices. */ -@import "../variables.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + @media all and (min-width: @wgMFDeviceWidthTablet) { .beta #content_wrapper { diff --git a/less/tablet/hacks.less b/less/tablet/hacks.less index 59a9179..d3e1e11 100644 --- a/less/tablet/hacks.less +++ b/less/tablet/hacks.less @@ -8,7 +8,9 @@ FIXME: Review all of these hacks to see if they still apply. */ -@import "../variables.less"; +@import "minerva.variables"; +@import "minerva.mixins"; + /* Tablet specific styling */ @media all and (min-width: @wgMFDeviceWidthTablet) { -- To view, visit https://gerrit.wikimedia.org/r/106843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48f5a57700bfee43626d168e6623289723075233 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits