jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337853 )

Change subject: Change button padding to be more slim
......................................................................


Change button padding to be more slim

As for UX feedback already a while ago. Also adjusted editor top
marigns again. This should now fit in most of the cases.

Change-Id: I571b247ed91abb1ffa8b80c323e55e4545c7b1ed
---
M modules/ext.TwoColConflict.css
1 file changed, 7 insertions(+), 6 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ext.TwoColConflict.css b/modules/ext.TwoColConflict.css
index c4fa30e..7c95109 100644
--- a/modules/ext.TwoColConflict.css
+++ b/modules/ext.TwoColConflict.css
@@ -20,12 +20,12 @@
 
 .mw-twocolconflict-editor-col.mw-twocolconflict-js
 .mw-twocolconflict-col-desc {
-       margin-bottom: 85px;  /* diff-options height - editor-toolbar height */
+       margin-bottom: 74px;  /* diff-options height - editor-toolbar height */
 }
 
 .mw-twocolconflict-editor-col.mw-twocolconflict-js.mw-twocolconflict-wikieditor
 .mw-twocolconflict-col-desc {
-       margin-bottom: 75px;  /* diff-options height - editor-toolbar height */
+       margin-bottom: 62px;  /* diff-options height - editor-toolbar height */
 }
 
 .mw-twocolconflict-form .editOptions {
@@ -229,10 +229,6 @@
        padding: 0 10px 0 10px;
 }
 
-.mw-twocolconflict-filter-options-btn .oo-ui-fieldLayout-body {
-       min-width: 120px;
-}
-
 .mw-twocolconflict-filter-options-btn-mine-both div:nth-of-type( 1 ) 
.oo-ui-fieldLayout-body {
        background: -webkit-linear-gradient( bottom, rgba( 255, 236, 96, 1 ) 
50%, rgba( 173, 216, 230, 1 ) 50% );
        background: -moz-linear-gradient( bottom, rgba( 255, 236, 96, 1 ) 50%, 
rgba( 173, 216, 230, 1 ) 50% );
@@ -244,3 +240,8 @@
 .mw-twocolconflict-filter-options-btn-mine-both div:nth-of-type( 2 ) 
.oo-ui-fieldLayout-body {
        background: rgba( 255, 236, 96, 1 );
 }
+
+.mw-twocolconflict-filter-options-btn.oo-ui-radioSelectInputWidget 
.oo-ui-fieldLayout .oo-ui-fieldLayout-body {
+       min-width: 120px;
+       padding: 0 0.25em;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/337853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I571b247ed91abb1ffa8b80c323e55e4545c7b1ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to