VolkerE has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291683
Change subject: Easify disabled `.oo-ui-tool-link` rules
......................................................................
Easify disabled `.oo-ui-tool-link` rules
Concatenating & reducing disabled `.oo-ui-tool-link` rules across ToolGroup
files.
Change-Id: I37e10e8f8cb2e6bf232798b1d13f85d97ffdcf6a
---
M src/styles/ToolGroup.less
M src/styles/toolgroups/BarToolGroup.less
M src/styles/toolgroups/ListToolGroup.less
M src/styles/toolgroups/MenuToolGroup.less
M src/styles/toolgroups/PopupToolGroup.less
5 files changed, 9 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/83/291683/1
diff --git a/src/styles/ToolGroup.less b/src/styles/ToolGroup.less
index f2fe4e7..3f024e5 100644
--- a/src/styles/ToolGroup.less
+++ b/src/styles/ToolGroup.less
@@ -10,6 +10,14 @@
.oo-ui-tool-link {
text-decoration: none;
+ cursor: pointer;
+ }
+
+ &.oo-ui-widget-disabled .oo-ui-tool-link,
+ .oo-ui-widget-disabled > .oo-ui-tool-link,
+ .oo-ui-tool-link[aria-disabled="true"] {
+ outline: 0;
+ cursor: default;
}
.theme-oo-ui-toolGroup();
diff --git a/src/styles/toolgroups/BarToolGroup.less
b/src/styles/toolgroups/BarToolGroup.less
index 1611a9d..70a0e1b 100644
--- a/src/styles/toolgroups/BarToolGroup.less
+++ b/src/styles/toolgroups/BarToolGroup.less
@@ -6,12 +6,6 @@
display: none;
}
- &.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool {
- > .oo-ui-tool-link {
- cursor: pointer;
- }
- }
-
> .oo-ui-toolGroup-tools > .oo-ui-tool {
display: inline-block;
position: relative;
@@ -40,11 +34,6 @@
.oo-ui-tool-title {
display: inline;
}
- }
-
- &.oo-ui-widget-disabled > .oo-ui-tool-link {
- outline: 0;
- cursor: default;
}
}
diff --git a/src/styles/toolgroups/ListToolGroup.less
b/src/styles/toolgroups/ListToolGroup.less
index 406c230..09bcfd8 100644
--- a/src/styles/toolgroups/ListToolGroup.less
+++ b/src/styles/toolgroups/ListToolGroup.less
@@ -3,18 +3,7 @@
.oo-ui-listToolGroup {
.oo-ui-tool {
display: block;
-
.oo-ui-box-sizing( border-box );
-
- &-link {
- cursor: pointer;
- }
-
- &.oo-ui-widget-disabled {
- .oo-ui-tool-link {
- cursor: default;
- }
- }
}
.theme-oo-ui-listToolGroup();
diff --git a/src/styles/toolgroups/MenuToolGroup.less
b/src/styles/toolgroups/MenuToolGroup.less
index cfbbe0b..08fd99f 100644
--- a/src/styles/toolgroups/MenuToolGroup.less
+++ b/src/styles/toolgroups/MenuToolGroup.less
@@ -3,16 +3,6 @@
.oo-ui-menuToolGroup {
.oo-ui-tool {
display: block;
-
- &-link {
- cursor: pointer;
- }
-
- &.oo-ui-widget-disabled {
- .oo-ui-tool-link {
- cursor: default;
- }
- }
}
.theme-oo-ui-menuToolGroup();
diff --git a/src/styles/toolgroups/PopupToolGroup.less
b/src/styles/toolgroups/PopupToolGroup.less
index 35ae1a3..0cd6563 100644
--- a/src/styles/toolgroups/PopupToolGroup.less
+++ b/src/styles/toolgroups/PopupToolGroup.less
@@ -57,7 +57,7 @@
text-align: right;
}
- .oo-ui-tool-accel:not(:empty) {
+ .oo-ui-tool-accel:not( :empty ) {
// Push away from tool's title
padding-left: 3em;
}
--
To view, visit https://gerrit.wikimedia.org/r/291683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37e10e8f8cb2e6bf232798b1d13f85d97ffdcf6a
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
