[MediaWiki-commits] [Gerrit] Move references to pending.gif to the themes that provide it - change (oojs/ui)

[Trevor Parscal (Code Review)]

Trevor Parscal has uploaded a new change for review.

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

Change subject: Move references to pending.gif to the themes that provide it
......................................................................

Move references to pending.gif to the themes that provide it

Also move the definition of @oo-ui-default-image-path to common.less so it can 
be used throughout the theme.

Change-Id: I8d109b62b67c5bb00aef9595c034adde8f51bce1
---
M src/styles/Dialog.less
M src/styles/widgets/ActionWidget.less
M src/styles/widgets/TextInputWidget.less
M src/themes/apex/common.less
M src/themes/apex/images.less
M src/themes/apex/widgets.less
M src/themes/apex/windows.less
M src/themes/blank/common.less
M src/themes/blank/images.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/images.less
M src/themes/mediawiki/widgets.less
M src/themes/mediawiki/windows.less
M src/themes/minerva/common.less
M src/themes/minerva/images.less
15 files changed, 35 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/00/163900/1

diff --git a/src/styles/Dialog.less b/src/styles/Dialog.less
index 60a573e..f4bc29a 100644
--- a/src/styles/Dialog.less
+++ b/src/styles/Dialog.less
@@ -16,9 +16,6 @@
                        &-head {
                                z-index: 1;
                                top: 0;
-                               &.oo-ui-pendingElement-pending {
-                                       
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
-                               }
                        }
 
                        &-body {
diff --git a/src/styles/widgets/ActionWidget.less 
b/src/styles/widgets/ActionWidget.less
index 000b1d8..39ed296 100644
--- a/src/styles/widgets/ActionWidget.less
+++ b/src/styles/widgets/ActionWidget.less
@@ -2,8 +2,4 @@
 
 .oo-ui-actionWidget {
        .theme-oo-ui-actionWidget();
-
-       &.oo-ui-pendingElement-pending {
-               
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
-       }
 }
diff --git a/src/styles/widgets/TextInputWidget.less 
b/src/styles/widgets/TextInputWidget.less
index 0897fd6..d79816a 100644
--- a/src/styles/widgets/TextInputWidget.less
+++ b/src/styles/widgets/TextInputWidget.less
@@ -12,12 +12,6 @@
                .oo-ui-box-sizing(border-box);
        }
 
