Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
OrigamiSimulator
Commits
2d129a0b
Commit
2d129a0b
authored
Feb 25, 2017
by
amandaghassaei
Browse files
nav
parent
33802c8b
Changes
6
Hide whitespace changes
Inline
Side-by-side
main.css
→
css/
main.css
View file @
2d129a0b
...
...
@@ -20,12 +20,13 @@ body{
not supported by any browser */
}
#controls
{
position
:
absolute
;
top
:
0
;
right
:
0
;
width
:
420px
;
padding
:
20px
20px
;
padding
:
70px
20px
20px
20px
;
overflow
:
auto
;
height
:
100%
;
/*background: rgba(255,255,255,0.5);*/
...
...
@@ -38,7 +39,7 @@ body{
top
:
0
;
left
:
0
;
/*width: 420px;*/
padding
:
2
0px
20px
20px
20px
;
padding
:
7
0px
20px
20px
20px
;
max-height
:
100%
;
overflow
:
auto
;
}
...
...
@@ -61,11 +62,12 @@ body{
display
:
none
;
}
a
{
a
,
a
:hover
,
a
:visited
,
a
:focus
{
color
:
#8cbaed
;
}
a
:hover
{
color
:
#8cbaed
;
a
.btn
:visited
,
a
.btn
:focus
{
color
:
white
;
}
.editable
{
...
...
@@ -117,25 +119,13 @@ input.form-control {
margin-bottom
:
10px
;
}
img
{
width
:
60px
;
/*position: absolute;*/
top
:
0
;
left
:
0
;
z-index
:
5
;
/*margin:20px;*/
margin-bottom
:
20px
;
}
#activeLogo
{
display
:
none
;
}
#threeContainer
{
width
:
100%
;
height
:
100%
;
padding
:
0
;
position
:
absolute
;
top
:
0px
;
left
:
0px
;
}
...
...
@@ -271,16 +261,6 @@ span.modal-close{
direction
:
ltr
;
}
.dropdown-toggle
{
width
:
220px
;
text-align
:
right
;
}
.dropdown-toggle
>
span
.dropdownLabel
{
width
:
165px
;
display
:
inline-block
;
text-align
:
left
;
}
.paddingBottom
{
margin-bottom
:
20px
;
}
...
...
css/nav.css
0 → 100644
View file @
2d129a0b
.navbar
{
margin-bottom
:
0
;
z-index
:
5
;
border-radius
:
0
;
background
:
rgba
(
68
,
68
,
68
,
0.8
);
}
.navbar-inverse
.navbar-nav
>
li
>
a
{
-webkit-border-radius
:
0
!important
;
-moz-border-radius
:
0
!important
;
border-radius
:
0
!important
;
}
.navbar-inverse
.navbar-nav
>
li
>
a
,
.navbar-inverse
.navbar-nav
>
li
>
a
:visited
,
.navbar-inverse
.navbar-nav
>
li
>
a
:focus
{
color
:
white
;
}
.navbar-inverse
.navbar-nav
>
li
>
a
:hover
{
color
:
#ddd
;
}
.navbar-inverse
.navbar-nav
>
.open
>
a
,
.navbar-inverse
.navbar-nav
>
.open
>
a
:focus
{
background-color
:
#bbb
;
}
.navbar-inverse
.navbar-nav
>
.open
>
.dropdown-menu
{
background-color
:
#646464
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
padding
:
0
;
margin
:
0
;
}
.navbar-inverse
.navbar-nav
>
.open
>
.dropdown-menu
>
li
>
a
{
-webkit-border-radius
:
0
!important
;
-moz-border-radius
:
0
!important
;
border-radius
:
0
!important
;
padding
:
7px
20px
;
}
.navbar-inverse
.navbar-nav
>
.open
>
.dropdown-menu
>
li
>
a
:hover
,
.navbar-inverse
.navbar-nav
>
.open
>
.dropdown-menu
>
li
>
a
:focus
{
background-color
:
#bbb
;
}
.navbar-inverse
.navbar-nav
>
.dropdown
>
a
.caret
,
.navbar-inverse
.navbar-nav
>
.dropdown
>
a
:focus
.caret
,
.navbar-inverse
.navbar-nav
>
.dropdown
>
a
:visited
.caret
{
border-top-color
:
white
;
border-bottom-color
:
white
;
}
.navbar-inverse
.navbar-nav
>
.dropdown
>
a
:hover
.caret
{
border-top-color
:
#ddd
;
border-bottom-color
:
#ddd
;
}
.divider
{
margin-right
:
0
!important
;
margin-left
:
0
!important
;
background-color
:
#555
!important
;
}
#fileSelector
{
display
:
none
;
}
img
{
width
:
45px
;
top
:
0
;
left
:
0
;
z-index
:
5
;
}
#activeLogo
{
display
:
none
;
}
#logo
{
padding
:
5px
50px
5px
30px
;
}
\ No newline at end of file
favicon.ico
0 → 100644
View file @
2d129a0b
1.37 KB
index.html
View file @
2d129a0b
...
...
@@ -7,7 +7,9 @@
<link
href=
"dependencies/bootstrap.min.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"dependencies/flat-ui.min.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"dependencies/jquery-ui.min.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"main.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/nav.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/main.css"
/>
<script
id=
"vertexShader"
type=
"x-shader/x-vertex"
>
attribute
vec2
a_position
;
...
...
@@ -254,14 +256,47 @@
<script
type=
"text/javascript"
src=
"js/main.js"
></script>
</head>
<body>
<nav
id=
"globalNav"
class=
"navbar navbar-inverse navbar-embossed"
role=
"navigation"
>
<div
class=
"navbar-header"
>
<a
id=
"logo"
class=
"navbar-brand"
target=
"_blank"
href=
"http://cba.mit.edu/"
>
<img
id=
"inactiveLogo"
src=
"logo.png"
/>
<img
id=
"activeLogo"
src=
"logo-active.png"
/>
</a>
</div>
<div
class=
"collapse navbar-collapse"
id=
"navbar-collapse-01"
>
<ul
class=
"nav navbar-nav navbar-left"
>
<li
class=
"dropdown navDropdown"
>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
File
<b
class=
"caret"
></b></a>
<span
class=
"dropdown-arrow"
></span>
<ul
class=
"dropdown-menu"
>
<li><a
class=
"loadFile"
href=
"#"
>
Import SVG...
</a></li>
<li
class=
"divider"
></li>
<li><a
id=
"saveSVG"
href=
"#"
>
Save Pattern as SVG
</a></li>
<li><a
id=
"exportSTL"
href=
"#"
>
Save Simulation as STL...
</a></li>
</ul>
</li>
<li><a
data-menu-id=
"navDesign"
class=
"menuHoverControls"
href=
"#"
>
Pattern
</a></li>
<li><a
data-menu-id=
"navSim"
class=
"menuHoverControls"
href=
"#"
>
Simulation
</a></li>
<!--<li class="dropdown navDropdown">-->
<!--<a href="#" class="dropdown-toggle" id="viewMenuDropdown" data-toggle="dropdown">View <b class="caret"></b></a>-->
<!--<span class="dropdown-arrow"></span>-->
<!--<ul id="navViewMenu" class="dropdown-menu">-->
<!--<li><a href="#">thing1</a></li>-->
<!--<li><a href="#">things2</a></li>-->
<!--</ul>-->
<!--</li>-->
<li><a
id=
"about"
class=
"menuHoverControls"
target=
"_blank"
href=
"#"
>
About
</a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
<input
id=
"fileSelector"
type=
"file"
>
</nav>
<div
id=
"threeContainer"
></div>
<canvas
id=
"gpuMathCanvas"
></canvas>
<div
id=
"controlsLeft"
class=
"flipped"
>
<div>
<a
id=
"logo"
target=
"_blank"
href=
"http://cba.mit.edu/"
>
<img
id=
"inactiveLogo"
src=
"logo.png"
/>
<img
id=
"activeLogo"
src=
"logo-active.png"
/>
</a><br/>
3D View:
<div
class=
"indent"
>
<label
class=
"checkbox"
for=
"dynamic"
>
...
...
@@ -292,8 +327,6 @@
<div
class=
"extraSpace"
></div>
</div>
<div
id=
"controls"
>
<a
href=
"#"
id=
"about"
class=
"btn btn-lg btn-default"
>
About
</a><br/><br/>
<div
class=
"sliderInput"
id=
"creasePercent"
>
<span
class=
"label-slider"
>
Crease Angle :
</span><div
class=
"flat-slider ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content"
></div>
<input
value=
""
placeholder=
""
class=
"form-control int"
type=
"text"
>
...
...
js/controls.js
View file @
2d129a0b
...
...
@@ -78,7 +78,11 @@ function initControls(globals){
}
setLink
(
"
#resetDynamicSim
"
,
function
(){
globals
.
dynamicModel
.
reset
();
globals
.
shouldResetDynamicSim
=
true
;
});
setLink
(
"
.loadFile
"
,
function
(){
$
(
"
#fileSelector
"
).
click
();
});
function
setButtonGroup
(
id
,
callback
){
...
...
logo.png
View replaced file @
33802c8b
View file @
2d129a0b
4.61 KB
|
W:
|
H:
4.29 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment