Permalink
Browse files

prepare for front screen integration

  • Loading branch information...
1 parent aed43e8 commit 1a994f634d24853c818d735768e852b7a8825f7c @kloknibor kloknibor committed Oct 20, 2016
Showing with 59 additions and 53 deletions.
  1. +4 −4 css/main.css
  2. +55 −49 index.html
View
@@ -8,13 +8,13 @@
#sidebar {
position: fixed;
top: 51px;
- bottom: 0;
+ bottom: 0;
left: 0;
width: 300px;
padding: 10px;
overflow-y: auto;
overflow-x: hidden;
- background-color: #f5f5f5;
+ /* background-color: #f5f5f5; */
border-right: 1px solid #eeeeee;
}
@@ -24,11 +24,11 @@
background-color: #eeeeee;
border: 1px dashed #cccccc;
}
-
+/*
#sidebar .panel-body {
padding-bottom: 0;
}
-
+*/
#sidebar .info {
margin-bottom: 10px;
}
View
@@ -5,32 +5,15 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>SLAcer.js (bêta)</title>
- <link rel="stylesheet" type="text/css" href="vendor/jquery-ui/jquery-ui.min.css" />
- <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css" />
- <link rel="stylesheet" type="text/css" href="vendor/bootstrap-slider/css/bootstrap-slider.min.css" />
- <link rel="stylesheet" type="text/css" href="vendor/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css" />
- <link rel="stylesheet" type="text/css" href="css/main.css" />
- </head>
+ <link rel="stylesheet" type="text/css" href="/slacer/vendor/jquery-ui/jquery-ui.min.css" />
+ <link rel="stylesheet" type="text/css" href="/slacer/vendor/bootstrap-slider/css/bootstrap-slider.min.css" />
+ <link rel="stylesheet" type="text/css" href="/slacer/vendor/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css" />
+ <link rel="stylesheet" type="text/css" href="/slacer/css/main.css" />
+ <!-- <link rel="stylesheet" type="text/css" href="/slacer/vendor/bootstrap/css/bootstrap.min.css" /> -->
+
+ </head>
<body>
- <nav class="navbar navbar-inverse navbar-fixed-top">
- <div class="container-fluid">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#">SLAcer.js (bêta)</a>
- </div>
- <div id="navbar" class="navbar-collapse collapse">
- <ul class="nav navbar-nav navbar-right">
- <li><a href="#">About</a></li>
- <li><a href="https://github.com/lautr3k/SLAcer.js">GitHub</a></li>
- </ul>
- </div>
- </div>
- </nav><!-- .navbar -->
+
<div class="body container-fluid">
<div id="sidebar">
@@ -317,10 +300,23 @@ <h3 class="panel-title">Colors</h3>
<div id="main">
<div id="viewer3d" class="box fl">loading...</div>
+ <div id="printables">
+ <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
+ <a href="#">About</a>
+ <a href="#">Services</a>
+ <a href="#">Clients</a>
+ <a href="#">Contact</a>
+ </div>
</div><!-- #main -->
-
+
<div id="slider">
- <span class="max">100</span>
+
+
+ <span style="font-size:30px;cursor:pointer" onclick="openNav()">&#9776;</span>
+
+
+
+ <span class="max">100</span>
<input id="ex4" type="text"
data-slider-min="0"
data-slider-max="100"
@@ -339,27 +335,37 @@ <h3 class="panel-title">Colors</h3>
<p class="message">Alert message empty...</p>
</div>
- <script src="vendor/jquery-2.1.4.min.js" type="text/javascript"></script>
- <script src="vendor/jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
- <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
- <script src="vendor/bootstrap-slider/bootstrap-slider.min.js" type="text/javascript"></script>
- <script src="vendor/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js" type="text/javascript"></script>
- <script src="vendor/lodash.min.js" type="text/javascript"></script>
- <script src="vendor/three.min.js" type="text/javascript"></script>
- <script src="vendor/earcut.js" type="text/javascript"></script>
- <script src="vendor/triangulation.js" type="text/javascript"></script>
- <script src="js/slacer/settings.js" type="text/javascript"></script>
- <script src="js/slacer/mesh.js" type="text/javascript"></script>
- <script src="js/slacer/viewer.js" type="text/javascript"></script>
- <script src="vendor/OrbitControls.js" type="text/javascript"></script>
- <script src="js/slacer/viewcontrols.js" type="text/javascript"></script>
- <script src="js/slacer/viewer3d.js" type="text/javascript"></script>
- <script src="js/slacer/viewer2d.js" type="text/javascript"></script>
- <script src="js/slacer/slicer.js" type="text/javascript"></script>
- <script src="js/loader/stl.js" type="text/javascript"></script>
- <script src="vendor/FileSaver.min.js" type="text/javascript"></script>
- <script src="vendor/jszip.min.js" type="text/javascript"></script>
- <script src="js/main.js" type="text/javascript"></script>
- <script src="js/photonic3d.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/jquery-2.1.4.min.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/bootstrap-slider/bootstrap-slider.min.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/lodash.min.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/three.min.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/earcut.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/triangulation.js" type="text/javascript"></script>
+ <script src="/slacer/js/slacer/settings.js" type="text/javascript"></script>
+ <script src="/slacer/js/slacer/mesh.js" type="text/javascript"></script>
+ <script src="/slacer/js/slacer/viewer.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/OrbitControls.js" type="text/javascript"></script>
+ <script src="/slacer/js/slacer/viewcontrols.js" type="text/javascript"></script>
+ <script src="/slacer/js/slacer/viewer3d.js" type="text/javascript"></script>
+ <script src="/slacer/js/slacer/viewer2d.js" type="text/javascript"></script>
+ <script src="/slacer/js/slacer/slicer.js" type="text/javascript"></script>
+ <script src="/slacer/js/loader/stl.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/FileSaver.min.js" type="text/javascript"></script>
+ <script src="/slacer/vendor/jszip.min.js" type="text/javascript"></script>
+ <script src="/slacer/js/main.js" type="text/javascript"></script>
+ <script src="/slacer/js/photonic3d.js" type="text/javascript"></script>
+
+ <script>
+ function openNav() {
+ document.getElementById("printables").style.width = "250px";
+ }
+
+ function closeNav() {
+ document.getElementById("printables").style.width = "0";
+ }
+ </script>
</body>
</html>

0 comments on commit 1a994f6

Please sign in to comment.