Differences

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

--- about_the_workshops [2023/01/04 22:38] – haley
+++ about_the_workshops [2023/07/10 17:00] (current) – rylin
@@ Line 1: / Line 1: @@
-=====About The Workshop===== {{:cnsi-ucsb-1024x585.jpg?200|}}
+=====About The Workshops=====
 The Innovation Workshop and Microfluidics Lab are both located in Elings Hall, home of the California NanoSystems Institute (CNSI) at University of California, Santa Barbara.
-The Microfluidics Lab, located in 3430 Elings, is a shared use research lab that provides equipment for the manufacturing of Microfluidic devices. In addition to a large selection of PDMS processing tools, the lab also houses a variety of lab equipment for other fabrications and scientific inquiries, ranging from 3D printers and laser cutters to digital microscopes and CNC mills.
+**The Microfluidics Lab**, located in 3430 Elings, is a shared-use research lab that provides equipment for the manufacturing of Microfluidic devices. In addition to a large selection of PDMS processing tools, the lab also houses a variety of lab equipment for other fabrications and scientific inquiries ranging from 3D printers and laser cutters to digital microscopes and CNC machines.
-The Innovation Workshop, located in 2442 and 2448 Elings, is a makerspace set up for rapid prototyping and fabrication. The workshop houses a variety of mechanical and electronic assembly tools, in addition to a CNC router, bandsaw, drill press, laser cutter, 3D scanner, and a number of 3D printers.
+{{ :microfluidics-lab.jpg?nolink&300 |}}
+**The Innovation Workshop**, located in 2442 and 2448 Elings, is a makerspace set up for rapid prototyping and fabrication. The workshop houses a variety of mechanical and electronic assembly tools in addition to a 3D scanner, manual machines, CNC routers, and a number of 3D printers.
+{{:innovation.jpg?nolink&300|}} {{ :logo.jpg?nolink&200|}}