From cb81da0923c4ef5430afe6214940f91071465412 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Fri, 20 Apr 2018 10:39:50 +0200
Subject: [PATCH] Fix display of column variables in the schema

---
 .../wikidata/module/MOD-INF/controller.js     |  2 +-
 ...ialog.less => schema-alignment-dialog.css} | 45 +++++--------------
 2 files changed, 11 insertions(+), 36 deletions(-)
 rename extensions/wikidata/module/styles/dialogs/{schema-alignment-dialog.less => schema-alignment-dialog.css} (88%)

diff --git a/extensions/wikidata/module/MOD-INF/controller.js b/extensions/wikidata/module/MOD-INF/controller.js
index d138cd42d..e2e36dda1 100644
--- a/extensions/wikidata/module/MOD-INF/controller.js
+++ b/extensions/wikidata/module/MOD-INF/controller.js
@@ -69,7 +69,7 @@ function init() {
       "project/styles",
       module,
       [
-        "styles/dialogs/schema-alignment-dialog.less",
+        "styles/dialogs/schema-alignment-dialog.css",
         "styles/dialogs/manage-account-dialog.less",
         "styles/dialogs/perform-edits.less",
       ]);
diff --git a/extensions/wikidata/module/styles/dialogs/schema-alignment-dialog.less b/extensions/wikidata/module/styles/dialogs/schema-alignment-dialog.css
similarity index 88%
rename from extensions/wikidata/module/styles/dialogs/schema-alignment-dialog.less
rename to extensions/wikidata/module/styles/dialogs/schema-alignment-dialog.css
index dd0166c92..7ab25a48b 100644
--- a/extensions/wikidata/module/styles/dialogs/schema-alignment-dialog.less
+++ b/extensions/wikidata/module/styles/dialogs/schema-alignment-dialog.css
@@ -1,36 +1,3 @@
-/*
-
-Copyright 2010, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,           
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY           
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
 @import-less url("../theme.less");
 
 .main-view-panel-tab-header#summary-bar {
@@ -118,6 +85,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     background-color: #eee;
     display: inline-block;
     padding-bottom: 3px;
+    max-width: 95%;
 }
 
 .ui-droppable .wbs-draggable-column {
@@ -132,12 +100,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 }
 
 .wbs-restricted-column-name {
-    max-width: 120px;
+    max-width: -moz-calc(100% - 20px);
+    max-width: -webkit-calc(100% - 20px);
+    max-width: -o-calc(100% - 20px);
+    max-width: calc(100% - 20px);
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     display: inline-block;
     vertical-align: middle;
+    white-space: nowrap;
+}
+
+.wbs-draggable-column .wbs-remove {
+    float: right;
 }
 
 .wbs-accepting-input {
@@ -153,7 +129,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    background-color: #ffbfbf;
 }
 
-// The following three rules are taken from Wikibase
 .wbs-icon {
     background-position: center;
     background-size: 20px 20px;