VolkerE has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291860
Change subject: MediaWiki theme: Simplify ToolGroup selectors
......................................................................
MediaWiki theme: Simplify ToolGroup selectors
Simplifying and reducing ToolGroup selectors. Also making disabled
accellerator keys hint use `@color-disabled` instead of custom color.
Change-Id: Ieb2ac5a29961fcbccc626664306cc0e69670a780
---
M src/themes/mediawiki/tools.less
1 file changed, 38 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/60/291860/1
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index c635029..aa0f2ef 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -118,7 +118,7 @@
background-color: @oo-ui-toolbar-normal-hover;
}
- > a.oo-ui-tool-link .oo-ui-tool-title {
+ > .oo-ui-tool-link .oo-ui-tool-title {
color: @color-default;
}
@@ -127,28 +127,22 @@
border-color: rgba( 0, 0, 0, 0.2 );
box-shadow: inset 0 0.07em 0.07em 0 rgba( 0, 0,
0, 0.07 );
background-color: @oo-ui-toolbar-active;
- }
- &.oo-ui-widget-enabled:hover {
- background-color: @oo-ui-toolbar-active-hover;
- }
+ &:hover {
+ background-color:
@oo-ui-toolbar-active-hover;
+ }
- &.oo-ui-widget-enabled +
.oo-ui-tool-active.oo-ui-widget-enabled {
- border-left-color: rgba( 0, 0, 0, 0.1 );
- }
- }
-
- &.oo-ui-widget-disabled > .oo-ui-tool-link {
- .oo-ui-tool-title {
- color: @color-disabled;
- }
-
- .oo-ui-iconElement-icon {
- opacity: @opacity-disabled;
+ & + .oo-ui-tool-active.oo-ui-widget-enabled {
+ border-left-color: rgba( 0, 0, 0, 0.1 );
+ }
}
}
&.oo-ui-widget-enabled {
+ &:active {
+ background-color: @oo-ui-toolbar-pressed;
+ }
+
> .oo-ui-tool-link .oo-ui-iconElement-icon {
opacity: 0.7;
}
@@ -157,14 +151,11 @@
opacity: 0.9;
}
}
-
- &.oo-ui-widget-enabled:active {
- background-color: @oo-ui-toolbar-pressed;
- }
}
- &.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool {
- > a.oo-ui-tool-link {
+ &.oo-ui-widget-enabled .oo-ui-tool.oo-ui-widget-disabled,
+ &.oo-ui-widget-disabled .oo-ui-tool {
+ > .oo-ui-tool-link {
.oo-ui-tool-title {
color: @color-disabled;
}
@@ -186,6 +177,7 @@
&.oo-ui-iconElement {
min-width: 3.125em;
+
.oo-ui-toolbar-narrow & {
min-width: 2.5em;
}
@@ -226,14 +218,6 @@
}
}
- &.oo-ui-widget-enabled &-handle:hover {
- background-color: @oo-ui-toolbar-normal-hover;
- }
-
- &.oo-ui-widget-enabled &-handle:active {
- background-color: @oo-ui-toolbar-active;
- }
-
&-handle {
padding: 0.3125em;
height: 2.5em;
@@ -262,6 +246,15 @@
.oo-ui-toolbar-narrow & {
left: 0;
}
+ }
+ }
+
+ &.oo-ui-widget-enabled &-handle {
+ &:hover {
+ background-color: @oo-ui-toolbar-normal-hover;
+ }
+ &:active {
+ background-color: @oo-ui-toolbar-active;
}
}
@@ -350,31 +343,18 @@
}
}
}
-
- &.oo-ui-widget-disabled {
- .oo-ui-tool-link {
- .oo-ui-tool-title {
- color: @color-disabled;
- }
-
- .oo-ui-tool-accel {
- color: #ddd;
- }
-
- .oo-ui-iconElement-icon {
- opacity: @opacity-disabled;
- }
- }
- }
}
- &.oo-ui-widget-disabled {
+ &.oo-ui-widget-disabled,
+ .oo-ui-widget-disabled .oo-ui-tool-title,
+ .oo-ui-widget-disabled .oo-ui-tool-accel {
color: @color-disabled;
+ }
- .oo-ui-indicatorElement-indicator,
- .oo-ui-iconElement-icon {
- opacity: @opacity-disabled;
- }
+ &.oo-ui-widget-disabled .oo-ui-indicatorElement-indicator,
+ &.oo-ui-widget-disabled .oo-ui-iconElement-icon,
+ .oo-ui-widget-disabled .oo-ui-iconElement-icon {
+ opacity: @opacity-disabled;
}
}
@@ -406,24 +386,15 @@
background-color: @oo-ui-toolbar-normal-hover;
}
}
-
- &.oo-ui-widget-disabled {
- .oo-ui-tool-link .oo-ui-tool-title {
- color: @color-disabled;
- }
-
- .oo-ui-tool-link .oo-ui-iconElement-icon {
- opacity: @opacity-disabled;
- }
- }
}
- &.oo-ui-widget-disabled {
+ &.oo-ui-widget-disabled,
+ .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title {
color: @color-disabled;
+ }
- .oo-ui-indicatorElement-indicator,
- .oo-ui-iconElement-icon {
- opacity: @opacity-disabled;
- }
+ &.oo-ui-widget-disabled .oo-ui-indicatorElement-indicator,
+ &.oo-ui-widget-disabled .oo-ui-iconElement-icon {
+ opacity: @opacity-disabled;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/291860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb2ac5a29961fcbccc626664306cc0e69670a780
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <volke...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
