@@ Строка 62: / Строка 62: @@
 	--font-family-base: 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Lato', 'Liberation Sans', 'Noto Sans', 'Helvetica Neue', 'Helvetica', sans-serif;
 	--font-family-oswald: 'oswald';
-	--font-family-heading: "noto sans";
+	--font-family-heading: 'Roboto', 'Roboto-fallback';
 	--font-family-libertine: 'Linux Libertine', 'Georgia', 'Times', serif;
 	--font-family-monospace: 'Menlo', 'Consolas', 'Monaco', 'Noto Mono', 'Nimbus Mono L', monospace;
@@ Строка 74: / Строка 74: @@
 	--font-size-xl: 120%;
 	--font-size-xxl: 130%;
-	--font-size-huge: 150%;
+	--font-size-huge: 145%;
 	--font-size-giant: 200%;
@@ Строка 741: / Строка 741: @@
 	font-weight: 400;
 	src: url(https://fonts.gstatic.com/s/materialsymbolsoutlined/v170/kJF1BvYX7BgnkSrUwT8OhrdQw4oELdPIeeII9v6oDMzByHX9rA6RzaxHMPdY43zj-jCxv3fzvRNU22ZXGJpEpjC_1v-p_4MrImHCIJIZrDCvHOej.woff2) format('woff2')
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 100;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v18/frNV30OaYdlFRtH2VnZZdhTbgVql8nDJpwnrE27mub0.woff2) format('woff2');
+	unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 100;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v18/2tsd397wLxj96qwHyNIkxPesZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 300;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2) format('woff2');
+	unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 300;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc4.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 400;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu5mxKOzY.woff2) format('woff2');
+	unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 400;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 500;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmEU9fABc4AMP6lbBP.woff2) format('woff2');
+	unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 500;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmEU9fBBc4AMP6lQ.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 700;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmWUlfABc4EsA.woff2) format('woff2');
+	unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+@font-face {
+	font-family: 'Roboto';
+	font-style: normal;
+	font-weight: 700;
+	font-display: swap;
+	src: url(https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmWUlfBBc4.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* #endregion */
@@ Строка 920: / Строка 1010: @@
 .mw-body h2 {
 	font-size: var(--font-size-huge);
-	border-bottom: none;
+    font-weight: 500;
-	font-family: var(--font-family-libertine);
+    font-family: var(--font-family-heading);
-	margin-bottom: 0.4em;
+    margin-top: 1em;
-	margin-top: 1em;
+    border-bottom: 2px solid var(--color-contrast);
-	line-height: 1.375;
+    margin-bottom: 0.33rem;
-	border-bottom: 2px solid var(--color-contrast);
+    padding: 0.25rem 0.25rem 0.1rem;
+    line-height: 1.25;
 }
 .mw-body h3 {
-	font-size: var(--font-size-xl);
+	font-size: var(--font-size-xxl);
-	font-weight: bold;
+    font-weight: 500;
-	font-family: sans-serif;
+    font-family: var(--font-family-heading);
-	margin-top: 0.3em;
+    margin-top: 0.3em;
-	margin-bottom: 0.3em;
+    margin-bottom: 0.3em;
-	padding-bottom: 0;
+    padding-bottom: 0.3em;
-	line-height: 1.6;
+    padding-top: 0.5em;
-	padding-top: 0.5em;
+}
+.mw-body h3 .mw-headline {
+    display: inline-block;
+    position: relative;
+}
+.mw-body h3 .mw-headline:before {
+	content: '';
+    position: absolute;
+    bottom: -0.2em;
+    height: 2px;
+    width: calc(100% + 2em);
+    max-width: 85cqw;
+    background: linear-gradient(to right, hsl(from var(--color-contrast) h s l / 0.75) calc(100% - 2em), transparent 100%);
 }
 .mw-body h4,
 .mw-body h5 {
-	font-size: var(--font-size-ml);
+	font-size: var(--font-size-xl);
-	font-weight: bold;
+	font-weight: 500;
-	font-family: sans-serif;
+	font-family: var(--font-family-heading);
      padding-top: 0.5em;
      margin: 0;
@@ Строка 1943: / Строка 2048: @@
 /*=== toc ===*/
 ul#filetoc, .toc, .toccolours, .mw-warning {
-	border-radius: 0.5em;
+	border-radius: var(--border-radius-high);
-	background: var(--theme-bg-color-150);
+    background: var(--theme-bg-color-150);
-	padding: 12px;
+    padding: 8px 12px;
-	box-sizing: border-box;
+    margin: 12px 0;
-	margin: 12px 0;
+    min-width: 12em;
-	min-width: 12em;
+    box-shadow: var(--box-shadow);
-	border: none;
+    line-height: 1.3;
-	box-shadow: var(--box-shadow-outline);
+    border: var(--border-outset-light);
-	line-height: 1.3;
 }
@@ Строка 1959: / Строка 2063: @@
 .toc .toctitle {
-	font-size: 0.95em;
+	font-size: var(--font-size-s);
-	padding: 0 8px;
 	display: flex;
 	align-items: center;
@@ Строка 1974: / Строка 2077: @@
 	display: flex;
 	align-items: center;
+	padding: 0;
 }
@@ Строка 1979: / Строка 2083: @@
 	content: "";
 	display: block;
-	width: 12px;
+    width: 16px;
-	height: 12px;
+    height: 14px;
 	--mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewbox='0 0 12 12'%3E%3Cpath id='bulleted-list-tiny' d='M1.29 9.277c-.181.19-.29.45-.29.71 0 .26.109.52.29.71.189.18.45.29.71.29.26 0 .519-.11.71-.29.18-.19.29-.45.29-.71 0-.26-.11-.52-.29-.71-.38-.37-1.05-.37-1.42 0M10 9H6a1 1 0 1 0 0 2h4a1 1 0 1 0 0-2M6 3h4a1 1 0 1 0 0-2H6a1 1 0 1 0 0 2m4 2H6a1 1 0 1 0 0 2h4a1 1 0 1 0 0-2M1.29 1.277c.37-.37 1.04-.37 1.42 0 .18.19.29.45.29.71 0 .26-.11.52-.29.71-.191.18-.45.29-.71.29-.26 0-.521-.11-.71-.29-.181-.19-.29-.45-.29-.71 0-.26.109-.52.29-.71zM2.55 5.17c.06.03.11.08.16.12.18.19.29.45.29.71 0 .26-.11.521-.29.71-.05.04-.1.09-.16.12a.559.559 0 0 1-.17.09c-.06.03-.12.05-.19.06-.06.01-.13.02-.19.02-.26 0-.52-.11-.71-.29A1.05 1.05 0 0 1 1 6c0-.26.11-.52.29-.71.24-.23.58-.34.9-.269a.6.6 0 0 1 .19.058c.06.021.12.051.17.091z'%3E%3C/path%3E%3C/svg%3E") no-repeat;
 	-webkit-mask: var(--mask);
@@ Строка 2053: / Строка 2157: @@
      gap: 6px;
      font-size: var(--font-size-s);
+    flex-wrap: wrap;
 }
@@ Строка 2090: / Строка 2195: @@
 .js-project-menu input#project-WL + label {
      color: var(--text-color-dark-salmon);
-     border-bottom-color: var(--text-color-darksalmon);
+     border-bottom-color: var(--text-color-dark-salmon);
+    background: var(--bg-color-rust-dark);
 }
