jenkins-bot has submitted this change and it was merged.
Change subject: Adjusted styles to UX review
......................................................................
Adjusted styles to UX review
Moved padding from editor to diff boxes to avoid colored "margins".
Added colored leading borders to changes blocks.
Change-Id: Idfe7bf678062aac182f1cd79788e630cc1baff86
---
M modules/ext.TwoColConflict.css
1 file changed, 26 insertions(+), 6 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.TwoColConflict.css b/modules/ext.TwoColConflict.css
index 5d15120..f1a9502 100644
--- a/modules/ext.TwoColConflict.css
+++ b/modules/ext.TwoColConflict.css
@@ -49,7 +49,6 @@
text-shadow: none;
text-align: start;
overflow: auto;
- padding: 2px;
width: 100%;
height: 400px;
background-color: #f2f2f2;
@@ -80,22 +79,43 @@
text-decoration: none;
}
-.mw-twocolconflict-diffchange-own,
-.mw-twocolconflict-diffchange-foreign,
-.mw-twocolconflict-diffchange-same {
- margin: 5px 0 3px 0;
+.mw-twocolconflict-diffchange-foreign, .mw-twocolconflict-diffchange-own {
+ margin: 0 0 0.3em 0.3em;
+ padding: 0 0.3em 0 0.3em;
+ border-left-width:2px;
+ border-left-style:solid;
+}
+
+.mw-twocolconflict-diffchange-foreign{
+ border-left-color:#3879ec;
+}
+
+.mw-twocolconflict-diffchange-own{
+ border-left-color:#ff8c00;
}
.mw-twocolconflict-diffchange-same {
background-color: #e2e2e2;
+ padding: 0 0.3em 0 0.5em;
+ margin: 1em 0 1em 0;
+}
+
+#mw-twocolconflict-changes-editor
.mw-twocolconflict-diffchange-same:first-child {
+ margin: 0 0 1em 0;
+}
+
+#mw-twocolconflict-changes-editor
.mw-twocolconflict-diffchange-same:last-child {
+ margin: 1em 0 0 0;
}
.mw-twocolconflict-diffchange-own .mw-twocolconflict-diffchange-title,
.mw-twocolconflict-diffchange-foreign .mw-twocolconflict-diffchange-title {
color: white;
padding: 1px 2px;
+ margin-left: -4px;
font-weight: bold;
- border-radius: 2px;
+ font-family: sans-serif;
+ font-size: 0.7em;
-webkit-touch-callout: none; /* iOS Safari */
-webkit-user-select: none;
-khtml-user-select: none; /* Konqueror */
--
To view, visit https://gerrit.wikimedia.org/r/323534
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfe7bf678062aac182f1cd79788e630cc1baff86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-jand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
