From f5dfc91fe60b81d44fba18b098e4b949b3f2ae5c Mon Sep 17 00:00:00 2001
From: unknown <ftourlom@mit.edu>
Date: Sun, 9 Sep 2018 19:20:14 -0400
Subject: [PATCH] fixing dependencies
---
.idea/workspace.xml | 96 +++++++++++++++++++++------------------------
index.html | 4 +-
2 files changed, 47 insertions(+), 53 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9a6b4c1..9b46e74 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="33061d0c-84e3-4051-bf3c-7d807428912a" name="Default" comment="" />
+ <list default="true" id="33061d0c-84e3-4051-bf3c-7d807428912a" name="Default" comment="">
+ <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+ </list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
@@ -43,23 +45,32 @@
</counts>
</usages-collector>
</session>
+ <session id="-640567574">
+ <usages-collector id="statistics.lifecycle.project">
+ <counts>
+ <entry key="project.open.time.0" value="1" />
+ <entry key="project.opened" value="1" />
+ </counts>
+ </usages-collector>
+ <usages-collector id="statistics.file.extensions.edit">
+ <counts>
+ <entry key="html" value="9" />
+ </counts>
+ </usages-collector>
+ <usages-collector id="statistics.file.types.edit">
+ <counts>
+ <entry key="HTML" value="9" />
+ </counts>
+ </usages-collector>
+ </session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portfoilogrid-final/portfoilogrid/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="7202">
- <caret line="277" column="8" selection-start-line="277" selection-start-column="8" selection-end-line="277" selection-end-column="62" />
- </state>
- </provider>
- </entry>
- </file>
<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="556">
- <caret line="103" column="25" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
+ <state relative-caret-position="-2">
+ <caret line="384" column="13" lean-forward="true" selection-start-line="384" selection-start-column="13" selection-end-line="384" selection-end-column="13" />
<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" />
@@ -86,7 +97,7 @@
</replaceStrings>
</component>
<component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/my-htmaa-2018" />
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
@@ -104,14 +115,9 @@
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
- <component name="NodePackageJsonFileManager">
- <packageJsonPaths>
- <path value="$PROJECT_DIR$/startbootstrap-blog-home-gh-pages/startbootstrap-blog-home-gh-pages/package.json" />
- </packageJsonPaths>
- </component>
<component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="-1928" />
- <option name="y" value="-8" />
+ <option name="x" value="-1901" />
+ <option name="y" value="300" />
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
@@ -167,7 +173,7 @@
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
- <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+ <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@@ -203,16 +209,18 @@
<workItem from="1535771879523" duration="9399000" />
<workItem from="1536473512076" duration="5223000" />
<workItem from="1536522854762" duration="5054000" />
+ <workItem from="1536532362270" duration="2283000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="38818000" />
+ <option name="totallyTimeSpent" value="41101000" />
</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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14210178" />
+ <window_info 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" />
@@ -224,7 +232,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="8" />
- <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+ <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.11605206" />
<window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -238,30 +246,9 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/portfoilogrid-final/portfoilogrid/css/style.css">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/startbootstrap-blog-home-gh-pages/startbootstrap-blog-home-gh-pages/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1336">
- <caret line="75" column="24" lean-forward="true" selection-start-line="75" selection-start-column="24" selection-end-line="75" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/portfoilogrid-final/portfoilogrid/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="7202">
- <caret line="277" column="8" selection-start-line="277" selection-start-column="8" selection-end-line="277" selection-end-column="62" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/css/style.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="546">
- <caret line="21" column="28" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/portfoilogrid-final/portfoilogrid/css/style.css" />
+ <entry file="file://$PROJECT_DIR$/startbootstrap-blog-home-gh-pages/startbootstrap-blog-home-gh-pages/index.html" />
+ <entry file="file://$PROJECT_DIR$/portfoilogrid-final/portfoilogrid/index.html" />
<entry file="file://G:/rheometer-cover/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="520">
@@ -271,8 +258,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="556">
- <caret line="103" column="25" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
+ <state relative-caret-position="-2">
+ <caret line="384" column="13" lean-forward="true" selection-start-line="384" selection-start-column="13" selection-end-line="384" selection-end-column="13" />
<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" />
@@ -281,5 +268,12 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/css/style.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="546">
+ <caret line="21" column="28" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/index.html b/index.html
index 624ffb8..b0aed40 100644
--- a/index.html
+++ b/index.html
@@ -134,7 +134,7 @@
</div>
<!-- RESEARCH-->
- <div id="research" class="">
+ <div id="research" class="collapse">
<div class="card card-body bg-success text-white py-5">
<h2>My Research Interests</h2>
<p class="lead">Lorem ipsum dolor, sit amet consectetur adipisicing elit. Nihil, ut!</p>
@@ -386,7 +386,7 @@
</div>
-<script src="http://code.jquery.com/jquery-3.3.1.min.js"
+<script src="https://code.jquery.com/jquery-3.3.1.min.js"
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
--
GitLab