Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
fabricademy2017:students:linda.wanders [2017/11/24 12:47]
linwan add week 7
fabricademy2017:students:linda.wanders [2017/12/01 01:19]
linwan add pic
Line 40: Line 40:
 ---- ----
  
-[[:​fabricademy2017:​students:​linda.wanders:​week3|Circular Open Source Fashion]] </​panel>​ </​col>​ </​grid>​ <​grid>​+[[:​fabricademy2017:​students:​linda.wanders:​week3|Circular Open Source Fashion]] </​panel>​ </​col>​ 
 + 
 +</​grid>​ <​grid>​
  
 <col sm="​4">​ <​panel>​ [[:​fabricademy2017:​students:​linda.wanders:​week4|{{:​fabricademy2017:​students:​linda.wanders:​bioplastics-led-cast.jpg?​nolink&​357x200|bioplastics-led-cast.jpg}}]] <col sm="​4">​ <​panel>​ [[:​fabricademy2017:​students:​linda.wanders:​week4|{{:​fabricademy2017:​students:​linda.wanders:​bioplastics-led-cast.jpg?​nolink&​357x200|bioplastics-led-cast.jpg}}]]
Line 64: Line 66:
 ---- ----
  
-[[:​fabricademy2017:​students:​linda.wanders:​week4.2|Bio Fabric]] </​panel>​ </col> </​grid>​ <grid>+[[:​fabricademy2017:​students:​linda.wanders:​week4.2|Bio Fabric]] </​panel>​ </​col>​
  
-<col sm="​4">​ <​panel>​[[:​fabricademy2017:​students:​linda.wanders:​week5|{{:​fabricademy2017:​students:​linda.wanders:​heatpress-6.jpg?​nolink&​356x200|:​fabricademy2017:​students:​linda.wanders:​week5}}]]+</​grid>​ <​grid>​ 
 + 
 +<col sm="​4">​ <​panel>​ [[:​fabricademy2017:​students:​linda.wanders:​week5|{{:​fabricademy2017:​students:​linda.wanders:​heatpress-6.jpg?​nolink&​356x200|:​fabricademy2017:​students:​linda.wanders:​week5}}]]
  
 ==== Week 5 ==== ==== Week 5 ====
Line 74: Line 78:
 [[:​fabricademy2017:​students:​linda.wanders:​week5|E-Textiles and Wearables I]] </​panel>​ </​col>​ [[:​fabricademy2017:​students:​linda.wanders:​week5|E-Textiles and Wearables I]] </​panel>​ </​col>​
  
-<col sm="​4">​ <​panel>​[[:​fabricademy2017:​students:​linda.wanders:​week6|{{:​fabricademy2017:​students:​linda.wanders:​dynamo-4.png?​nolink&​356x200|:​fabricademy2017:​students:​linda.wanders:​week6}}]]+<col sm="​4">​ <​panel>​ [[:​fabricademy2017:​students:​linda.wanders:​week6|{{:​fabricademy2017:​students:​linda.wanders:​dynamo-4.png?​nolink&​356x200|:​fabricademy2017:​students:​linda.wanders:​week6}}]]
  
 ==== Week 6 ==== ==== Week 6 ====
  
 ---- ----
-[[:​fabricademy2017:​students:​linda.wanders:​week6|Computational couture]] 
- </​panel>​ </​col>​ 
  
 +[[:​fabricademy2017:​students:​linda.wanders:​week6|Dynamo studio]] </​panel>​ </​col>​
  
-<col sm="​4">​ <​panel>​[[:​fabricademy2017:​students:​linda.wanders:​week7|{{:​fabricademy2017:​students:​linda.wanders:​resin-fabric-cirkle-result2.jpg?​nolink&​356x200|:​fabricademy2017:​students:​linda.wanders:​week7}}]]+<col sm="​4">​ <​panel>​
  
 +==== Week 6.1 ====
  
 +----
 +
 +[[:​fabricademy2017:​students:​linda.wanders:​week6.1|Computational couture]]</​panel></​col>​
 +
 +</​grid>​ <​grid>​
 +
 +<col sm="​4">​ <​panel>​ [[:​fabricademy2017:​students:​linda.wanders:​week7|{{:​fabricademy2017:​students:​linda.wanders:​resin-fabric-cirkle-result2.jpg?​nolink&​356x200|:​fabricademy2017:​students:​linda.wanders:​week7}}]]
  
 ==== Week 7 ==== ==== Week 7 ====
  
 ---- ----
-[[:​fabricademy2017:​students:​linda.wanders:​week7|The Textile Scaffold]] + 
- </​panel>​ </​col>​+[[:​fabricademy2017:​students:​linda.wanders:​week7|The Textile Scaffold]] ​</​panel>​ </​col>​ 
 + 
 +<col sm="​4">​ <​panel>​ {{:​fabricademy2017:​students:​linda.wanders:​knot-2.png?​direct&​356x200|:​fabricademy2017:​students:​linda.wanders:​week7.1}} 
 + 
 +==== Week 7.1 ==== 
 + 
 +---- 
 + 
 +[[:​fabricademy2017:​students:​linda.wanders:​week7.1|Fusion360 CAM]] </​panel>​ </​col>​ 
 + 
 +<col sm="​4">​ <​panel>​ 
 + 
 +==== Week 8 ==== 
 + 
 +---- 
 + 
 +[[:​fabricademy2017:​students:​linda.wanders:​week8|Open source hardware]] </​panel>​ </​col>​ 
 + 
 +</​grid>​ <​grid>​ 
 + 
 +<col sm="​4">​ <​panel>​ 
 + 
 +==== Week 9 ==== 
 + 
 +---- 
 + 
 +[[:​fabricademy2017:​students:​linda.wanders:​week9|E-Textiles and Wearables II]] </​panel>​ </​col>​
  
 </​grid>​ </​grid>​