Merge branch 'master' of github.com:Teras23/laphack-k-space

This commit is contained in:
teras
2017-10-08 11:48:02 +03:00
2 changed files with 267 additions and 177 deletions

View File

@@ -53,7 +53,6 @@ footer, .map {
} }
.card{ .card{
width: 800px;
margin: 0 auto; margin: 0 auto;
} }
.progress{ .progress{

View File

@@ -2,8 +2,8 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0"/>
<title>K-space</title> <title>K-space</title>
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -12,11 +12,12 @@
</head> </head>
<body> <body>
<div id="container" class="grey lighten-4"> <div id="container" class="grey lighten-4">
<div class="headerblock section"> <div class="headerblock section">
<div class="fadeimage" style="opacity:1;background-image:url('http://robot.itcollege.ee/assets/img/sumoesp-soldered.jpg')"></div> <div class="fadeimage"
style="opacity:1;background-image:url('http://robot.itcollege.ee/assets/img/sumoesp-soldered.jpg')"></div>
<!-- <div class="fadeimage" style="background-image:url('https://owncloud.koodur.com/index.php/apps/gallery/preview.public/1092117?width=2600&height=2600&c=d21f5a223e7ae8c692c537e6a35ae37f&requesttoken=TGJTDncMBCtJEG40Djt9HSUBIykoWn4bNwQpP09YAx4%3D%3A85kCFd3z8QYaaAKggYmQi%2F0mtMcmz7iSGQBOmq84Z50%3D&token=j0HUdRNEaZ37wGE')"></div> <!-- <div class="fadeimage" style="background-image:url('https://owncloud.koodur.com/index.php/apps/gallery/preview.public/1092117?width=2600&height=2600&c=d21f5a223e7ae8c692c537e6a35ae37f&requesttoken=TGJTDncMBCtJEG40Djt9HSUBIykoWn4bNwQpP09YAx4%3D%3A85kCFd3z8QYaaAKggYmQi%2F0mtMcmz7iSGQBOmq84Z50%3D&token=j0HUdRNEaZ37wGE')"></div>
<div class="fadeimage" style="background-image:url('https://owncloud.koodur.com/index.php/apps/gallery/preview.public/1055905?width=2600&height=2600&c=a635e088958188e4490b17a91602366a&requesttoken=TGJTDncMBCtJEG40Djt9HSUBIykoWn4bNwQpP09YAx4%3D%3A85kCFd3z8QYaaAKggYmQi%2F0mtMcmz7iSGQBOmq84Z50%3D&token=j0HUdRNEaZ37wGE')"></div> --> <div class="fadeimage" style="background-image:url('https://owncloud.koodur.com/index.php/apps/gallery/preview.public/1055905?width=2600&height=2600&c=a635e088958188e4490b17a91602366a&requesttoken=TGJTDncMBCtJEG40Djt9HSUBIykoWn4bNwQpP09YAx4%3D%3A85kCFd3z8QYaaAKggYmQi%2F0mtMcmz7iSGQBOmq84Z50%3D&token=j0HUdRNEaZ37wGE')"></div> -->
@@ -145,11 +146,38 @@
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 802.7 239.1" style="enable-background:new 0 0 802.7 239.1;" xml:space="preserve"> viewBox="0 0 802.7 239.1" style="enable-background:new 0 0 802.7 239.1;" xml:space="preserve">
<style type="text/css"> <style type="text/css">
.st0{fill:#26719B;stroke:#34495E;stroke-width:5;stroke-miterlimit:10;} .st0 {
.st1{fill:#3498DB;stroke:#34495E;stroke-width:5;stroke-miterlimit:10;} fill: #26719B;
.st2{fill:#ECF0F1;stroke:#ECF0F1;stroke-miterlimit:10;} stroke: #34495E;
.st3{fill:#ECF0F1;stroke:#ECF0F1;stroke-width:0.5;stroke-miterlimit:10;} stroke-width: 5;
.st4{fill:none;stroke:#ECF0F1;stroke-miterlimit:10;} stroke-miterlimit: 10;
}
.st1 {
fill: #3498DB;
stroke: #34495E;
stroke-width: 5;
stroke-miterlimit: 10;
}
.st2 {
fill: #ECF0F1;
stroke: #ECF0F1;
stroke-miterlimit: 10;
}
.st3 {
fill: #ECF0F1;
stroke: #ECF0F1;
stroke-width: 0.5;
stroke-miterlimit: 10;
}
.st4 {
fill: none;
stroke: #ECF0F1;
stroke-miterlimit: 10;
}
</style> </style>
<g id="bg"> <g id="bg">
</g> </g>
@@ -241,26 +269,88 @@
</div> </div>
<!-- SVG END --> <!-- SVG END -->
<div class="container black-text">
<div class="row">
<div class="col s12 m6">
<h2 class="">Challenges</h2>
</div>
</div>
<div class="row">
<div class="col s12">
<span class="flow-text">
Do something new. Test yourself. Improve your portfolio. Have fun.
</span>
<p>
Take part in our many challenges, ranging from restoring corrupted files from a flash drive to taking down
walls with a sledgehammer. Once a challenge has been completed, the user will be added to our glorious hall of
fame, where friends and employers can awe at your achievements.
</p>
</div>
</div>
<div class="row challenges">
<div class="col s12 m3">
<div class="card small">
<div class="card-content">
<div class="card-title">name here</div>
<p>Description here</p>
</br>
<div> <div>
<div class="chip">security</div>
<div class="row section"> </div>
<div class="col s12 m6 offset-m2"> </br>
<h5><b>23.2</b> different tools</h5>
<p>Including CNC bench, 3D printer, servers, chainsaws, sledgehammers </p>
</div> </div>
</div> </div>
<div class="row section"> </div>
<div class="col s12 m6 offset-m3"> <div class="col s12 m3">
<h5><b>29</b> people</h5> <div class="card small">
<p>Maybe one or two more</p> <div class="card-content">
<div class="card-title">name here</div>
<p>Description here</p>
</br>
<div>
<div class="chip">security</div>
</div>
</br>
</div>
</div>
</div>
<div class="col s12 m3">
<div class="card small">
<div class="card-content">
<div class="card-title">name here</div>
<p>Description here</p>
</br>
<div>
<div class="chip">security</div>
</div>
</br>
</div>
</div>
</div>
<div class="col s12 m3">
<div class="card small">
<div class="card-content">
<div class="card-title">name here</div>
<p>Description here</p>
<br>
<div>
<div class="chip">security</div>
</div>
<br>
</div>
</div>
</div>
</div>
<br>
<div class="row">
<div class="center-align">
<a href="challenges.html" class="btn-large blue">Browse all challenges</a>
</div> </div>
</div> </div>
</div> </div>
<br/> <br>
<footer class="page-footer"> <footer class="page-footer">
<div class="container"> <div class="container">
@@ -285,7 +375,8 @@
<li><a class="grey-text text-lighten-3" href="#!">Mission</a></li> <li><a class="grey-text text-lighten-3" href="#!">Mission</a></li>
<li><a class="grey-text text-lighten-3" href="#!">People</a></li> <li><a class="grey-text text-lighten-3" href="#!">People</a></li>
</ul> </ul>
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1015.5421689053422!2d24.659768056865254!3d59.39830538168295!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x469295abf80677bd%3A0x89a6e8a5671f608b!2sAkadeemia+tee+21%2F1%2C+12618+Tallinn!5e0!3m2!1set!2see!4v1507405326247" width="350" height="200" frameborder="0" style="border:0" allowfullscreen></iframe> <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1015.5421689053422!2d24.659768056865254!3d59.39830538168295!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x469295abf80677bd%3A0x89a6e8a5671f608b!2sAkadeemia+tee+21%2F1%2C+12618+Tallinn!5e0!3m2!1set!2see!4v1507405326247"
width="350" height="200" frameborder="0" style="border:0" allowfullscreen></iframe>
</div> </div>
</div> </div>
</div> </div>
@@ -297,11 +388,11 @@
</div> </div>
</footer> </footer>
</div> </div>
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script> <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script>
<script src="/static/js/app.js"></script> <script src="/static/js/app.js"></script>
</body> </body>
</html> </html>