@@ Строка 2096: / Строка 2202: @@
      color: var(--text-color-turquoise);
      border-bottom-color: var(--text-color-turquoise);
+    background: var(--bg-color-emerald-dark);
 }
@@ Строка 2101: / Строка 2208: @@
      color: var(--text-color-violet);
      border-bottom-color: var(--text-color-violet);
+    background: var(--bg-color-violet-dark);
 }
@@ Строка 2106: / Строка 2214: @@
      color: var(--text-color-silver);
      border-bottom-color: var(--text-color-silver);
+    background: var(--bg-color-grey-dark);
 }
@@ Строка 2117: / Строка 2226: @@
      color: var(--text-color-pink);
      border-bottom-color: var(--text-color-pink);
+    background: var(--bg-color-pink-dark);
 }
@@ Строка 3319: / Строка 3429: @@
 table.druid-container {
+	display: table;
 	background: var(--theme-bg-color-150);
 	float: right;
@@ Строка 4009: / Строка 4120: @@
 .cdx-input-chip,
 .ve-init-mw-progressBarWidget,
-.mwe-vue-pt-showing-filter-chip {
+.mwe-vue-pt-showing-filter-chip,
+.mw-twocolconflict-single-column, .mw-twocolconflict-split-column,
+.mw-twocolconflict-single-column.mw-twocolconflict-split-copy, .mw-twocolconflict-split-column.mw-twocolconflict-split-copy {
 	background: var(--ooui-bg-color-dark);
 }
@@ Строка 4121: / Строка 4234: @@
 ul.fileupload-results li.ful-success,
 #mwe-vue-pt-stats-navigation,
-.mw-notification.mw-notification-type-success {
+.mw-notification.mw-notification-type-success,
+.mw-twocolconflict-special-your-version-header .mw-twocolconflict-revision-label, .mw-twocolconflict-split-your-version-header .mw-twocolconflict-revision-label,
+.mw-twocolconflict-single-column ins.mw-twocolconflict-diffchange, .mw-twocolconflict-split-column ins.mw-twocolconflict-diffchange {
 	background: var(--bg-color-message);
+}
+.mw-twocolconflict-split-selection > div:nth-child(2) .oo-ui-radioInputWidget.oo-ui-widget-enabled [type='radio']:checked + span, .mw-twocolconflict-split-selection > div:nth-child(2) .oo-ui-radioInputWidget.oo-ui-widget-enabled [type='radio']:active + span, .mw-twocolconflict-split-selection > div:nth-child(2) .oo-ui-radioInputWidget [type='radio'] + span,
+.mw-twocolconflict-single-column.mw-twocolconflict-split-unselected ins.mw-twocolconflict-diffchange, .mw-twocolconflict-split-column.mw-twocolconflict-split-unselected ins.mw-twocolconflict-diffchange {
+	background-color: var(--bg-color-message-subtle);
 }
@@ Строка 4180: / Строка 4300: @@
 .cdx-message--warning,
-.oo-ui-messageWidget.oo-ui-messageWidget-block.oo-ui-flaggedElement-warning {
+.oo-ui-messageWidget.oo-ui-messageWidget-block.oo-ui-flaggedElement-warning,
+.mw-twocolconflict-split-current-version-header .mw-twocolconflict-revision-label,
+.mw-twocolconflict-single-column del.mw-twocolconflict-diffchange, .mw-twocolconflict-split-column del.mw-twocolconflict-diffchange {
 	background: var(--bg-color-warning);
 }
@@ Строка 4202: / Строка 4324: @@
 .mw-notification.mw-notification-type-warn,
-.mw-destfile-warning {
+.mw-destfile-warning,
+.mw-twocolconflict-split-selection > div:nth-child(1) .oo-ui-radioInputWidget.oo-ui-widget-enabled [type='radio']:checked + span, .mw-twocolconflict-split-selection > div:nth-child(1) .oo-ui-radioInputWidget.oo-ui-widget-enabled [type='radio']:active + span, .mw-twocolconflict-split-selection > div:nth-child(1) .oo-ui-radioInputWidget [type='radio'] + span,
+.mw-twocolconflict-single-column.mw-twocolconflict-split-unselected del.mw-twocolconflict-diffchange, .mw-twocolconflict-split-column.mw-twocolconflict-split-unselected del.mw-twocolconflict-diffchange {
 	background-color: var(--bg-color-warning-subtle);
 }
@@ Строка 4336: / Строка 4460: @@
 .cdx-info-chip,
 #mwe-vue-pt-control-dropdown,
-.cdx-radio__input:enabled+.cdx-radio__icon {
+.cdx-radio__input:enabled+.cdx-radio__icon,
+.mw-twocolconflict-single-column.mw-twocolconflict-split-copy, .mw-twocolconflict-split-column.mw-twocolconflict-split-copy {
 	border-color: var(--ooui-border-color-light);
 }
@@ Строка 4377: / Строка 4502: @@
 .oo-ui-messageWidget.oo-ui-messageWidget-block.oo-ui-flaggedElement-success,
 #mwe-vue-pt-stats-navigation,
-.mw-notification.mw-notification-type-success {
+.mw-notification.mw-notification-type-success,
+.mw-twocolconflict-single-column.mw-twocolconflict-split-unselected.mw-twocolconflict-split-add, .mw-twocolconflict-split-column.mw-twocolconflict-split-unselected.mw-twocolconflict-split-add,
+.mw-twocolconflict-split-selection > div:nth-child(2) .oo-ui-radioInputWidget.oo-ui-widget-enabled [type='radio']:checked + span, .mw-twocolconflict-split-selection > div:nth-child(2) .oo-ui-radioInputWidget.oo-ui-widget-enabled [type='radio']:active + span, .mw-twocolconflict-split-selection > div:nth-child(2) .oo-ui-radioInputWidget [type='radio'] + span {
 	border-color: var(--border-color-message);
 }
@@ Строка 4383: / Строка 4510: @@
 .mw-twocolconflict-single-column.mw-twocolconflict-split-delete, .mw-twocolconflict-split-column.mw-twocolconflict-split-delete,
 .cdx-message--warning,
-.oo-ui-messageWidget.oo-ui-messageWidget-block.oo-ui-flaggedElement-warning {
+.oo-ui-messageWidget.oo-ui-messageWidget-block.oo-ui-flaggedElement-warning,
+.mw-twocolconflict-single-column.mw-twocolconflict-split-unselected.mw-twocolconflict-split-delete, .mw-twocolconflict-split-column.mw-twocolconflict-split-unselected.mw-twocolconflict-split-delete,
+.mw-twocolconflict-split-selection > div:nth-child(1) .oo-ui-radioInputWidget.oo-ui-widget-enabled [type='radio']:checked + span, .mw-twocolconflict-split-selection > div:nth-child(1) .oo-ui-radioInputWidget.oo-ui-widget-enabled [type='radio']:active + span, .mw-twocolconflict-split-selection > div:nth-child(1) .oo-ui-radioInputWidget [type='radio'] + span {
 	border-color: var(--border-color-warning);
 }
@@ Строка 4639: / Строка 4768: @@
 .mw-body-content .recent-questions-growthexperiments-help-questions h3, .overlay-content .recent-questions-growthexperiments-help-questions h3, .content .recent-questions-growthexperiments-help-questions h3, .mw-body-content .recent-questions-growthexperiments-mentor-questions h3, .overlay-content .recent-questions-growthexperiments-mentor-questions h3, .content .recent-questions-growthexperiments-mentor-questions h3,
 .mw-body-content .recent-questions-growthexperiments-help-questions .question-posted-on, .overlay-content .recent-questions-growthexperiments-help-questions .question-posted-on, .content .recent-questions-growthexperiments-help-questions .question-posted-on, .mw-body-content .recent-questions-growthexperiments-mentor-questions .question-posted-on, .overlay-content .recent-questions-growthexperiments-mentor-questions .question-posted-on, .content .recent-questions-growthexperiments-mentor-questions .question-posted-on,
-.mwe-vue-pt-snippet {
+.mwe-vue-pt-snippet,
+.mw-twocolconflict-single-column.mw-twocolconflict-split-unselected, .mw-twocolconflict-split-column.mw-twocolconflict-split-unselected {
 	color: var(--ooui-text-color-dark);
 }
@@ Строка 4749: / Строка 4879: @@
 .wikiEditor-ui-toolbar .page-characters div span,
 .cdx-toggle-button--framed:enabled,
-.cdx-info-chip--text {
+.cdx-info-chip--text,
+.mw-twocolconflict-single-column, .mw-twocolconflict-split-column {
 	color: var(--ooui-text-color);
 }
@@ Строка 4850: / Строка 4981: @@
 /* Остальное */
+.mw-twocolconflict-single-column .mw-twocolconflict-split-collapsed .mw-twocolconflict-split-fade, .mw-twocolconflict-split-column .mw-twocolconflict-split-collapsed .mw-twocolconflict-split-fade {
+    background-image: linear-gradient(rgba(255, 255, 255, 0), var(--ooui-bg-color-light));
+}
 .mw-ge-help-panel-processdialog .suggested-edits-panel-quick-start-tips-content .growthexperiments-quickstart-tips-tip mark {
 	mix-blend-mode: unset;

MediaWiki:Common.css: различия между версиями