Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DMDesign
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Amanda Ghassaei
DMDesign
Commits
36913dce
Commit
36913dce
authored
Jul 12, 2015
by
Amanda Ghassaei
Browse files
Options
Downloads
Patches
Plain Diff
aspect ratio
parent
c76d3fd7
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
css/main.css
+1
-1
1 addition, 1 deletion
css/main.css
js/menus/LatticeMenuView.js
+3
-1
3 additions, 1 deletion
js/menus/LatticeMenuView.js
js/menus/templates/LatticeMenuView.html
+4
-0
4 additions, 0 deletions
js/menus/templates/LatticeMenuView.html
with
8 additions
and
2 deletions
css/main.css
+
1
−
1
View file @
36913dce
...
@@ -216,7 +216,7 @@ hr {
...
@@ -216,7 +216,7 @@ hr {
}
}
input
.intInput
,
input
.floatInput
{
input
.intInput
,
input
.floatInput
{
width
:
2
2
%
;
width
:
2
1
%
;
display
:
inline
;
display
:
inline
;
padding
:
8px
8px
;
padding
:
8px
8px
;
}
}
...
...
This diff is collapsed.
Click to expand it.
js/menus/LatticeMenuView.js
+
3
−
1
View file @
36913dce
...
@@ -16,7 +16,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!latticeM
...
@@ -16,7 +16,9 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'text!latticeM
},
},
_makeTemplateJSON
:
function
(){
_makeTemplateJSON
:
function
(){
return
_
.
extend
(
_
.
extend
(
lattice
.
toJSON
(),
this
.
model
.
toJSON
()),
plist
);
var
aspectRatio
=
{
aspectRatio
:
{
x
:
1
,
y
:
1
,
z
:
1
}};
if
(
lattice
.
xScale
)
aspectRatio
=
{
aspectRatio
:
{
x
:
lattice
.
xScale
(
0
),
y
:
lattice
.
yScale
(
0
),
z
:
lattice
.
zScale
(
0
)}};
return
_
.
extend
(
_
.
extend
(
lattice
.
toJSON
(),
this
.
model
.
toJSON
()),
plist
,
aspectRatio
);
},
},
template
:
_
.
template
(
template
)
template
:
_
.
template
(
template
)
...
...
This diff is collapsed.
Click to expand it.
js/menus/templates/LatticeMenuView.html
+
4
−
0
View file @
36913dce
...
@@ -16,6 +16,10 @@ Cell Connection:
...
@@ -16,6 +16,10 @@ Cell Connection:
<
%
});
%
>
<
%
});
%
>
</ul>
</ul>
</div><br/><br/>
</div><br/><br/>
Aspect Ratio:
<input
data-property=
"aspectRatio"
data-key=
"x"
value=
"<%= aspectRatio.x %>"
placeholder=
"X"
class=
"form-control floatInput"
type=
"text"
>
<input
data-property=
"aspectRatio"
data-key=
"y"
value=
"<%= aspectRatio.y %>"
placeholder=
"Y"
class=
"form-control floatInput"
type=
"text"
>
<input
data-property=
"aspectRatio"
data-key=
"z"
value=
"<%= aspectRatio.z %>"
placeholder=
"Z"
class=
"form-control floatInput"
type=
"text"
><br/><br/>
<
%
if
(connectionType =
=
"
gik
")
{
%
>
<
%
if
(connectionType =
=
"
gik
")
{
%
>
GIK Length:
<input
data-property=
"gikLength"
value=
"<%= gikLength %>"
placeholder=
"GIK length"
class=
"form-control intInput appState"
type=
"text"
><br/><br/>
GIK Length:
<input
data-property=
"gikLength"
value=
"<%= gikLength %>"
placeholder=
"GIK length"
class=
"form-control intInput appState"
type=
"text"
><br/><br/>
<
%
}
%
>
<
%
}
%
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment