From ed36d72482b9df327df5be6430a473373ff73701 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 9 Jan 2023 18:38:09 -0500 Subject: [PATCH] =?UTF-8?q?feat(TwoColConflict):=20=E2=9C=A8=20add=20TwoCo?= =?UTF-8?q?lConflict=20skinStyles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + skin.json | 2 + .../ext.TwoColConflict.SplitCss.less | 155 ++++++++++++++++++ .../ext.TwoColConflict.SplitJs.less | 34 ++++ 4 files changed, 192 insertions(+) create mode 100644 skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less create mode 100644 skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less diff --git a/README.md b/README.md index 17c79a41..67fc95da 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ Name | Grade | Version | Last updated [TabberNeue](https://www.mediawiki.org/wiki/Extension:TabberNeue) | A | 1.3.1 `656f396` | 2022-10-23 [TimedMediaHandler](https://www.mediawiki.org/wiki/Extension:TimedMediaHandler) | B | N/A | N/A [Translate](https://www.mediawiki.org/wiki/Extension:Translate) | B | MLEB 2021.07 | 2021-07-29 +[TwoColConflict](https://www.mediawiki.org/wiki/Extension:TwoColConflict) | B | REL1_39 5a2a947 | 2023-01-09 [UniversalLanguageSelector](https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector) | B | MLEB 2021.12 | 2022-05-17 [UploadWizard](https://www.mediawiki.org/wiki/Extension:UploadWizard) | A | REL1_39 `9cd7a02` | 2023-01-08 [VisualEditor](https://www.mediawiki.org/wiki/Extension:VisualEditor) | A | REL1_35 `cc3466a` | 2021-08-04 diff --git a/skin.json b/skin.json index db216951..62de6afd 100644 --- a/skin.json +++ b/skin.json @@ -411,6 +411,8 @@ "+ext.translate.statsbar": "skinStyles/extensions/Translate/ext.translate.statsbar.less", "+ext.translate.statstable": "skinStyles/extensions/Translate/ext.translate.statstable.less", "+ext.translate.tag.languages": "skinStyles/extensions/Translate/ext.translate.tag.languages.less", + "+ext.TwoColConflict.SplitJs": "skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less", + "+ext.TwoColConflict.SplitCss": "skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less", "+ext.uls.common": "skinStyles/extensions/UniversalLanguageSelector/ext.uls.common.less", "+ext.uls.compactlinks": "skinStyles/extensions/UniversalLanguageSelector/ext.uls.compactlinks.less", "+ext.uls.displaysettings": "skinStyles/extensions/UniversalLanguageSelector/ext.uls.displaysettings.less", diff --git a/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less new file mode 100644 index 00000000..b52db3d3 --- /dev/null +++ b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less @@ -0,0 +1,155 @@ +/* + * Citizen + * + * SkinStyles for Extension:TwoColConflict + * Module: ext.TwoColConflict.SplitCss + * Version: REL1_39 5a2a947 + * + * Date: 2023-01-09 +*/ + +/* ext.TwoColConflict.Split.less */ +.mw-twocolconflict-special-your-version-header, +.mw-twocolconflict-split-current-version-header, +.mw-twocolconflict-split-your-version-header { + .mw-twocolconflict-revision-label { + padding: 0 5px; + font-weight: var( --font-weight-semibold ); + } +} + +.mw-twocolconflict-split-current-version-header .mw-twocolconflict-revision-label { + background-color: var( --background-color-warning ); +} + +.mw-twocolconflict-special-your-version-header .mw-twocolconflict-revision-label, +.mw-twocolconflict-split-your-version-header .mw-twocolconflict-revision-label { + background-color: var( --background-color-primary--hover ); +} + +.mw-twocolconflict-split-row { + &.mw-twocolconflict-no-selection { + border-color: transparent; + background-color: var( --background-color-destructive ); + } +} + +.mw-twocolconflict-single-column, +.mw-twocolconflict-split-column { + background-color: var( --color-surface-0 ); + color: var( --color-base--emphasized ); + + &.mw-twocolconflict-split-add { + border-color: var( --background-color-primary--hover ); + } + + &.mw-twocolconflict-split-delete { + border-color: var( --background-color-warning ); + } + + &.mw-twocolconflict-split-copy { + border-color: var( --color-surface-2 ); + background-color: var( --color-surface-2 ); + } + + ins.mw-twocolconflict-diffchange { + background-color: var( --background-color-primary--hover ); + } + + del.mw-twocolconflict-diffchange { + background-color: var( --background-color-warning ); + } + + &.mw-twocolconflict-split-unselected { + color: var( --color-base--subtle ); + + &.mw-twocolconflict-split-add { + border-color: var( --background-color-primary--hover ); + } + + &.mw-twocolconflict-split-delete { + border-color: var( --background-color-warning ); + } + + ins.mw-twocolconflict-diffchange { + background-color: var( --background-color-primary--hover ); + } + + del.mw-twocolconflict-diffchange { + background-color: var( --background-color-warning ); + } + } + + .mw-twocolconflict-split-collapsed { + .mw-twocolconflict-split-fade { + background-image: linear-gradient( transparent, var( --color-surface-2 ) ); + } + } +} + +.mw-twocolconflict-split-selector-label { + .mw-twocolconflict-no-selection & { + color: var( --color-destructive ); + } +} + +.mw-twocolconflict-split-selection { + .mw-twocolconflict-split-row.mw-twocolconflict-no-selection & > div { + .oo-ui-radioInputWidget [ type='radio' ] + span { + border-color: var( --color-destructive ); + } + } + + > div:nth-child( 1 ) { + .oo-ui-radioInputWidget.oo-ui-widget-enabled [ type='radio' ]:checked + span, + .oo-ui-radioInputWidget.oo-ui-widget-enabled [ type='radio' ]:active + span, + .oo-ui-radioInputWidget [ type='radio' ] + span { + border-color: var( --color-warning ); + background: var( --background-color-warning ); + } + } + + > div:nth-child( 2 ) { + .oo-ui-radioInputWidget.oo-ui-widget-enabled [ type='radio' ]:checked + span, + .oo-ui-radioInputWidget.oo-ui-widget-enabled [ type='radio' ]:active + span, + .oo-ui-radioInputWidget [ type='radio' ] + span { + border-color: var( --color-primary ); + background: var( --background-color-primary--hover ); + } + } +} + +.mw-twocolconflict-copy-notice { + p { + font-size: 0.875em; + } +} + +/* ext.TwoColConflict.Talk.styles.less */ +.mw-twocolconflict-single-row { + margin: 16px 0; + + &:first-of-type { + margin: 32px 0 16px 0; + } + + &:last-of-type { + margin: 16px 0 32px 0; + } +} + +.mw-twocolconflict-conflicting-talk-row { + .mw-twocolconflict-conflicting-talk-label { + span { + font-weight: var( --font-weight-semibold ); + + .mw-twocolconflict-split-delete { + background-color: var( --background-color-warning ); + } + + .mw-twocolconflict-split-add { + background-color: var( --background-color-primary--hover ); + } + } + } +} diff --git a/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less new file mode 100644 index 00000000..e43e0cd6 --- /dev/null +++ b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less @@ -0,0 +1,34 @@ +/* + * Citizen + * + * SkinStyles for Extension:TwoColConflict + * Module: ext.TwoColConflict.SplitJs + * Version: REL1_39 5a2a947 + * + * Date: 2023-01-09 +*/ + +.mw-twocolconflict-split-tour-intro-container, +.mw-twocolconflict-split-tour-popup { + p { + line-height: var( --line-height ); + } +} + +.mw-twocolconflict-split-tour-popup { + color: var( --color-base--emphasized ); +} + +.mw-twocolconflict-split-tour-help-button { + font-size: 1rem; +} + +.mw-twocolconflict-split-tour-help-button-single-column-view { + font-size: 0.8125rem; +} + +.mw-twocolconflict-split-tour-intro-container-blue-dot-hint { + p { + font-weight: var( --font-weight-semibold ); + } +}