diff options
| author | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-12 11:34:54 +0000 |
|---|---|---|
| committer | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-12 11:34:54 +0000 |
| commit | 334b34624ed1ad17dd489cc6ff62a4a8cd846940 (patch) | |
| tree | e3b33c60bf67a99d826b24f0f5d057528a5baa0b | |
| parent | a1a604aa6616d4bd9d2562f5c2dae2b6f6ca7b32 (diff) | |
| parent | 748ccc35882b6ee243e867fa16b91261f8be7922 (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
| -rw-r--r-- | .idea/workspace.xml | 662 | ||||
| -rw-r--r-- | assets/css/creative.css | 27 | ||||
| -rw-r--r-- | assets/css/style.css | 205 | ||||
| -rw-r--r-- | assets/js/script.js | 53 | ||||
| -rw-r--r-- | user_profile_alt.html | 317 |
5 files changed, 876 insertions, 388 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6aa513d..7bad097 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,11 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="76750cb6-3caf-4260-b9f0-4e60ecec2e33" name="Default" comment=""> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/assets/js/script.js" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/assets/css/creative.css" afterPath="$PROJECT_DIR$/assets/css/creative.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/assets/css/style.css" afterPath="$PROJECT_DIR$/assets/css/style.css" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/idea.txt" afterPath="$PROJECT_DIR$/idea.txt" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/questions.html" afterPath="$PROJECT_DIR$/questions.html" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/user_profile_alt.html" afterPath="$PROJECT_DIR$/user_profile_alt.html" /> </list> <ignored path="solutions_repo.iws" /> <ignored path=".idea/workspace.xml" /> @@ -26,62 +26,141 @@ <favorites_list name="solutions_repo" /> </component> <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="idea.txt" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/idea.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="504"> - <caret line="28" column="126" selection-start-line="28" selection-start-column="126" selection-end-line="28" selection-end-column="126" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/index.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1242"> - <caret line="69" column="71" selection-start-line="69" selection-start-column="71" selection-end-line="69" selection-end-column="71" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="creative.css" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/assets/css/creative.css"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="250"> - <caret line="173" column="41" selection-start-line="173" selection-start-column="41" selection-end-line="173" selection-end-column="41" /> - <folding> - <element signature="e#4210#4816#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="style.css" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/assets/css/style.css"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="36"> - <caret line="2" column="14" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="14" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="questions.html" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/questions.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="234"> - <caret line="13" column="62" selection-start-line="13" selection-start-column="62" selection-end-line="13" selection-end-column="62" /> - <folding> - <element signature="n#nav#0;n#body#0;n#html#0;n#!!top" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - </leaf> + <splitter split-orientation="horizontal" split-proportion="0.51770836"> + <split-first> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> + <file leaf-file-name="user_profile_alt.html" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/user_profile_alt.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="506"> + <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" /> + <folding> + <element signature="n#nav#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#0;n#div#0;n#nav#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#4;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#5;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + </leaf> + </split-first> + <split-second> + <leaf> + <file leaf-file-name="style.css" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/assets/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="763"> + <caret line="404" column="32" selection-start-line="404" selection-start-column="32" selection-end-line="404" selection-end-column="32" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="script.js" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/assets/js/script.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="110"> + <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> + <folding> + <element signature="e#70#225#0" expanded="false" /> + <element signature="n#!!block;n#hidePages#0;n#!!block;n#main#0" expanded="false" /> + <element signature="e#475#1245#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="a3.html" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../../../assignment_3/KAHN-a3/a3/a3.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="153"> + <caret line="9" column="75" selection-start-line="9" selection-start-column="70" selection-end-line="9" selection-end-column="75" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="creative.css" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/assets/css/creative.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="559"> + <caret line="350" column="27" selection-start-line="350" selection-start-column="27" selection-end-line="350" selection-end-column="27" /> + <folding> + <element signature="e#61#98#0" expanded="false" /> + <element signature="e#114#164#0" expanded="false" /> + <element signature="e#182#205#0" expanded="false" /> + <element signature="e#305#367#0" expanded="false" /> + <element signature="e#424#523#0" expanded="false" /> + <element signature="e#541#765#0" expanded="false" /> + <element signature="e#785#1012#0" expanded="false" /> + <element signature="e#1062#1206#0" expanded="false" /> + <element signature="e#1312#1339#0" expanded="false" /> + <element signature="e#1402#1496#0" expanded="false" /> + <element signature="e#1571#1598#0" expanded="false" /> + <element signature="e#1675#1747#0" expanded="false" /> + <element signature="e#1836#1874#0" expanded="false" /> + <element signature="e#1876#3100#0" expanded="false" /> + <element signature="e#1922#2008#0" expanded="false" /> + <element signature="e#2059#2103#0" expanded="false" /> + <element signature="e#2217#2245#0" expanded="false" /> + <element signature="e#2316#2360#0" expanded="false" /> + <element signature="e#2443#2471#0" expanded="false" /> + <element signature="e#2499#2580#0" expanded="false" /> + <element signature="e#2637#2697#0" expanded="false" /> + <element signature="e#2822#2857#0" expanded="false" /> + <element signature="e#2940#2968#0" expanded="false" /> + <element signature="e#3063#3098#0" expanded="false" /> + <element signature="e#3110#3517#0" expanded="false" /> + <element signature="e#3539#3564#0" expanded="false" /> + <element signature="e#3589#3682#0" expanded="false" /> + <element signature="e#3732#3829#0" expanded="false" /> + <element signature="e#3879#3905#0" expanded="false" /> + <element signature="e#4085#4722#0" expanded="false" /> + <element signature="e#4124#4157#0" expanded="false" /> + <element signature="e#4186#4387#0" expanded="false" /> + <element signature="e#4438#4527#0" expanded="false" /> + <element signature="e#4580#4715#0" expanded="false" /> + <element signature="e#4724#5627#0" expanded="false" /> + <element signature="e#4761#4794#0" expanded="false" /> + <element signature="e#4823#5024#0" expanded="false" /> + <element signature="e#5075#5164#0" expanded="false" /> + <element signature="e#5217#5416#0" expanded="false" /> + <element signature="e#5451#5624#0" expanded="false" /> + <element signature="e#5638#5666#0" expanded="false" /> + <element signature="e#5686#5711#0" expanded="false" /> + <element signature="e#5747#5815#0" expanded="false" /> + <element signature="e#5857#5878#0" expanded="false" /> + <element signature="e#5913#5943#0" expanded="false" /> + <element signature="e#5972#5990#0" expanded="false" /> + <element signature="e#6036#6075#0" expanded="false" /> + <element signature="e#6148#6176#0" expanded="false" /> + <element signature="e#6199#6224#0" expanded="false" /> + <element signature="e#6241#6300#0" expanded="false" /> + <element signature="e#6323#6347#0" expanded="false" /> + <element signature="e#6386#6435#0" expanded="false" /> + <element signature="e#6486#6508#0" expanded="false" /> + <element signature="e#6553#6575#0" expanded="false" /> + <element signature="e#6584#6608#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + </leaf> + </split-second> + </splitter> + </component> + <component name="FileTemplateManagerImpl"> + <option name="RECENT_TEMPLATES"> + <list> + <option value="JavaScript File" /> + </list> + </option> </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> @@ -90,10 +169,13 @@ <option name="CHANGED_PATHS"> <list> <option value="$PROJECT_DIR$/idea.txt" /> - <option value="$PROJECT_DIR$/assets/css/style.css" /> <option value="$PROJECT_DIR$/solutions.html" /> <option value="$PROJECT_DIR$/questions.html" /> <option value="$PROJECT_DIR$/index.html" /> + <option value="$PROJECT_DIR$/assets/css/script.js" /> + <option value="$PROJECT_DIR$/assets/css/style.css" /> + <option value="$PROJECT_DIR$/assets/js/script.js" /> + <option value="$PROJECT_DIR$/user_profile_alt.html" /> <option value="$PROJECT_DIR$/assets/css/creative.css" /> </list> </option> @@ -105,9 +187,10 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="ProjectFrameBounds"> - <option name="y" value="30" /> - <option name="width" value="1289" /> - <option name="height" value="807" /> + <option name="x" value="-8" /> + <option name="y" value="-8" /> + <option name="width" value="1936" /> + <option name="height" value="1056" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> @@ -120,7 +203,7 @@ <ConfirmationsSetting value="0" id="Remove" /> </component> <component name="ProjectView"> - <navigator proportions="" version="1"> + <navigator currentView="ProjectPane" proportions="" version="1"> <flattenPackages /> <showMembers /> <showModules /> @@ -133,7 +216,13 @@ <manualOrder /> <foldersAlwaysOnTop value="true" /> </navigator> - <panes /> + <panes> + <pane id="Scope" /> + <pane id="Scratches" /> + <pane id="ProjectPane"> + <subPane /> + </pane> + </panes> </component> <component name="PropertiesComponent"> <property name="settings.editor.selected.configurable" value="preferences.editor" /> @@ -143,6 +232,60 @@ <property name="WebServerToolWindowFactoryState" value="false" /> <property name="HbShouldOpenHtmlAsHb" value="" /> </component> + <component name="RecentsManager"> + <key name="MoveFile.RECENT_KEYS"> + <recent name="F:\School\UofT\third_year_courses\CSC309\a4\repo3\solutions_repo\assets\js" /> + </key> + </component> + <component name="RunManager"> + <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application"> + <method /> + </configuration> + <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test"> + <method /> + </configuration> + <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma"> + <config-file value="" /> + <node-interpreter value="project" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> + <method /> + </configuration> + <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir=""> + <method /> + </configuration> + <configuration default="true" type="cucumber.js" factoryName="Cucumber.js"> + <option name="cucumberJsArguments" value="" /> + <option name="executablePath" /> + <option name="filePath" /> + <method /> + </configuration> + <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> + <method /> + </configuration> + <configuration default="true" type="js.build_tools.npm" factoryName="npm"> + <command value="run-script" /> + <scripts /> + <node-interpreter value="project" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha"> + <node-interpreter>project</node-interpreter> + <node-options /> + <working-directory /> + <pass-parent-env>true</pass-parent-env> + <envs /> + <ui>bdd</ui> + <extra-mocha-options /> + <test-kind>DIRECTORY</test-kind> + <test-directory /> + <recursive>false</recursive> + <method /> + </configuration> + </component> <component name="ShelveChangesManager" show_recycled="false"> <option name="remove_strategy" value="false" /> </component> @@ -161,6 +304,7 @@ <workItem from="1468151198617" duration="15420000" /> <workItem from="1468259294444" duration="18000" /> <workItem from="1468274256944" duration="12000" /> + <workItem from="1468298290981" duration="18027000" /> </task> <task id="LOCAL-00001" summary="added link to stylesheet"> <created>1468117129577</created> @@ -180,29 +324,47 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="24045000" /> + <option name="totallyTimeSpent" value="42072000" /> </component> <component name="ToolWindowManager"> - <frame x="0" y="30" width="1289" height="807" extended-state="1" /> + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <editor active="true" /> <layout> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20063192" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.12864584" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32706222" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + </layout> + <layout-to-restore> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32706222" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12864584" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - </layout> + </layout-to-restore> </component> <component name="Vcs.Log.UiProperties"> <option name="RECENTLY_FILTERED_USER_GROUPS"> @@ -227,6 +389,104 @@ <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/idea.txt"> <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="476"> + <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/index.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1173"> + <caret line="69" column="18" selection-start-line="69" selection-start-column="18" selection-end-line="69" selection-end-column="18" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/assets/css/creative.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <element signature="e#61#98#0" expanded="false" /> + <element signature="e#114#164#0" expanded="false" /> + <element signature="e#182#205#0" expanded="false" /> + <element signature="e#305#367#0" expanded="false" /> + <element signature="e#424#523#0" expanded="false" /> + <element signature="e#541#765#0" expanded="false" /> + <element signature="e#785#1012#0" expanded="false" /> + <element signature="e#1062#1206#0" expanded="false" /> + <element signature="e#1312#1339#0" expanded="false" /> + <element signature="e#1402#1496#0" expanded="false" /> + <element signature="e#1571#1598#0" expanded="false" /> + <element signature="e#1675#1747#0" expanded="false" /> + <element signature="e#1836#1874#0" expanded="false" /> + <element signature="e#1876#3100#0" expanded="false" /> + <element signature="e#1922#2008#0" expanded="false" /> + <element signature="e#2059#2103#0" expanded="false" /> + <element signature="e#2217#2245#0" expanded="false" /> + <element signature="e#2316#2360#0" expanded="false" /> + <element signature="e#2443#2471#0" expanded="false" /> + <element signature="e#2499#2580#0" expanded="false" /> + <element signature="e#2637#2697#0" expanded="false" /> + <element signature="e#2822#2857#0" expanded="false" /> + <element signature="e#2940#2968#0" expanded="false" /> + <element signature="e#3063#3098#0" expanded="false" /> + <element signature="e#3110#3517#0" expanded="false" /> + <element signature="e#3539#3564#0" expanded="false" /> + <element signature="e#3589#3682#0" expanded="false" /> + <element signature="e#3732#3829#0" expanded="false" /> + <element signature="e#3879#3905#0" expanded="false" /> + <element signature="e#4085#4722#0" expanded="false" /> + <element signature="e#4124#4157#0" expanded="false" /> + <element signature="e#4186#4387#0" expanded="false" /> + <element signature="e#4438#4527#0" expanded="false" /> + <element signature="e#4580#4715#0" expanded="false" /> + <element signature="e#4724#5627#0" expanded="false" /> + <element signature="e#4761#4794#0" expanded="false" /> + <element signature="e#4823#5024#0" expanded="false" /> + <element signature="e#5075#5164#0" expanded="false" /> + <element signature="e#5217#5416#0" expanded="false" /> + <element signature="e#5451#5624#0" expanded="false" /> + <element signature="e#5638#5666#0" expanded="false" /> + <element signature="e#5686#5711#0" expanded="false" /> + <element signature="e#5747#5815#0" expanded="false" /> + <element signature="e#5857#5878#0" expanded="false" /> + <element signature="e#5913#5943#0" expanded="false" /> + <element signature="e#5972#5990#0" expanded="false" /> + <element signature="e#6036#6075#0" expanded="false" /> + <element signature="e#6148#6176#0" expanded="false" /> + <element signature="e#6199#6224#0" expanded="false" /> + <element signature="e#6241#6300#0" expanded="false" /> + <element signature="e#6323#6347#0" expanded="false" /> + <element signature="e#6386#6435#0" expanded="false" /> + <element signature="e#6486#6508#0" expanded="false" /> + <element signature="e#6553#6575#0" expanded="false" /> + <element signature="e#6584#6608#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/assets/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="34"> + <caret line="2" column="14" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="14" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/questions.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="221"> + <caret line="13" column="62" selection-start-line="13" selection-start-column="62" selection-end-line="13" selection-end-column="62" /> + <folding> + <element signature="n#nav#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/idea.txt"> + <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> @@ -262,7 +522,61 @@ <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding> - <element signature="e#4210#4816#0" expanded="false" /> + <element signature="e#61#98#0" expanded="false" /> + <element signature="e#114#164#0" expanded="false" /> + <element signature="e#182#205#0" expanded="false" /> + <element signature="e#305#367#0" expanded="false" /> + <element signature="e#424#523#0" expanded="false" /> + <element signature="e#541#765#0" expanded="false" /> + <element signature="e#785#1012#0" expanded="false" /> + <element signature="e#1062#1206#0" expanded="false" /> + <element signature="e#1312#1339#0" expanded="false" /> + <element signature="e#1402#1496#0" expanded="false" /> + <element signature="e#1571#1598#0" expanded="false" /> + <element signature="e#1675#1747#0" expanded="false" /> + <element signature="e#1836#1874#0" expanded="false" /> + <element signature="e#1876#3100#0" expanded="false" /> + <element signature="e#1922#2008#0" expanded="false" /> + <element signature="e#2059#2103#0" expanded="false" /> + <element signature="e#2217#2245#0" expanded="false" /> + <element signature="e#2316#2360#0" expanded="false" /> + <element signature="e#2443#2471#0" expanded="false" /> + <element signature="e#2499#2580#0" expanded="false" /> + <element signature="e#2637#2697#0" expanded="false" /> + <element signature="e#2822#2857#0" expanded="false" /> + <element signature="e#2940#2968#0" expanded="false" /> + <element signature="e#3063#3098#0" expanded="false" /> + <element signature="e#3110#3517#0" expanded="false" /> + <element signature="e#3539#3564#0" expanded="false" /> + <element signature="e#3589#3682#0" expanded="false" /> + <element signature="e#3732#3829#0" expanded="false" /> + <element signature="e#3879#3905#0" expanded="false" /> + <element signature="e#4085#4722#0" expanded="false" /> + <element signature="e#4124#4157#0" expanded="false" /> + <element signature="e#4186#4387#0" expanded="false" /> + <element signature="e#4438#4527#0" expanded="false" /> + <element signature="e#4580#4715#0" expanded="false" /> + <element signature="e#4724#5627#0" expanded="false" /> + <element signature="e#4761#4794#0" expanded="false" /> + <element signature="e#4823#5024#0" expanded="false" /> + <element signature="e#5075#5164#0" expanded="false" /> + <element signature="e#5217#5416#0" expanded="false" /> + <element signature="e#5451#5624#0" expanded="false" /> + <element signature="e#5638#5666#0" expanded="false" /> + <element signature="e#5686#5711#0" expanded="false" /> + <element signature="e#5747#5815#0" expanded="false" /> + <element signature="e#5857#5878#0" expanded="false" /> + <element signature="e#5913#5943#0" expanded="false" /> + <element signature="e#5972#5990#0" expanded="false" /> + <element signature="e#6036#6075#0" expanded="false" /> + <element signature="e#6148#6176#0" expanded="false" /> + <element signature="e#6199#6224#0" expanded="false" /> + <element signature="e#6241#6300#0" expanded="false" /> + <element signature="e#6323#6347#0" expanded="false" /> + <element signature="e#6386#6435#0" expanded="false" /> + <element signature="e#6486#6508#0" expanded="false" /> + <element signature="e#6553#6575#0" expanded="false" /> + <element signature="e#6584#6608#0" expanded="false" /> </folding> </state> </provider> @@ -307,7 +621,61 @@ <state relative-caret-position="1890"> <caret line="105" column="5" selection-start-line="105" selection-start-column="5" selection-end-line="105" selection-end-column="5" /> <folding> - <element signature="e#4210#4816#0" expanded="false" /> + <element signature="e#61#98#0" expanded="false" /> + <element signature="e#114#164#0" expanded="false" /> + <element signature="e#182#205#0" expanded="false" /> + <element signature="e#305#367#0" expanded="false" /> + <element signature="e#424#523#0" expanded="false" /> + <element signature="e#541#765#0" expanded="false" /> + <element signature="e#785#1012#0" expanded="false" /> + <element signature="e#1062#1206#0" expanded="false" /> + <element signature="e#1312#1339#0" expanded="false" /> + <element signature="e#1402#1496#0" expanded="false" /> + <element signature="e#1571#1598#0" expanded="false" /> + <element signature="e#1675#1747#0" expanded="false" /> + <element signature="e#1836#1874#0" expanded="false" /> + <element signature="e#1876#3100#0" expanded="false" /> + <element signature="e#1922#2008#0" expanded="false" /> + <element signature="e#2059#2103#0" expanded="false" /> + <element signature="e#2217#2245#0" expanded="false" /> + <element signature="e#2316#2360#0" expanded="false" /> + <element signature="e#2443#2471#0" expanded="false" /> + <element signature="e#2499#2580#0" expanded="false" /> + <element signature="e#2637#2697#0" expanded="false" /> + <element signature="e#2822#2857#0" expanded="false" /> + <element signature="e#2940#2968#0" expanded="false" /> + <element signature="e#3063#3098#0" expanded="false" /> + <element signature="e#3110#3517#0" expanded="false" /> + <element signature="e#3539#3564#0" expanded="false" /> + <element signature="e#3589#3682#0" expanded="false" /> + <element signature="e#3732#3829#0" expanded="false" /> + <element signature="e#3879#3905#0" expanded="false" /> + <element signature="e#4085#4722#0" expanded="false" /> + <element signature="e#4124#4157#0" expanded="false" /> + <element signature="e#4186#4387#0" expanded="false" /> + <element signature="e#4438#4527#0" expanded="false" /> + <element signature="e#4580#4715#0" expanded="false" /> + <element signature="e#4724#5627#0" expanded="false" /> + <element signature="e#4761#4794#0" expanded="false" /> + <element signature="e#4823#5024#0" expanded="false" /> + <element signature="e#5075#5164#0" expanded="false" /> + <element signature="e#5217#5416#0" expanded="false" /> + <element signature="e#5451#5624#0" expanded="false" /> + <element signature="e#5638#5666#0" expanded="false" /> + <element signature="e#5686#5711#0" expanded="false" /> + <element signature="e#5747#5815#0" expanded="false" /> + <element signature="e#5857#5878#0" expanded="false" /> + <element signature="e#5913#5943#0" expanded="false" /> + <element signature="e#5972#5990#0" expanded="false" /> + <element signature="e#6036#6075#0" expanded="false" /> + <element signature="e#6148#6176#0" expanded="false" /> + <element signature="e#6199#6224#0" expanded="false" /> + <element signature="e#6241#6300#0" expanded="false" /> + <element signature="e#6323#6347#0" expanded="false" /> + <element signature="e#6386#6435#0" expanded="false" /> + <element signature="e#6486#6508#0" expanded="false" /> + <element signature="e#6553#6575#0" expanded="false" /> + <element signature="e#6584#6608#0" expanded="false" /> </folding> </state> </provider> @@ -331,14 +699,6 @@ </provider> </entry> <entry file="file://$PROJECT_DIR$/solutions.html" /> - <entry file="file://$PROJECT_DIR$/idea.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="504"> - <caret line="28" column="126" selection-start-line="28" selection-start-column="126" selection-end-line="28" selection-end-column="126" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/assets/css/bootstrap.css"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="133"> @@ -349,36 +709,158 @@ <entry file="file://$PROJECT_DIR$/solutions.html" /> <entry file="file://$PROJECT_DIR$/index.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1242"> - <caret line="69" column="71" selection-start-line="69" selection-start-column="71" selection-end-line="69" selection-end-column="71" /> + <state relative-caret-position="1173"> + <caret line="69" column="18" selection-start-line="69" selection-start-column="18" selection-end-line="69" selection-end-column="18" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/assets/css/creative.css"> + <entry file="file://$PROJECT_DIR$/questions.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="250"> - <caret line="173" column="41" selection-start-line="173" selection-start-column="41" selection-end-line="173" selection-end-column="41" /> + <state relative-caret-position="221"> + <caret line="13" column="62" selection-start-line="13" selection-start-column="62" selection-end-line="13" selection-end-column="62" /> <folding> - <element signature="e#4210#4816#0" expanded="false" /> + <element signature="n#nav#0;n#body#0;n#html#0;n#!!top" expanded="false" /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/idea.txt"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="158"> + <caret line="8" column="11" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../../repo2/solutions_repo/assets/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="537"> + <caret line="363" column="4" selection-start-line="363" selection-start-column="4" selection-end-line="363" selection-end-column="37" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/assets/css/style.css"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="36"> - <caret line="2" column="14" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="14" /> + <state relative-caret-position="763"> + <caret line="404" column="32" selection-start-line="404" selection-start-column="32" selection-end-line="404" selection-end-column="32" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/questions.html"> + <entry file="file://$PROJECT_DIR$/../../../assignment_3/KAHN-a3/a3/assets/scripts/script.js"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="234"> - <caret line="13" column="62" selection-start-line="13" selection-start-column="62" selection-end-line="13" selection-end-column="62" /> + <state relative-caret-position="391"> + <caret line="555" column="37" selection-start-line="555" selection-start-column="19" selection-end-line="555" selection-end-column="37" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/assets/js/script.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="110"> + <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> + <folding> + <element signature="e#70#225#0" expanded="false" /> + <element signature="n#!!block;n#hidePages#0;n#!!block;n#main#0" expanded="false" /> + <element signature="e#475#1245#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../../../assignment_3/KAHN-a3/a3/a3.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="153"> + <caret line="9" column="75" selection-start-line="9" selection-start-column="70" selection-end-line="9" selection-end-column="75" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/user_solutions.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1332"> + <caret line="92" column="59" selection-start-line="92" selection-start-column="59" selection-end-line="92" selection-end-column="59" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/user_profile_alt.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="506"> + <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" /> <folding> <element signature="n#nav#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#0;n#div#0;n#nav#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#4;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + <element signature="n#div#5;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#main#0;n#body#0;n#html#0;n#!!top" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/assets/css/creative.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="559"> + <caret line="350" column="27" selection-start-line="350" selection-start-column="27" selection-end-line="350" selection-end-column="27" /> + <folding> + <element signature="e#61#98#0" expanded="false" /> + <element signature="e#114#164#0" expanded="false" /> + <element signature="e#182#205#0" expanded="false" /> + <element signature="e#305#367#0" expanded="false" /> + <element signature="e#424#523#0" expanded="false" /> + <element signature="e#541#765#0" expanded="false" /> + <element signature="e#785#1012#0" expanded="false" /> + <element signature="e#1062#1206#0" expanded="false" /> + <element signature="e#1312#1339#0" expanded="false" /> + <element signature="e#1402#1496#0" expanded="false" /> + <element signature="e#1571#1598#0" expanded="false" /> + <element signature="e#1675#1747#0" expanded="false" /> + <element signature="e#1836#1874#0" expanded="false" /> + <element signature="e#1876#3100#0" expanded="false" /> + <element signature="e#1922#2008#0" expanded="false" /> + <element signature="e#2059#2103#0" expanded="false" /> + <element signature="e#2217#2245#0" expanded="false" /> + <element signature="e#2316#2360#0" expanded="false" /> + <element signature="e#2443#2471#0" expanded="false" /> + <element signature="e#2499#2580#0" expanded="false" /> + <element signature="e#2637#2697#0" expanded="false" /> + <element signature="e#2822#2857#0" expanded="false" /> + <element signature="e#2940#2968#0" expanded="false" /> + <element signature="e#3063#3098#0" expanded="false" /> + <element signature="e#3110#3517#0" expanded="false" /> + <element signature="e#3539#3564#0" expanded="false" /> + <element signature="e#3589#3682#0" expanded="false" /> + <element signature="e#3732#3829#0" expanded="false" /> + <element signature="e#3879#3905#0" expanded="false" /> + <element signature="e#4085#4722#0" expanded="false" /> + <element signature="e#4124#4157#0" expanded="false" /> + <element signature="e#4186#4387#0" expanded="false" /> + <element signature="e#4438#4527#0" expanded="false" /> + <element signature="e#4580#4715#0" expanded="false" /> + <element signature="e#4724#5627#0" expanded="false" /> + <element signature="e#4761#4794#0" expanded="false" /> + <element signature="e#4823#5024#0" expanded="false" /> + <element signature="e#5075#5164#0" expanded="false" /> + <element signature="e#5217#5416#0" expanded="false" /> + <element signature="e#5451#5624#0" expanded="false" /> + <element signature="e#5638#5666#0" expanded="false" /> + <element signature="e#5686#5711#0" expanded="false" /> + <element signature="e#5747#5815#0" expanded="false" /> + <element signature="e#5857#5878#0" expanded="false" /> + <element signature="e#5913#5943#0" expanded="false" /> + <element signature="e#5972#5990#0" expanded="false" /> + <element signature="e#6036#6075#0" expanded="false" /> + <element signature="e#6148#6176#0" expanded="false" /> + <element signature="e#6199#6224#0" expanded="false" /> + <element signature="e#6241#6300#0" expanded="false" /> + <element signature="e#6323#6347#0" expanded="false" /> + <element signature="e#6386#6435#0" expanded="false" /> + <element signature="e#6486#6508#0" expanded="false" /> + <element signature="e#6553#6575#0" expanded="false" /> + <element signature="e#6584#6608#0" expanded="false" /> </folding> </state> </provider> diff --git a/assets/css/creative.css b/assets/css/creative.css index 9ec2c72..76f1049 100644 --- a/assets/css/creative.css +++ b/assets/css/creative.css @@ -341,4 +341,31 @@ header .header-content .header-content-inner hr { margin-top:20px; } +/****************************************/ +/* user-profile-nav */ +/* only children of navbar-custom are affected*/ +.navbar-custom{ + background-color: #ffffff; /* Green */ + margin: 0 0 3px 0; + text-decoration: none; + font-size: 1em; + -webkit-transition-duration: 0.4s; /* Safari */ + transition-duration: 0.4s; + border-radius: 10px 10px 0px 0px; +} + +.navbar-custom .navbar-toggle{ + border-color: #ddd; +} +.navbar-custom .navbar-toggle .icon-bar{ + background-color: #888; +} +.navbar-custom li a{ + padding: 12px; +} +.navbar-custom .navbar-nav li a:hover { + background-color: #d9edf7; + color: #3170a6; +} +/********************************************/ diff --git a/assets/css/style.css b/assets/css/style.css index 6eb6a24..4f50205 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -353,205 +353,20 @@ p.solutions-type{ padding-bottom: 15px; } -/**********************************************************************************************************************/ -/*THE USER-PROFILE PAGE BEGINS HERE*/ -#user-profile-content{ - flex: 1; - width: 60%; - background-color: rgba(235,235,235, 0.6); - -} - -#user-menu-container{ - - height: 100%; - - /* For column layout remove width below - and add column class for container*/ - width: 25%; - float: left; -} - -#user-menu{ - padding: 3%; - width: 100%; -} - -#user-avatar{ - /* Center image display*/ - display: flex; - justify-content: center; - align-content: center; - - padding: 3%; - background-color: white; - border-radius: 15px; - height: 200px; - box-shadow: 7px 5px 10px #b3b3b3; - - /* top, right, bot, left */ - margin: 100px 10px 10px 10px; -} -#user-avatar img{ - max-width: 100%; - height: auto; - /*margin: 3px 3px 20px 3px;*/ - -} -#user-photo-edit{ - background-color: white; - border-radius: 15px; - height: auto; - box-shadow: 7px 5px 10px #b3b3b3; - margin: 10px 10px 10px 10px; -} - -#user-options{ - background-color: white; - border-radius: 15px; - box-shadow: 7px 5px 10px #b3b3b3; - margin: 10px 10px 10px 10px; -} - -#user-info-container{ - display: flex; - justify-content: center; - align-content: center; - - /* For column layout remove width below - and add column class for container*/ - width: 75%; - float: left; -} - -#user-info{ - background-color: white; - border-radius: 15px; - height: auto; - width: 100%; - box-shadow: 7px 5px 10px #b3b3b3; - - /* top, right, bot, left */ - margin: 110px 20px 20px 15px; - -} -#user-info #user-name h1{ - padding: 20px; - text-align: left; - margin: 0; - color: white; - font-size: 1.5em; +/********** user-profile styles **********/ +.user-info-content{ + padding-top: 100px; } - -#user-name{ - height: auto; - width: 100%; - border-top-left-radius: 10px; - border-top-right-radius: 10px; - background-color: #73a195; -} -#user-content{ - min-height: 400px; - text-align: left; - +.user-info-content img{ + max-width: 100px; } -#user-content h2{ - margin: 0; +.user-info-content p{ color: gray; - padding: 10px 10px 10px 10px; - -} -#user-content p{ - padding: 0 10px 10px 50px; - display: block; - word-wrap: break-word; -} - -#user-content em{ - font-weight: bolder; - font-style: normal; -} -#user-content span{ - padding-left: 10px; -} - -/* Button styles*/ - - -[class^="menu-button"]{ - background-color: #ffffff; /* Green */ - width: 100%; - border: none; - color: #a4a4a4; - padding: 15px 32px; - text-align: center; - text-decoration: none; - display: inline-block; - font-size: 16px; - cursor: pointer; - -webkit-transition-duration: 0.4s; /* Safari */ - transition-duration: 0.4s; - - border: solid #cfcfcf 1px; -} - -[class^="menu-button"]:hover { - background-color: #73a195; - color: white; -} - -.menu-button-first{ - border-top-left-radius: 10px; - border-top-right-radius: 10px; - margin-top: 0; -} -.menu-button-last{ - border-bottom-left-radius: 10px; - border-bottom-right-radius: 10px; - margin-bottom: 0; } - - -.edit-button { - display: inline-block; - border-radius: 4px; - background-color: #ffffff; - border: none; - color: #979797; - text-align: center; - font-size: 1em; - padding: 10px; - width: auto; - transition: all 0.5s; - cursor: pointer; +.prf-sign-off{ margin: 15px; - border: solid #c7c7c7 3px; - border-radius: 15px; -} - -.edit-button span { - cursor: pointer; - display: inline-block; - position: relative; - transition: 0.5s; -} - -.edit-button span:after { - content: 'ยป'; - position: absolute; - opacity: 0; - top: 0; - right: -20px; - transition: 0.5s; } - -.edit-button:hover span { - padding-right: 25px; -} - -.edit-button:hover span:after { - opacity: 1; - right: 0; +.prf-tables{ + text-align: left; } - -/********** !user-profile *********/
\ No newline at end of file +/********** !user-profile styles *********/ diff --git a/assets/js/script.js b/assets/js/script.js new file mode 100644 index 0000000..f73d7f0 --- /dev/null +++ b/assets/js/script.js @@ -0,0 +1,53 @@ +function main(){ + + + // User-profile dynamic paging + var items = [ + $("#profile-general"), + $("#profile-follows"), + $("#profile-friends"), + $("#profile-inbox"), + $("#profile-comments")]; + + function hidePages(){ + items.forEach(function(item){ + item.hide(); + }); + } + + // Hide all pages at load + hidePages(); + + // Show General page + items[0].show(); + + $('.prf-page').bind('click', function(e){ + + e.preventDefault(); + hidePages(); + + /* Each case will need to be changed to call a handler for fetching data + * from server*/ + switch($(this).text()) { + case "General": + $("#profile-general").show(); + break; + case "Follows": + $("#profile-follows").show(); + break; + case "Friends": + $("#profile-friends").show(); + break; + case "Inbox": + $("#profile-inbox").show(); + break; + case "Comments": + $("#profile-comments").show(); + break; + default: + console.log("Error: User page not found"); + } + }); + +} +$(document).ready(main);
\ No newline at end of file diff --git a/user_profile_alt.html b/user_profile_alt.html index 73bce35..4abfc2b 100644 --- a/user_profile_alt.html +++ b/user_profile_alt.html @@ -21,6 +21,7 @@ <!--JS--> <script src="assets/js/jquery-2.2.4.min.js"></script> <script src="assets/js/bootstrap.min.js"></script> + <script src="assets/js/script.js"></script> </head> <body> @@ -74,118 +75,53 @@ </nav> <main id="solutions-main"> - <!--made the id in to a class--> - - <!--<div class="container"> - <div class="row"> - <section id="user-profile-content" class="col-md-1"> - <section id="user-menu-container"> - <section id="user-menu"> - <div id="user-avatar"> - <img src="assets/images/avatar.png" alt="avatar"> - </div> - <div id="user-photo-edit"> - <button class="menu-button menu-button-first menu-button-last" - id="bt-edit-photo">Edit Photo</button> - </div> - <div id="user-options"> - <button class="menu-button-first" id="bt-general">General info</button> - <button class="menu-button" id="bt-follows">Follows</button> - <button class="menu-button" id="bt-friends">Friends</button> - <button class="menu-button" id="bt-inbox">Inbox</button> - <button class="menu-button-last" id="bt-history">Comment History</button> - </div> - </section> - - </section> - <section id="user-info-container" class="col-md-11"> - - <div id="user-info"> - <div id="user-name"> - <h1>Walter White</h1> - </div> - - <div id="user-content"> - <h2>Account info:</h2> - <p><em>Username:</em><span id="edit-name">theSmith1985</span></p> - - <p><em>e-mail:</em><span id="edit-email">smithy@gmail.com</span></p> - <h2>Personal Info: </h2> - <p><em>First name:</em><span id="edit-fname">Walter</span></p> - <p><em>Last name:</em><span id="edit-lname">White</span></p> - <p><em>University:</em><span id="edit-uni">University of Toronto</span></p> - <p><em>Campus:</em><span id="edit-camp">St. George</span></p> - <p><em>Program:</em><span id="edit-prog">Computer Science</span></p> - <p><em>Age:</em><span id="edit-age">50</span></p> - </div> - <button class="edit-button" style="vertical-align:middle"><span>Edit Personal Info </span></button> - </div> - </section> - </section> - - </div> - </div>--> - - - <!--Attempt to apply bootstrap to it Failed :(--> - <!-- <div class="container"> - <div class="row" style="width: 60%; padding-left: 15%; padding-right: 15%"> - <div class="col-md-3"> - <img src="assets/images/avatar.png" alt="avatar"> - <div class="btn-group-vertical"> - <button type="button" class="btn btn-primary">Edit Photo</button> - <button type="button" class="btn btn-primary">General info</button> - <button type="button" class="btn btn-primary">Follows</button> - <button type="button" class="btn btn-primary">Friends</button> - <button type="button" class="btn btn-primary">Inbox</button> - <button type="button" class="btn btn-primary">Comment History</button> - </div> - </div> - <div class="col-lg-9"> - - <!– <h1>Walter White</h1> - <h2>Account info:</h2> - - <p><em>Username:</em><span id="edit-name">theSmith1985</span></p> - - <p><em>e-mail:</em><span id="edit-email">smithy@gmail.com</span></p> - <h2>Personal Info: </h2> - <p><em>First name:</em><span id="edit-fname">Walter</span></p> - <p><em>Last name:</em><span id="edit-lname">White</span></p> - <p><em>University:</em><span id="edit-uni">University of Toronto</span></p> - <p><em>Campus:</em><span id="edit-camp">St. George</span></p> - <p><em>Program:</em><span id="edit-prog">Computer Science</span></p> - <p><em>Age:</em><span id="edit-age">50</span></p> - - <button class="edit-button" style="vertical-align:middle"><span>Edit Personal Info </span></button> -–> - - </div> + <div class="container user-info-content"> + <div class="row"> - </div> + <!-- User Profile details --> + <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 col-xs-offset-0 + col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad"> + + <!-- User Profile Menu --> + <nav class="navbar navbar-custom"> + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" + data-toggle="collapse" data-target="#profile-nav"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + <div class="collapse navbar-collapse" id="profile-nav"> + <ul class="nav navbar-nav " > + <li><a href="#" class="prf-page">General</a></li> + <li><a href="#" class="prf-page">Follows</a></li> + <li><a href="#" class="prf-page">Friends</a></li> + <li><a href="#" class="prf-page">Inbox</a></li> + <li><a href="#" class="prf-page">Comments</a></li> + </ul> + </div> - </div>--> + </div> + </nav> - <div class="container"> - <div class="row"> - <div class="col-md-5 toppad pull-right col-md-offset-3 "> - <a href="#">Edit Profile</a> - <a href="#">Logout</a> - <br> - <p class=" text-info"> July 4 2016 </p> - </div> - <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 col-xs-offset-0 col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad" > <div class="rounded"> <div class="panel panel-info rounded"> <div class="panel-heading"> <h3 class="panel-title">Walter White</h3> </div> - <div class="panel-body"> - <div class="row"> - <div class="col-md-3 col-lg-3 " align="center"> <img alt="User Pic" src="assets/images/avatar.png" class="img-circle img-responsive"> </div> + <div class="panel-body" > + + <!------------ User-Profile Pages ------------> + <div class="row" id="profile-general"> + <div class="col-md-3 col-lg-3 " align="center"> + <img alt="User Pic" src="assets/images/avatar.png" + class="img-circle img-responsive"> + </div> <div class=" col-md-9 col-lg-9 "> <table class="table table-user-information"> @@ -227,15 +163,190 @@ </div> </div> + + <div class="row" id="profile-follows"> + + <h3>You are following:</h3> + <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6"> + <table class="table-condensed"> + <tbody> + <tr> + <th> + <img class="img-circle img-responsive" + src="assets/images/misc/user1.jpeg" alt="avatar"> + </th> + <th> + <h4>The Dude</h4> + <p>3 comments</p> + </th> + + </tr> + <tr> + <th> + <img class="img-circle img-responsive" + src="assets/images/misc/user2.jpeg" alt="avatar"> + </th> + <th> + <h4>He-Man</h4> + <p>20 comments</p> + </th> + </tr> + <tr> + <th> + <img class="img-circle img-responsive" + src="assets/images/misc/user3.jpeg" alt="avatar"> + </th> + <th> + <h4>Lady Lips</h4> + <p>56 comments</p> + </th> + </tr> + </tbody> + + </table> + </div> + + + </div> + + <div class="row" id="profile-friends"> + + <h3>Friends</h3> + <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6"> + <table class="table-condensed"> + <tbody> + <tr> + <th> + <img class="img-circle img-responsive" + src="assets/images/misc/user2.jpeg" alt="avatar"> + </th> + <th> + <h4>He-Man</h4> + <p>20 comments</p> + </th> + + </tr> + <tr> + <th> + <img class="img-circle img-responsive" + src="assets/images/misc/user5.jpeg" alt="avatar"> + </th> + <th> + <h4>Jay Leno</h4> + <p>5 comments</p> + </th> + </tr> + <tr> + <th> + <img class="img-circle img-responsive" + src="assets/images/misc/user6.jpeg" alt="avatar"> + </th> + <th> + <h4>Lisa Simpson</h4> + <p>658 comments</p> + </th> + </tr> + </tbody> + + </table> + </div> + + + </div> + + <div class="row" id="profile-inbox"> + <h3>Inbox</h3> + <div class="col-sm-10 col-sm-offset-1 prf-tables"> + <table class="table"> + <thead> + <tr> + <th>Date</th> + <th>Subject</th> + <th>Sender</th> + </tr> + </thead> + <tbody> + <tr> + <td>2016-05-01</td> + <td>Great Solution!1</td> + <td>The Dude</td> + </tr> + <tr> + <td>2016-04-05</td> + <td>Woah look at this</td> + <td>Lady Lips</td> + </tr> + <tr> + <td>2016-02-30</td> + <td>I don't get this, help!</td> + <td>The Dude</td> + </tr> + <tr> + <td>2016-01-15</td> + <td>I solved your problem</td> + <td>Lisa</td> + </tr> + </tbody> + + </table> + </div> + + </div> + + <div class="row" id="profile-comments"> + <h3>Comment History</h3> + <div class="col-sm-10 col-sm-offset-1 prf-tables"> + <table class="table"> + <thead> + <tr> + <th>Date</th> + <th>Comment</th> + <th>Exam</th> + </tr> + </thead> + <tbody> + <tr> + <td>2016-05-01</td> + <td>Use BFS! Not DFS!</td> + <td>CSC148 > Winter 2014</td> + </tr> + <tr> + <td>2016-04-05</td> + <td>Use a heap!</td> + <td>CSC263 > Fall 2015</td> + </tr> + <tr> + <td>2016-02-30</td> + <td>I love python!</td> + <td>CSC108 > Winter 2015</td> + </tr> + <tr> + <td>2016-01-15</td> + <td>I hate verilog!</td> + <td>CSC258 > Fall 2015</td> + </tr> + </tbody> + + </table> + </div> + </div> + + <!-- Date, Edit, Logout (new row) --> + <div class="col-md-12 prf-sign-off"> + <p class=" text-info"> July 4 2016 </p> + <a href="#">Edit Profile</a> + <a href="#">Logout</a> + <br> + + </div> </div> + </div> </div> </div> </div> </div> - - </main> <footer> |