-       &.oo-ui-pendingElement-pending {
-               input, textarea {
-                       
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
-               }
-       }
-
        > .oo-ui-iconElement-icon,
        > .oo-ui-indicatorElement-indicator {
                position: absolute;
diff --git a/src/themes/apex/common.less b/src/themes/apex/common.less
index c6397a2..1bcb2c2 100644
--- a/src/themes/apex/common.less
+++ b/src/themes/apex/common.less
@@ -3,7 +3,7 @@
 
 // Theme variables
 
-// (add variables here)
+@oo-ui-default-image-path: 'themes/apex/images';
 
 // Theme mixins
 
diff --git a/src/themes/apex/images.less b/src/themes/apex/images.less
index 5aa2a8c..a62a5b3 100644
--- a/src/themes/apex/images.less
+++ b/src/themes/apex/images.less
@@ -1,7 +1,5 @@
 @import 'common';
 
-@oo-ui-default-image-path: 'themes/apex/images';
-
 // These files are generated from images.json during the build
 @import 'images/icons/icons';
 @import 'images/indicators/indicators';
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 32ea8eb..dab8a54 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -56,7 +56,11 @@
 
 .theme-oo-ui-buttonWidget () {}
 
-.theme-oo-ui-actionWidget () {}
+.theme-oo-ui-actionWidget () {
+       &.oo-ui-pendingElement-pending {
+               
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
+       }
+}
 
 .theme-oo-ui-popupButtonWidget () {
        &.oo-ui-buttonElement-frameless > .oo-ui-popupWidget {
@@ -199,6 +203,12 @@
                }
        }
 
+       &.oo-ui-pendingElement-pending {
+               input, textarea {
+                       
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
+               }
+       }
+
        input[readonly],
        textarea[readonly] {
                color: #777;
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 1f9b570..206fa03 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -126,6 +126,10 @@
        &-content {
                .oo-ui-window-head {
                        height: 3.4em;
+
+                       &.oo-ui-pendingElement-pending {
+                               
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
+                       }
                }
 
                .oo-ui-window-body {
diff --git a/src/themes/blank/common.less b/src/themes/blank/common.less
index c6397a2..f9ec869 100644
--- a/src/themes/blank/common.less
+++ b/src/themes/blank/common.less
@@ -3,7 +3,7 @@
 
 // Theme variables
 
-// (add variables here)
+@oo-ui-default-image-path: 'themes/blank/images';
 
 // Theme mixins
 
diff --git a/src/themes/blank/images.less b/src/themes/blank/images.less
index a4e55d4..a62a5b3 100644
--- a/src/themes/blank/images.less
+++ b/src/themes/blank/images.less
@@ -1,7 +1,5 @@
 @import 'common';
 
-@oo-ui-default-image-path: 'themes/blank/images';
-
 // These files are generated from images.json during the build
 @import 'images/icons/icons';
 @import 'images/indicators/indicators';
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index c6397a2..81310a8 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -3,7 +3,7 @@
 
 // Theme variables
 
-// (add variables here)
+@oo-ui-default-image-path: 'themes/mediawiki/images';
 
 // Theme mixins
 
diff --git a/src/themes/mediawiki/images.less b/src/themes/mediawiki/images.less
index 1da26f6..a62a5b3 100644
--- a/src/themes/mediawiki/images.less
+++ b/src/themes/mediawiki/images.less
@@ -1,7 +1,5 @@
 @import 'common';
 
-@oo-ui-default-image-path: 'themes/mediawiki/images';
-
 // These files are generated from images.json during the build
 @import 'images/icons/icons';
 @import 'images/indicators/indicators';
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 611f1f0..1b89294 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -35,7 +35,11 @@
 
 .theme-oo-ui-buttonWidget () {}
 
-.theme-oo-ui-actionWidget () {}
+.theme-oo-ui-actionWidget () {
+       &.oo-ui-pendingElement-pending {
+               
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
+       }
+}
 
 .theme-oo-ui-popupButtonWidget () {
        &.oo-ui-buttonElement-frameless > .oo-ui-popupWidget {
@@ -181,6 +185,12 @@
                }
        }
 
+       &.oo-ui-pendingElement-pending {
+               input, textarea {
+                       
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
+               }
+       }
+
        input[readonly],
        textarea[readonly] {
                color: #777;
diff --git a/src/themes/mediawiki/windows.less 
b/src/themes/mediawiki/windows.less
index 3174f2c..5f2916f 100644
--- a/src/themes/mediawiki/windows.less
+++ b/src/themes/mediawiki/windows.less
@@ -119,6 +119,10 @@
        &-content {
                .oo-ui-window-head {
                        height: 3.4em;
+
+                       &.oo-ui-pendingElement-pending {
+                               
.oo-ui-background-image('@{oo-ui-default-image-path}/textures/pending.gif');
+                       }
                }
 
                .oo-ui-window-body {
diff --git a/src/themes/minerva/common.less b/src/themes/minerva/common.less
index 77a1807..5760689 100644
--- a/src/themes/minerva/common.less
+++ b/src/themes/minerva/common.less
@@ -3,6 +3,8 @@
 
 // Theme variables
 
+@oo-ui-default-image-path: 'themes/minerva/images';
+
 @color-progressive: #347BFF;
 @color-destructive: #D11D13;
 @color-white: #FFF;
diff --git a/src/themes/minerva/images.less b/src/themes/minerva/images.less
index b9991b1..a62a5b3 100644
--- a/src/themes/minerva/images.less
+++ b/src/themes/minerva/images.less
@@ -1,7 +1,5 @@
 @import 'common';
 
-@oo-ui-default-image-path: 'themes/minerva/images';
-
 // These files are generated from images.json during the build
 @import 'images/icons/icons';
 @import 'images/indicators/indicators';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d109b62b67c5bb00aef9595c034adde8f51bce1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <tpars...@wikimedia.org>

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