|
|
| (30 intermediate revisions by 4 users not shown) |
| Line 1: |
Line 1: |
| | __NOTOC__ __NOTITLE__ | | __NOTOC__ __NOTITLE__ |
| − | <div style="width: 850px; height: 478px; margin: 0; padding: 0px; overflow: hidden;"> | + | <div style="width: 850px; height: 300px; margin: 0; padding: 0px; overflow: hidden;"> |
| | | | |
| | + | [[Image:130506 Group 3 wiki frontpage.jpg|850px]] ] |
| | | | |
| − | [[Image:Group3_idea.jpg|850px]]
| |
| | | | |
| | </div> | | </div> |
| − | <div style="height:30px; width: 850px; margin:0px; padding: 0px; padding-top: 15px; border: 0px;">
| |
| | | | |
| − | <div style="float:left; width: 260px; height 30px; border: 1px solid #aaa; margin-right:30px; " align="center"> | + | <div style="height:30px; width: 850px; margin:0px; padding: 0px; padding-top: 20px; border: 0px;"> |
| − | [[project03:Workshop 1|'''Workshop 1''']] | + | |
| | + | <div style="float:left; width: 160px; height 30px; border: 1px solid #aaa; margin-right:10px; " align="center"> |
| | + | [[project03:Frontpage|'''Frontpage''']] |
| | </div> | | </div> |
| | | | |
| − | <div style="float:left; width: 260px; height 30px; border: 1px solid #aaa; margin-right:30px;" align="center"> | + | <div style="float:left; width: 120px; height 30px; border: 1px solid #aaa; margin-right:10px;" align="center"> |
| − | [[project03:Workshop 2|'''Workshop 2''']] | + | [[project20:Roboticresults|'''Robotic Fabrication''']] |
| | </div> | | </div> |
| | | | |
| − | <div style="float:left; width: 260px; height 30px; border: 1px solid #aaa; margin-right:0px;" align="center"> | + | <div style="float:left; width: 120px; height 30px; border: 1px solid #aaa; margin-right:10px;" align="center"> |
| − | [[project03:Workshop 3|'''Workshop 3''']] | + | [[project03:Workshop 2|'''Interaction Design''']] |
| | </div> | | </div> |
| | | | |
| | + | <div style="float:left; width: 120px; height 30px; border: 1px solid #aaa; margin-right:10px;" align="center"> |
| | + | [[project03:Workshop 3|'''Physical Computing''']] |
| | </div> | | </div> |
| | | | |
| − | <div style="width: 850px; margin: 0px; padding: 0px; padding-top: 20px; overflow: hidden;"> | + | <div style="float:left; width: 120px; height 30px; border: 1px solid #aaa; margin-right:10px;" align="center"> |
| − | ==Project name==
| + | [[project03:Workshop 3|'''Design Studio''']] |
| − | author(s): [[User:Javi|Javi Vidal Bernabeu]], [[User:Jiun|Jiun Yu]], [[User:Jurjen|Jurjen Vos]], [[User:L.|L. Zondervan]], [[User:Vivien|Vivien Wu]], [[User:Xindroe|Xindroe Volmer]]
| + | |
| − | | + | |
| − | ==Summary==
| + | |
| − | | + | |
| − | Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ac lobortis nibh. Sed et lectus et dolor convallis sagittis id a sem. Nulla interdum nunc et urna hendrerit at pellentesque risus convallis. Proin a turpis nunc, eu tincidunt arcu. Etiam magna turpis, facilisis id placerat et, congue eu nisi. Vivamus euismod nulla id elit laoreet placerat eu eu nisi. Morbi id libero quam, nec rhoncus diam.
| + | |
| − | | + | |
| − | Fusce cursus turpis feugiat odio consectetur consequat. Donec lacinia velit a orci posuere condimentum. Proin interdum sem sodales velit iaculis a consequat risus faucibus. Suspendisse quam odio, consequat a porta nec, varius eu arcu. Proin erat dui, vestibulum id rhoncus venenatis, porta ut eros. Pellentesque at libero nec turpis scelerisque feugiat id in risus. Proin sollicitudin dapibus nibh, quis adipiscing nisi aliquam id. Pellentesque habitant morbi.
| + | |
| − | | + | |
| − | Cras non dolor ipsum, commodo mattis velit. Duis a augue enim. Cras aliquet augue vitae libero rutrum congue bibendum urna cursus. Sed posuere felis sed ante suscipit consequat. Nullam pretium interdum ultricies. Morbi dignissim congue pulvinar. Mauris tincidunt, tellus at suscipit aliquam, nisl lacus pellentesque odio, pretium consectetur nisl neque in velit. Nunc hendrerit dolor at nibh porttitor eget faucibus augue malesuada. Ut venenatis consequat metus.
| + | |
| − | | + | |
| − | ==Connections==
| + | |
| − | [[project01:frontpage|01NAME]], [[project02:frontpage|02NAME]]
| + | |
| − | | + | |
| | </div> | | </div> |
| | | | |
| | + | <div style="float:left; width: 120px; height 30px; border: 1px solid #aaa; " align="center"> |
| | + | [[project03:Studio|'''Final Presentation Studio''']] |
| | </div> | | </div> |
| | | | |
| − | <div style="height:152px; width: 850px; margin:0px; padding: 0px; padding-top: 20px; overflow: hidden;">
| |
| − | <div style="float:left; width: 270px; height 152px; margin-right:20px; border:0px;" align="center">
| |
| − | [[File:Sample_image.png|270px]]
| |
| − | </div>
| |
| − | <div style="float:left; width: 270px; height 152px; margin-right:20px; border:0px;" align="center">
| |
| − | [[File:Sample_image.png|270px]]
| |
| − | </div>
| |
| − | <div style="float:left; width: 270px; height 152px; border:0px;" align="center">
| |
| − | [[File:Sample_image.png|270px]]
| |
| − | </div>
| |
| | </div> | | </div> |
| | | | |
| − | <div style="height:152px; width: 850px; margin:0px; padding: 0px; padding-top: 20px; overflow: hidden;"> | + | <div style="width: 850px; margin: 0px; padding: 0px; padding-top: 20px; overflow: hidden;"> |
| − | <div style="float:left; width: 270px; height 152px; margin-right:20px; border:0px;" align="center">
| + | ==Group members== |
| − | [[File:Sample_image.png|270px]] | + | <br> |
| − | </div> | + | <center> < [[User:L.|L. Zondervan]] >-< [[User:Xindroe|Xindroe Volmer]] >-< [[User:Xi|Xi Guo]] >-< [[User:Koen|Koen Kegel]] >-< [[User:Vivien|Vivien Wu]] >-< [[User:Jurjen|Jurjen Vos]] >-< [[User:Javi|Javi Vidal Bernabeu]] >-< [[User:Jiun|Jiun Yu]] ></center> |
| − | <div style="float:left; width: 270px; height 152px; margin-right:20px; border:0px;" align="center"> | + | |
| − | [[File:Sample_image.png|270px]] | + | |
| − | </div> | + | |
| | </div> | | </div> |
| | | | |
| | <comments /> | | <comments /> |
