From 96dd08130e5fdee9c170db42ae39c87012d1cea7 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 24 Jun 2015 14:39:59 -0700
Subject: [PATCH] long titles fixed
---
css/main.css | 8 ++++++++
js/menus/templates/MaterialMenuView.html | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/css/main.css b/css/main.css
index d6487f63..880dcf24 100644
--- a/css/main.css
+++ b/css/main.css
@@ -417,6 +417,14 @@ label.colorSwatches>span.icons{
margin-left:20px;
}
+.materialListTitle{
+ display: inline-flex;
+ max-width: 220px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
.red {
color:red;
}
diff --git a/js/menus/templates/MaterialMenuView.html b/js/menus/templates/MaterialMenuView.html
index 92ccacb3..353fcd6a 100644
--- a/js/menus/templates/MaterialMenuView.html
+++ b/js/menus/templates/MaterialMenuView.html
@@ -14,7 +14,7 @@ Material Class:
<input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio appState"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
<div class="materialColorSwatch">
<div style="background-color:<% if(realisticColorScheme){ %><%= allMaterials[materialClass][key].color %><% }else{ %><%= allMaterials[materialClass][key].altColor %><% } %>"></div>
- <span><%= allMaterials[materialClass][key].name %><a data-id="<%= key %>" class="editMaterial">Settings...</a></span></div>
+ <span><span class="materialListTitle"><%= allMaterials[materialClass][key].name %></span><a data-id="<%= key %>" class="editMaterial">Edit...</a></span></div>
</label>
<% }); %><br/>
<label class="checkbox" for="realisticColorScheme">
@@ -32,7 +32,7 @@ Composite Materials:<br/>
<input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio appState"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
<div class="materialColorSwatch">
<div style="background-color:<% if(realisticColorScheme){ %><%= materials[key].color %><% }else{ %><%= materials[key].altColor %><% } %>"></div>
- <span><%= materials[key].name %><a data-id="<%= key %>" class="editComposite">Settings...</a></span></div>
+ <span><span class="materialListTitle"><%= materials[key].name %></span><a data-id="<%= key %>" class="editComposite">Edit...</a></span></div>
</label>
<% }); %><br/>
<% if (_.filter(_.keys(materials), function(name){return name.substr(0,5) == "super"; }).length > 0) { %>
--
GitLab