From bee6785b34cf60dad5e76762822936f0fa93bd64 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 10 Jun 2015 18:37:08 -0700
Subject: [PATCH] menu formatting
---
js/menus/CompositeMenu.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/js/menus/CompositeMenu.js b/js/menus/CompositeMenu.js
index 5ea2a530..716fb25b 100644
--- a/js/menus/CompositeMenu.js
+++ b/js/menus/CompositeMenu.js
@@ -60,12 +60,12 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _
<a id="saveComposite" href="#" class="btn btn-halfWidth btn-lg pull-right btn-default">Save Composite</a><br/><br/>\
Name: <input value="" placeholder="Enter Name" class="halfWidth form-control" type="text"><br/><br/>\
Bounding Box: ()<br/><br/>\
- Display Color:<br/>\
- <div style="background-color: <%= color %> ;" id="compositeDisplayColor"></div>\
- <input value="<%= color %>" placeholder="Enter HEX" class="halfWidth form-control" type="text"><br/>\
+ Display Color: \
+ <!--<div style="background-color: <%= color %> ;" id="compositeDisplayColor"></div>-->\
+ <input style="border-color: <%= color %> ;" value="<%= color %>" placeholder="Enter HEX" class="halfWidth form-control" type="text"><br/><br/>\
<a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Color</a><br/><br/>\
- <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>\
- <a id="cancelComposite" href="#" class="btn btn-block btn-lg btn-danger">Cancel / Exit</a><br/>\
+ <a id="finishComposite" href="#" class="btn btn-halfWidth btn-lg btn-success">Finish Composite</a>\
+ <a id="cancelComposite" href="#" class="btn btn-halfWidth pull-right btn-lg btn-default">Cancel / Exit</a><br/>\
\
')
--
GitLab