KartikMistry has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/337782 )
Change subject: stylelint: Fix no-descending-specificity Part 1
......................................................................
stylelint: Fix no-descending-specificity Part 1
Change-Id: Ifb5558487cb4d2a0c9b6745c6377721de82476c7
---
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.translationlist.less
M modules/publish/styles/ext.cx.publish.less
M modules/source/styles/ext.cx.source.selector.less
M modules/tools/styles/ext.cx.tools.link.less
M modules/tools/styles/ext.cx.tools.linker.less
M modules/translation/styles/ext.cx.translation.less
7 files changed, 157 insertions(+), 157 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/82/337782/1
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less
b/modules/dashboard/styles/ext.cx.lists.common.less
index 48c3226..583404e 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -1,5 +1,44 @@
@import '../../widgets/common/ext.cx.common.less';
+.cx-tlitem__languages,
+.cx-slitem__languages {
+ float: left;
+
+ &__language {
+ position: relative;
+ margin-right: 20px;
+ padding: 0 10px 0 0;
+ float: left;
+ color: @gray-dark;
+ }
+
+ &__language:after,
+ &__language:before {
+ left: 100%;
+ top: 50%;
+ border: solid transparent;
+ content: ' ';
+ height: 0;
+ width: 0;
+ position: absolute;
+ pointer-events: none;
+ }
+
+ &__language--source:after {
+ border-color: rgba( 255, 255, 255, 0 );
+ border-left-color: #fff;
+ border-width: 5px;
+ margin-top: -5px;
+ }
+
+ &__language--source:before {
+ border-color: rgba( 85, 85, 85, 0 );
+ border-left-color: @gray-dark;
+ border-width: 7px;
+ margin-top: -7px;
+ }
+}
+
.cx-tlitem,
.cx-slitem {
.mw-ui-one-whole;
@@ -65,45 +104,6 @@
background-size: 20px;
padding-left: 22px;
}
- }
-}
-
-.cx-tlitem__languages,
-.cx-slitem__languages {
- float: left;
-
- &__language {
- position: relative;
- margin-right: 20px;
- padding: 0 10px 0 0;
- float: left;
- color: @gray-dark;
- }
-
- &__language:after,
- &__language:before {
- left: 100%;
- top: 50%;
- border: solid transparent;
- content: ' ';
- height: 0;
- width: 0;
- position: absolute;
- pointer-events: none;
- }
-
- &__language--source:after {
- border-color: rgba( 255, 255, 255, 0 );
- border-left-color: #fff;
- border-width: 5px;
- margin-top: -5px;
- }
-
- &__language--source:before {
- border-color: rgba( 85, 85, 85, 0 );
- border-left-color: @gray-dark;
- border-width: 7px;
- margin-top: -7px;
}
}
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less
b/modules/dashboard/styles/ext.cx.translationlist.less
index 4eef3c8..a3186c6 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -2,6 +2,40 @@
@import 'ext.cx.lists.common.less';
@import 'mediawiki.mixins';
+.cx-draft-discard-dialog {
+ .mw-ui-item;
+
+ color: #222;
+ position: fixed;
+ min-width: 500px;
+ max-width: 600px;
+ background: #fff;
+ border: 1px solid #ddd;
+ border-bottom-width: 3px;
+ border-radius: 3px;
+ padding: 0;
+ top: 30%;
+ left: 30%;
+ box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
+ z-index: 1000;
+
+ &__message {
+ padding: 25px;
+ font-size: large;
+ }
+
+ &__actions {
+ .mw-ui-one-whole;
+
+ padding: 20px;
+
+ button {
+ float: right;
+ padding-right: 20px;
+ }
+ }
+}
+
.cx-tlitem {
&.cx-translation-deleted {
opacity: 0.5;
@@ -157,40 +191,6 @@
.status-published {
color: #00af89;
- }
- }
-}
-
-.cx-draft-discard-dialog {
- .mw-ui-item;
-
- color: #222;
- position: fixed;
- min-width: 500px;
- max-width: 600px;
- background: #fff;
- border: 1px solid #ddd;
- border-bottom-width: 3px;
- border-radius: 3px;
- padding: 0;
- top: 30%;
- left: 30%;
- box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
- z-index: 1000;
-
- &__message {
- padding: 25px;
- font-size: large;
- }
-
- &__actions {
- .mw-ui-one-whole;
-
- padding: 20px;
-
- button {
- float: right;
- padding-right: 20px;
}
}
}
diff --git a/modules/publish/styles/ext.cx.publish.less
b/modules/publish/styles/ext.cx.publish.less
index 6952001..32818d0 100644
--- a/modules/publish/styles/ext.cx.publish.less
+++ b/modules/publish/styles/ext.cx.publish.less
@@ -38,16 +38,16 @@
margin-left: -21px;
}
- img,
- .cx-header__publish-captcha {
- .mw-ui-item;
- .mw-ui-one-whole;
- }
-
input {
.mw-ui-item;
.mw-ui-one-whole;
padding: 5px;
font-size: large;
}
+
+ img,
+ .cx-header__publish-captcha {
+ .mw-ui-item;
+ .mw-ui-one-whole;
+ }
}
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index e96cfec..546253a 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -115,7 +115,7 @@
}
.cx-sourceselector-dialog__title {
- .mw-ui-item;
+ .mw-ui-item; /* stylelint-disable-line no-descending-specificity */
.mw-ui-seven-twelfths;
input {
diff --git a/modules/tools/styles/ext.cx.tools.link.less
b/modules/tools/styles/ext.cx.tools.link.less
index b2386a8..c22e804 100644
--- a/modules/tools/styles/ext.cx.tools.link.less
+++ b/modules/tools/styles/ext.cx.tools.link.less
@@ -2,41 +2,6 @@
@import '../../widgets/common/ext.cx.highlight.less';
@import 'mediawiki.mixins';
-.cards.link {
- animation-name: card-show-animation;
- animation-duration: 0.5s;
- position: relative;
- padding: 0;
- // Make sure the container has enough space to do the
- // animation of second card. Height of one card = 100px
- // For animation 60 px.
- min-height: 170px;
-
- .card {
- .mw-ui-item;
- padding: 0;
-
- &:nth-of-type(1) {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- transition: top 0.15s;
-
- // On mouse over of first card, push the second card a
bit down.
- &:hover + .card:nth-of-type(2) {
- top: 60px;
- }
- }
-
- &:nth-of-type(2) {
- position: relative;
- top: 30px;
- transition: top 0.3s;
- }
- }
-}
-
.card__remove-link {
@vertical-margin: 10px;
@horizontal-margin: 15px;
@@ -99,6 +64,21 @@
}
}
+.card__link-instruction {
+ .mw-ui-item;
+ .mw-ui-one-whole;
+ color: @gray-dark;
+ font-size: large;
+ border-top: 1px solid #ddd;
+ clear: both;
+ padding-top: 10px;
+
+ .shortcut-info {
+ font-size: small;
+ color: #aaa;
+ }
+}
+
.card__link-info {
.mw-ui-item;
.mw-ui-seven-tenths;
@@ -128,6 +108,46 @@
padding: 0;
font-size: medium;
}
+}
+
+.cards.link {
+ animation-name: card-show-animation;
+ animation-duration: 0.5s;
+ position: relative;
+ padding: 0;
+ // Make sure the container has enough space to do the
+ // animation of second card. Height of one card = 100px
+ // For animation 60 px.
+ min-height: 170px;
+
+ .card {
+ .mw-ui-item;
+ padding: 0;
+
+ &:nth-of-type(2) {
+ position: relative;
+ top: 30px;
+ transition: top 0.3s;
+ }
+
+ &:nth-of-type(1) {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ transition: top 0.15s;
+
+ // On mouse over of first card, push the second card a
bit down.
+ &:hover + .card:nth-of-type(2) {
+ top: 60px;
+ }
+ }
+ }
+}
+
+.card__mark-missing-link {
+ .card__add-link;
+ .background-image-svg('../images/flag_gray.svg',
'../images/flag_gray.png');
}
.card.missinglink {
@@ -168,29 +188,10 @@
}
}
-.card__link-instruction {
- .mw-ui-item;
- .mw-ui-one-whole;
- color: @gray-dark;
- font-size: large;
- border-top: 1px solid #ddd;
- clear: both;
- padding-top: 10px;
-
- .shortcut-info {
- font-size: small;
- color: #aaa;
- }
-}
-
[contenteditable] {
// Links that cannot be adapted will be represented in gray with a
dashed underline.
// The dashed underline will only appear for the links on the current
paragraph.
// Links from other paragraphs will not show the dashed underline to
avoid too much visual noise.
- &:focus .cx-target-link-unadapted {
- border-bottom: 1px dashed #ccc;
- }
-
.cx-target-link-unadapted {
color: #72777d;
@@ -199,14 +200,13 @@
}
}
+ &:focus .cx-target-link-unadapted {
+ border-bottom: 1px dashed #ccc;
+ }
+
.cx-link {
cursor: pointer;
}
-}
-
-.card__mark-missing-link {
- .card__add-link;
- .background-image-svg('../images/flag_gray.svg',
'../images/flag_gray.png');
}
.external {
diff --git a/modules/tools/styles/ext.cx.tools.linker.less
b/modules/tools/styles/ext.cx.tools.linker.less
index 50eb159..a80699c 100644
--- a/modules/tools/styles/ext.cx.tools.linker.less
+++ b/modules/tools/styles/ext.cx.tools.linker.less
@@ -6,17 +6,6 @@
min-height: 30px;
padding: 5px;
- &.linker-expanded {
- .linker-trigger {
- display: none;
- }
-
- .linker-search,
- .linker-header {
- display: block;
- }
- }
-
.linker-trigger {
color: @gray-dark;
.background-image-svg('../images/add_link_gray.svg',
'../images/add_link_gray.png');
@@ -80,8 +69,19 @@
}
button {
- .mw-ui-item;
- .mw-ui-one-third;
+ .mw-ui-item; /* stylelint-disable-line
no-descending-specificity */
+ .mw-ui-one-third; /* stylelint-disable-line
no-descending-specificity */
+ }
+ }
+
+ &.linker-expanded {
+ .linker-trigger {
+ display: none;
+ }
+
+ .linker-search,
+ .linker-header {
+ display: block;
}
}
}
diff --git a/modules/translation/styles/ext.cx.translation.less
b/modules/translation/styles/ext.cx.translation.less
index da44c00..3cd8fa9 100644
--- a/modules/translation/styles/ext.cx.translation.less
+++ b/modules/translation/styles/ext.cx.translation.less
@@ -33,11 +33,6 @@
margin: 0 auto;
}
- .cx-column--translation:hover &:first-child {
- color: transparent;
- background-color: transparent;
- }
-
&:first-child,
&:hover,
.cx-column--translation &:first-child:hover {
@@ -50,4 +45,9 @@
/* align vertically */
align-items: center;
}
+
+ .cx-column--translation:hover &:first-child {
+ color: transparent;
+ background-color: transparent;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/337782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb5558487cb4d2a0c9b6745c6377721de82476c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
