aboutsummaryrefslogtreecommitdiff
path: root/js/ui/menu
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-18 15:16:43 -0700
committerValerio Virgillito2012-07-18 15:16:43 -0700
commitfc09eeb4bbc4e1e9c0e63a8e5959271ca7a3a59b (patch)
tree45d78659e1e02afe324536d5d6ede838ce76539b /js/ui/menu
parent819348eaf3ff6b4a8c38ecca7c18f6dacac7f03b (diff)
downloadninja-fc09eeb4bbc4e1e9c0e63a8e5959271ca7a3a59b.tar.gz
fixed more menu bugs
- Adding top right round corner on submenu - Fixed wrong checkmark on draw 3d grid. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ui/menu')
-rw-r--r--js/ui/menu/menu-controller.js4
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.css3
2 files changed, 4 insertions, 3 deletions
diff --git a/js/ui/menu/menu-controller.js b/js/ui/menu/menu-controller.js
index b6e045db..d93e96bd 100644
--- a/js/ui/menu/menu-controller.js
+++ b/js/ui/menu/menu-controller.js
@@ -55,7 +55,7 @@ exports.MenuController = Montage.create(Component, {
55 55
56 if(this._currentDocument && this._currentDocument.currentView === "design") { 56 if(this._currentDocument && this._currentDocument.currentView === "design") {
57 document.application.model.show3dGrid = this._currentDocument.model.draw3DGrid; 57 document.application.model.show3dGrid = this._currentDocument.model.draw3DGrid;
58 this.topLevelMenu[2].entries[4].checked = this._currentDocument.model.draw3DGrid; 58 this.topLevelMenu[2].entries[5].checked = this._currentDocument.model.draw3DGrid;
59 } 59 }
60 60
61 if(!this._currentDocument) { 61 if(!this._currentDocument) {
@@ -150,7 +150,7 @@ exports.MenuController = Montage.create(Component, {
150 150
151 handlegrid: { 151 handlegrid: {
152 value: function(value) { 152 value: function(value) {
153 this.topLevelMenu[2].entries[4].checked = !this.topLevelMenu[2].entries[4].checked; 153 this.topLevelMenu[2].entries[5].checked = !this.topLevelMenu[2].entries[5].checked;
154 document.application.model.show3dGrid = this.topLevelMenu[2].entries[4].checked; 154 document.application.model.show3dGrid = this.topLevelMenu[2].entries[4].checked;
155 } 155 }
156 }, 156 },
diff --git a/js/ui/menu/menu-item.reel/menu-item.css b/js/ui/menu/menu-item.reel/menu-item.css
index f3683492..cb495b43 100755
--- a/js/ui/menu/menu-item.reel/menu-item.css
+++ b/js/ui/menu/menu-item.reel/menu-item.css
@@ -129,12 +129,13 @@ POSSIBILITY OF SUCH DAMAGE.
129 top: 0%; 129 top: 0%;
130 left: 100%; 130 left: 100%;
131 margin-top: 1px; 131 margin-top: 1px;
132 margin-left: 1px; 132 /*margin-left: 1px;*/
133 float:left; 133 float:left;
134 font-family: 'Droid Sans', sans-serif !important; 134 font-family: 'Droid Sans', sans-serif !important;
135 color: #ffffff; 135 color: #ffffff;
136 background: #494949; 136 background: #494949;
137 /*border: 1px solid #292929;*/ 137 /*border: 1px solid #292929;*/
138 border-top-right-radius: 5px;
138 border-bottom-right-radius: 5px; 139 border-bottom-right-radius: 5px;
139 border-bottom-left-radius: 5px; 140 border-bottom-left-radius: 5px;
140 /*border-radius: 8px;*/ 141 /*border-radius: 8px;*/