diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1d984e1989d0dfb99eec47add93fbde9a8cf3f57..c8f6c887d8e56c6af9dc53a208505a5553b68a2c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,6 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="33061d0c-84e3-4051-bf3c-7d807428912a" name="Default" comment=""> - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/.tmp/" /> @@ -55,12 +54,12 @@ </usages-collector> <usages-collector id="statistics.file.extensions.edit"> <counts> - <entry key="html" value="244" /> + <entry key="html" value="521" /> </counts> </usages-collector> <usages-collector id="statistics.file.types.edit"> <counts> - <entry key="HTML" value="244" /> + <entry key="HTML" value="521" /> </counts> </usages-collector> </session> @@ -70,8 +69,8 @@ <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/index.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1315"> - <caret line="153" column="20" lean-forward="true" selection-start-line="153" selection-start-column="20" selection-end-line="153" selection-end-column="20" /> + <state relative-caret-position="78"> + <caret line="108" column="85" lean-forward="true" selection-start-line="108" selection-start-column="85" selection-end-line="108" selection-end-column="85" /> <folding> <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> @@ -96,6 +95,9 @@ <replaceStrings> <replace /> </replaceStrings> + <dirStrings> + <dir>G:\my-personal-page</dir> + </dirStrings> </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> @@ -117,10 +119,10 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="ProjectFrameBounds" extendedState="6"> - <option name="x" value="-9" /> - <option name="y" value="-9" /> - <option name="width" value="1938" /> - <option name="height" value="1048" /> + <option name="x" value="-1928" /> + <option name="y" value="-8" /> + <option name="width" value="1936" /> + <option name="height" value="1056" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectView"> @@ -133,35 +135,13 @@ <subPane> <expand> <path> - <item name="my-portfolio" type="b2602c69:ProjectViewProjectNode" /> - <item name="my-portfolio" type="462c0819:PsiDirectoryNode" /> + <item name="my-personal-page" type="b2602c69:ProjectViewProjectNode" /> + <item name="my-personal-page" type="462c0819:PsiDirectoryNode" /> </path> <path> - <item name="my-portfolio" type="b2602c69:ProjectViewProjectNode" /> - <item name="my-portfolio" type="462c0819:PsiDirectoryNode" /> - <item name="css" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="my-portfolio" type="b2602c69:ProjectViewProjectNode" /> - <item name="my-portfolio" type="462c0819:PsiDirectoryNode" /> - <item name="portfoilogrid-final" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="my-portfolio" type="b2602c69:ProjectViewProjectNode" /> - <item name="my-portfolio" type="462c0819:PsiDirectoryNode" /> - <item name="portfoilogrid-final" type="462c0819:PsiDirectoryNode" /> - <item name="portfoilogrid" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="my-portfolio" type="b2602c69:ProjectViewProjectNode" /> - <item name="my-portfolio" type="462c0819:PsiDirectoryNode" /> - <item name="startbootstrap-blog-home-gh-pages" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="my-portfolio" type="b2602c69:ProjectViewProjectNode" /> - <item name="my-portfolio" type="462c0819:PsiDirectoryNode" /> - <item name="startbootstrap-blog-home-gh-pages" type="462c0819:PsiDirectoryNode" /> - <item name="startbootstrap-blog-home-gh-pages" type="462c0819:PsiDirectoryNode" /> + <item name="my-personal-page" type="b2602c69:ProjectViewProjectNode" /> + <item name="my-personal-page" type="462c0819:PsiDirectoryNode" /> + <item name="img" type="462c0819:PsiDirectoryNode" /> </path> </expand> <select /> @@ -210,18 +190,18 @@ <workItem from="1535771879523" duration="9399000" /> <workItem from="1536473512076" duration="5223000" /> <workItem from="1536522854762" duration="5054000" /> - <workItem from="1536532362270" duration="3600000" /> + <workItem from="1536532362270" duration="7651000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="42418000" /> + <option name="totallyTimeSpent" value="46469000" /> </component> <component name="ToolWindowManager"> - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> + <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" /> <editor active="true" /> <layout> - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17779246" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14172813" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Favorites" order="2" side_tool="true" /> <window_info anchor="bottom" id="Message" order="0" /> @@ -259,8 +239,8 @@ </entry> <entry file="file://$PROJECT_DIR$/index.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1315"> - <caret line="153" column="20" lean-forward="true" selection-start-line="153" selection-start-column="20" selection-end-line="153" selection-end-column="20" /> + <state relative-caret-position="78"> + <caret line="108" column="85" lean-forward="true" selection-start-line="108" selection-start-column="85" selection-end-line="108" selection-end-column="85" /> <folding> <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> diff --git a/img/droplets.jpg b/img/droplets.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9dcbeacabcb876c85021edbe190d62a44fc65dce Binary files /dev/null and b/img/droplets.jpg differ diff --git a/img/water-liquid-bridge-2.jpg b/img/water-liquid-bridge-2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..aa5fbee59b49cea4d3fa3fe8e1e5021cddeef3e3 Binary files /dev/null and b/img/water-liquid-bridge-2.jpg differ diff --git a/img/water-liquid-bridge.jpg b/img/water-liquid-bridge.jpg new file mode 100644 index 0000000000000000000000000000000000000000..10b7fd81b755b1844f055675afa713c4039cf6a0 Binary files /dev/null and b/img/water-liquid-bridge.jpg differ diff --git a/index.html b/index.html index def87dded7f8e9685b8cdeedccd3f90e95b66be8..a13957302073ae355b747ae7153ff87c45e199d5 100644 --- a/index.html +++ b/index.html @@ -99,9 +99,9 @@ <img class="card-img" src="img/IMG_0302.JPG" alt=""> <div class="card-img-overlay h-100 d-flex flex-column align-items-center d-flex justify-content-center"> <h2 class="card-title">How to Make <i>(almost)</i> Anything <br><br> - <br> - <a href="https://tourlomousis.pages.cba.mit.edu/my-htmaa-2018" class="btn btn-primary btn-lg">Read - More</a> + <br><br><br> + <a href="http://fab.cba.mit.edu/classes/863.18/" class="btn btn-primary btn-lg">Course</a> + <a href="https://tourlomousis.pages.cba.mit.edu/my-htmaa-2018" class="btn btn-primary btn-lg">My Projects</a> </h2> </div> </div> @@ -109,21 +109,22 @@ <div class="card bg-light text-black text-center " style="height:25rem;"> <img class="card-img" src="img/IMG_0302.JPG" alt=""> <div class="card-img-overlay h-100 d-flex flex-column align-items-center d-flex justify-content-center"> - <h2 class="card-title">Machines that Make Machines<br><br> + <h2 class="card-title">How to Make Something that Makes <i>(almost)</i> Anything<br><br> <br> - <a href="http://fab.cba.mit.edu/classes/865.18/people/filippos/" class="btn btn-primary btn-lg">Read - More</a> + <a href="http://fab.cba.mit.edu/classes/865.18/index.html" class="btn btn-primary btn-lg">Course</a> + <a href="http://fab.cba.mit.edu/classes/865.18/people/filippos/" class="btn btn-primary btn-lg">My Projects</a> </h2> </div> </div> <div class="card bg-light text-black text-center " style="height:25rem;"> - <img class="card-img" src="img/IMG_0302.JPG" alt=""> + <img class="card-img" src="img/droplets.jpg" alt=""> + <img class="card-img" src="img/water-liquid-bridge.jpg" height="42%"> <div class="card-img-overlay h-100 d-flex flex-column align-items-center d-flex justify-content-center"> <h2 class="card-title">Fluid Mechanics<br><br> - <br> - <br> - <a href="#" class="btn btn-primary btn-lg">Read More</a> + <br><br><br><br> + <a href="http://math.mit.edu/~bush/?p=1698" class="btn btn-primary btn-lg">Course</a> + <a href="https://tourlomousis.pages.cba.mit.edu/fluids-class-bush" class="btn btn-primary btn-lg">My Project</a> </h2> </div> </div>