jenkins-bot has submitted this change and it was merged.

Change subject: Make sure the text of the permission box is cut exactly between 
lines
......................................................................


Make sure the text of the permission box is cut exactly between lines

Change-Id: I7a0a3056f6e3734579f1e04175e04c89ced92576
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/118
---
M resources/mmv/ui/mmv.ui.permission.less
1 file changed, 10 insertions(+), 6 deletions(-)

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



diff --git a/resources/mmv/ui/mmv.ui.permission.less 
b/resources/mmv/ui/mmv.ui.permission.less
index 1f53d73..011a484 100644
--- a/resources/mmv/ui/mmv.ui.permission.less
+++ b/resources/mmv/ui/mmv.ui.permission.less
@@ -6,14 +6,12 @@
        width: 90%;
        margin: 10px 5% 0;
 
-       max-height: 100px;
-
        &.empty {
                display: none;
        }
 
        h3 {
-               margin: 10px 10px;
+               margin: 10px;
                padding: 0;
                color: #565656;
        }
@@ -33,7 +31,15 @@
        }
 
        .mw-mlb-permission-text {
-               padding: 10px;
+               @text-font-size: 1em;
+               @text-line-height: 1.2;
+               @lines-shown: 3;
+
+               max-height: @lines-shown * @text-line-height * @text-font-size;
+               overflow: hidden;
+               margin: 0 10px 10px;
+               font-size: @text-font-size;
+               line-height: @text-line-height;
        }
 
        .mw-mlb-permission-html {
@@ -41,8 +47,6 @@
        }
 
        &.full-size {
-               max-height: none;
-
                .mw-mlb-permission-close {
                        display: block;
                }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a0a3056f6e3734579f1e04175e04c89ced92576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Aarcos <aarcos.w...@gmail.com>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to