Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55852
Change subject: Remove duplicate grid system inside Translate and use
jquery.uls.grid
......................................................................
Remove duplicate grid system inside Translate and use jquery.uls.grid
Change-Id: I82a1fff167d3be0b7f240066a1ca52b5ee473135
---
M Resources.php
D resources/css/ext.translate.grid.css
2 files changed, 2 insertions(+), 317 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/52/55852/1
diff --git a/Resources.php b/Resources.php
index 1380aa3..2a34b2e 100644
--- a/Resources.php
+++ b/Resources.php
@@ -92,9 +92,9 @@
'position' => 'top',
) + $resourcePaths;
-// TODO: jquery.uls uses the same grid system. So don't duplicate
+
$wgResourceModules['ext.translate.grid'] = array(
- 'styles' => 'resources/css/ext.translate.grid.css',
+ 'dependencies' => 'jquery.uls.grid',
'position' => 'top',
) + $resourcePaths;
diff --git a/resources/css/ext.translate.grid.css
b/resources/css/ext.translate.grid.css
deleted file mode 100644
index 6b0a5ef..0000000
--- a/resources/css/ext.translate.grid.css
+++ /dev/null
@@ -1,315 +0,0 @@
-/* Generated using Foundation http://foundation.zurb.com/docs/grid.php */
-/* Global Reset & Standards ---------------------- */
-.grid * {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-/* Misc ---------------------- */
-.grid .left {
- float: left;
-}
-
-.grid .right {
- float: right;
-}
-
-.grid .text-left {
- text-align: left;
-}
-
-.grid .text-right {
- text-align: right;
-}
-
-.grid .text-center {
- text-align: center;
-}
-
-.grid .hide {
- display: none;
-}
-
-.grid .highlight {
- background: #ffff99;
-}
-
-/* The Grid ---------------------- */
-.grid .row {
- width: 100%;
- max-width: none;
- min-width: 600px;
- margin: 0 auto;
-}
-
-.grid .row .row {
- width: auto;
- max-width: none;
- min-width: 0;
- margin: 0 -5px;
-}
-
-.grid .row.collapse .column,
-.grid .row.collapse .columns {
- padding: 0;
-}
-
-.grid .row .row {
- width: auto;
- max-width: none;
- min-width: 0;
- margin: 0 -5px;
-}
-
-.grid .row .row.collapse {
- margin: 0;
-}
-
-.grid .column, .grid .columns {
- float: left;
- min-height: 1px;
- padding: 0 5px;
- position: relative;
-}
-
-.grid .column.centered, .grid .columns.centered {
- float: none;
- margin: 0 auto;
-}
-
-.grid .row .one {
- width: 8.333%;
-}
-
-.grid .row .two {
- width: 16.667%;
-}
-
-.grid .row .three {
- width: 25%;
-}
-
-.grid .row .four {
- width: 33.333%;
-}
-
-.grid .row .five {
- width: 41.667%;
-}
-
-.grid .row .six {
- width: 50%;
-}
-
-.grid .row .seven {
- width: 58.333%;
-}
-
-.grid .row .eight {
- width: 66.667%;
-}
-
-.grid .row .nine {
- width: 75%;
-}
-
-.grid .row .ten {
- width: 83.333%;
-}
-
-.grid .row .eleven {
- width: 91.667%;
-}
-
-.grid .row .twelve {
- width: 100%;
-}
-
-.grid .row .offset-by-one {
- margin-left: 8.333%;
-}
-
-.grid .row .offset-by-two {
- margin-left: 16.667%;
-}
-
-.grid .row .offset-by-three {
- margin-left: 25%;
-}
-
-.grid .row .offset-by-four {
- margin-left: 33.333%;
-}
-
-.grid .row .offset-by-five {
- margin-left: 41.667%;
-}
-
-.grid .row .offset-by-six {
- margin-left: 50%;
-}
-
-.grid .row .offset-by-seven {
- margin-left: 58.333%;
-}
-
-.grid .row .offset-by-eight {
- margin-left: 66.667%;
-}
-
-.grid .row .offset-by-nine {
- margin-left: 75%;
-}
-
-.grid .row .offset-by-ten {
- margin-left: 83.333%;
-}
-
-.grid .push-two {
- left: 16.667%;
-}
-
-.grid .pull-two {
- right: 16.667%;
-}
-
-.grid .push-three {
- left: 25%;
-}
-
-.grid .pull-three {
- right: 25%;
-}
-
-.grid .push-four {
- left: 33.333%;
-}
-
-.grid .pull-four {
- right: 33.333%;
-}
-
-.grid .push-five {
- left: 41.667%;
-}
-
-.grid .pull-five {
- right: 41.667%;
-}
-
-.grid .push-six {
- left: 50%;
-}
-
-.grid .pull-six {
- right: 50%;
-}
-
-.grid .push-seven {
- left: 58.333%;
-}
-
-.grid .pull-seven {
- right: 58.333%;
-}
-
-.grid .push-eight {
- left: 66.667%;
-}
-
-.grid .pull-eight {
- right: 66.667%;
-}
-
-.grid .push-nine {
- left: 75%;
-}
-
-.grid .pull-nine {
- right: 75%;
-}
-
-.grid .push-ten {
- left: 83.333%;
-}
-
-.grid .pull-ten {
- right: 83.333%;
-}
-
-/* Nicolas Gallagher's micro clearfix */
-.grid .row {
- *zoom: 1;
-}
-
-.grid .row:before, .grid .row:after {
- content: "";
- display: table;
-}
-
-.grid .row:after {
- clear: both;
-}
-
-/* Block Grids ---------------------- */
-/* These are 2-up, 3-up, 4-up and 5-up ULs, suited
- for repeating blocks of content. Add 'mobile' to
- them to switch them just like the layout grid
- (one item per line) on phones
-
- For IE7/8 compatibility block-grid items need to be
- the same height. You can optionally uncomment the
- lines below to support arbitrary height, but know
- that IE7/8 do not support :nth-child.
- -------------------------------------------------- */
-.grid .block-grid {
- display: block;
- overflow: hidden;
- padding: 0;
-}
-
-.grid .block-grid > li {
- display: block;
- height: auto;
- float: left;
-}
-
-.grid .block-grid.two-up {
- margin: 0 -15px;
-}
-
-.grid .block-grid.two-up > li {
- width: 50%;
- padding: 0 15px 15px;
-}
-
-/* .block-grid.two-up>li:nth-child(2n+1) {clear: left;} */
-.grid .block-grid.three-up {
- margin: 0 -12px;
-}
-
-.grid .block-grid.three-up > li {
- width: 33.33%;
- padding: 0 12px 12px;
-}
-
-/* .block-grid.three-up>li:nth-child(3n+1) {clear: left;} */
-.grid .block-grid.four-up {
- margin: 0 -10px;
-}
-
-.grid .block-grid.four-up > li {
- width: 25%;
- padding: 0 10px 10px;
-}
-
-/* .block-grid.four-up>li:nth-child(4n+1) {clear: left;} */
-.grid .block-grid.five-up {
- margin: 0 -8px;
-}
-
-.grid .block-grid.five-up > li {
- width: 20%;
- padding: 0 8px 8px;
-}
--
To view, visit https://gerrit.wikimedia.org/r/55852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82a1fff167d3be0b7f240066a1ca52b5ee473135
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
