[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Adopt conflict colors

2017-03-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340909 )

Change subject: RCFilters UI: Adopt conflict colors
..


RCFilters UI: Adopt conflict colors

Bug: T156427
Bug: T156861
Change-Id: I8765dfb0554e6351b9cb3516a2bc979c57b20053
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
2 files changed, 21 insertions(+), 4 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
index c70da38..8173150 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
@@ -5,20 +5,34 @@
border-color: #979797;
color: #222;
 
-   &-muted {
+   // Background and color of the capsule widget need a bit
+   // more specificity to override ooui internals
+   &-muted.oo-ui-capsuleItemWidget.oo-ui-widget-enabled {
// Muted state
background-color: #eaecf0;
border-color: #c8ccd1;
+
.oo-ui-labelElement-label {
color: #72777d;
}
-
.oo-ui-buttonWidget {
opacity: @muted-opacity;
}
}
 
-   &-selected {
+   &-conflicted.oo-ui-capsuleItemWidget.oo-ui-widget-enabled {
+   background-color: #fee7e6; // Red90 AAA
+   border-color: #b32424; // Red30 AAA
+
+   .oo-ui-labelElement-label {
+   color: #b32424;
+   }
+   .oo-ui-buttonWidget {
+   opacity: @muted-opacity;
+   }
+   }
+
+   &-selected.oo-ui-capsuleItemWidget.oo-ui-widget-enabled {
background-color: #eaf3ff;
border-color: #36c;
}
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index 800e7ea..a7ad954 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -135,8 +135,11 @@
'mw-rcfilters-ui-capsuleItemWidget-muted',
!this.model.isSelected() ||
this.model.isIncluded() ||
-   this.model.isConflicted() ||
this.model.isFullyCovered()
+   )
+   .toggleClass(
+   'mw-rcfilters-ui-capsuleItemWidget-conflicted',
+   this.model.isConflicted()
);
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8765dfb0554e6351b9cb3516a2bc979c57b20053
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Adopt conflict colors

2017-03-02 Thread Mooeypoo (Code Review) 
Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/340909 )

Change subject: RCFilters UI: Adopt conflict colors
..

RCFilters UI: Adopt conflict colors

Bug: T156427
Bug: T156861
Change-Id: I8765dfb0554e6351b9cb3516a2bc979c57b20053
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
2 files changed, 34 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/340909/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
index c70da38..88357ef 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
@@ -5,23 +5,39 @@
border-color: #979797;
color: #222;
 
-   &-muted {
-   // Muted state
-   background-color: #eaecf0;
-   border-color: #c8ccd1;
-   .oo-ui-labelElement-label {
-   color: #72777d;
+   // Background and color of the capsule widget need a bit
+   // more specificity to override ooui internals
+   // &.oo-ui-capsuleItemWidget.oo-ui-widget-enabled {
+   &-muted.oo-ui-capsuleItemWidget.oo-ui-widget-enabled {
+   // Muted state
+   background-color: #eaecf0;
+   border-color: #c8ccd1;
+
+   .oo-ui-labelElement-label {
+   color: #72777d;
+   }
+   .oo-ui-buttonWidget {
+   opacity: @muted-opacity;
+   }
}
 
-   .oo-ui-buttonWidget {
-   opacity: @muted-opacity;
-   }
-   }
+   &-conflicted.oo-ui-capsuleItemWidget.oo-ui-widget-enabled {
+   background-color: #fee7e6; // Red90 AAA
+   border-color: #b32424; // Red30 AAA
 
-   &-selected {
-   background-color: #eaf3ff;
-   border-color: #36c;
-   }
+   .oo-ui-labelElement-label {
+   color: #b32424;
+   }
+   .oo-ui-buttonWidget {
+   opacity: @muted-opacity;
+   }
+   }
+
+   &-selected.oo-ui-capsuleItemWidget.oo-ui-widget-enabled {
+   background-color: #eaf3ff;
+   border-color: #36c;
+   }
+   // }
 
&-popup-content {
padding: 0.5em;
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index 800e7ea..a7ad954 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -135,8 +135,11 @@
'mw-rcfilters-ui-capsuleItemWidget-muted',
!this.model.isSelected() ||
this.model.isIncluded() ||
-   this.model.isConflicted() ||
this.model.isFullyCovered()
+   )
+   .toggleClass(
+   'mw-rcfilters-ui-capsuleItemWidget-conflicted',
+   this.model.isConflicted()
);
};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8765dfb0554e6351b9cb3516a2bc979c57b20053
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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