aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--about.html178
-rw-r--r--assets/css/style.css17
-rw-r--r--exams.html2
-rw-r--r--index.html2
-rw-r--r--questions.html2
-rw-r--r--user_profile_alt.html2
-rw-r--r--user_solutions.html2
7 files changed, 200 insertions, 5 deletions
diff --git a/about.html b/about.html
new file mode 100644
index 0000000..dac1a36
--- /dev/null
+++ b/about.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Solutions Repo</title>
+
+ <!--ORDER IS IMPORTANT DO NOT SHIFT-->
+
+ <!--Custom CSS Files-->
+ <link href="assets/css/style.css" rel="stylesheet" type="text/css">
+
+ <!--Bootstrap File-->
+ <link rel="stylesheet" href="assets/css/bootstrap.min.css">
+ <link rel="stylesheet" href="assets/css/creative.css">
+
+ <!--Fonts-->
+ <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
+ <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+
+ <!--JS-->
+ <script src="assets/js/jquery-2.2.4.min.js"></script>
+ <script src="assets/js/bootstrap.min.js"></script>
+</head>
+<body>
+
+ <nav id="mainNav" class="navbar navbar-default navbar-fixed-top" >
+ <div class="container-fluid">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed"
+ data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span> <span
+ class="icon-bar"></span> <span class="icon-bar"></span> <span
+ class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand page-scroll" href="index.html">Solutions.Repo</a>
+ </div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse"
+ id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ <!--<li><a href="user_solutions.html">Solutions Page</a></li>
+ <li><a href="user_profile_alt.html">Profile Page</a></li>
+ <li><a href="questions.html">Questions Page</a></li>
+ <li><a href="exams.html">Exams Pages</a></li>-->
+
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li class="dropdown-submenu">
+ <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a>
+ <ul class="dropdown-menu">
+ <li><a tabindex="-1" href="#">CSC108</a></li>
+ <li><a href="#">CSC148</a></li>
+ <li><a href="#">CSC165</a></li>
+ </ul>
+ </li>
+ <li><a href="#">Second Year</a></li>
+ <li><a href="#">Third Year</a></li>
+ <li><a href="#">Fourth Year</a></li>
+ </ul>
+ </li>
+ <li><a href="#">Log In</a></li>
+ <li><a href="#">Register</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a tabindex="-1" href="user_solutions.html">Solutions Page</a></li>
+ <li><a href="user_profile_alt.html">Profile Page</a></li>
+ <li><a href="questions.html">Questions Page</a></li>
+ <li><a href="exams.html">Exams Pages</a></li>
+ </ul>
+
+ </li>
+
+
+ <!--<li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> &ndash;&gt;-->
+ </ul>
+ </div>
+ <!-- /.navbar-collapse -->
+ </div>
+ <!-- /.container-fluid -->
+ </nav>
+
+ <main id = 'solutions-main'>
+ <section class = 'search container'>
+ <h3 class="">About Us</h3>
+ <p class="about-p">
+ We are 4 students from the University of Toronto.
+ </p>
+ <section class="abt-content">
+ <h4 class="abt-name">Nargiza Nosirova</h4>
+ <ul class="abt-ul">
+ <li>Occupation: Student</li>
+ <li>Department: CS</li>
+ <li>Email: placeholder@gmail.com</li>
+ </ul>
+
+ <h4 class="abt-name">Waref Haque</h4>
+ <ul class="abt-ul">
+ <li>Occupation: Student</li>
+ <li>Department: ECE</li>
+ <li>Email: placeholder@gmail.com</li>
+ </ul>
+
+ <h4 class="abt-name">Pradyumn (Kumar) Damani</h4>
+ <ul class="abt-ul">
+ <li>Occupation: Student</li>
+ <li>Department: CS</li>
+ <li>Email: placeholder@gmail.com</li>
+ </ul>
+
+ <h4 class="abt-name">Humair Khan</h4>
+ <ul class="abt-ul">
+ <li>Occupation: Student</li>
+ <li>Department: CS</li>
+ <li>Email: placeholder@gmail.com</li>
+ </ul>
+ </section>
+
+ </section>
+
+
+ </main>
+
+
+ <footer>
+
+ <div class="navbar navbar-default navbar-fixed-bottom">
+ <div class="container-fluid">
+ <div class="navbar-collapse collapse" id="footer-body">
+ <ul class="nav navbar-nav">
+ <li><a href="about.html">About Us</a></li>
+ <li><a href="#">Contact Us</a></li>
+ <li><a href="#">Terms &amp; Conditions</a></li>
+ <li><a href="#">Privacy Policy</a></li>
+ </ul>
+ </div>
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#footer-body">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ </div>
+
+ </div>
+ </div>
+ </footer>
+
+ <script>
+ $(document).ready(function() {
+
+ $(".dropdown").hover(function(){
+ $(".dropdown-toggle", this).trigger("click");
+ });
+
+ $(".dropdown-toggle").click(function() {
+ $(this).next(".dropdown-menu").fadeToggle(200);
+ });
+
+ // For the Second level Dropdown menu, highlight the parent
+ $( ".dropdown-menu" )
+ .mouseenter(function() {
+ $(this).parent('li').addClass('active');
+ })
+ .mouseleave(function() {
+ $(this).parent('li').removeClass('active');
+ });
+
+ });
+ </script>
+
+
+</body>
+</html> \ No newline at end of file
diff --git a/assets/css/style.css b/assets/css/style.css
index a542d64..f28b713 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -386,3 +386,20 @@ p.solutions-type{
text-align: left;
}
/********** !user-profile styles *********/
+/** about_page **/
+.about-p{
+
+ padding: 30px 30px 0px 30px;
+ font-size: 1.3em;
+ color: #323232;
+
+}
+.abt-name{
+ padding-top: 15px;
+}
+.abt-content{
+ padding: 15px;
+}
+
+
+/** !about_page **/
diff --git a/exams.html b/exams.html
index 74a480f..80439cb 100644
--- a/exams.html
+++ b/exams.html
@@ -133,7 +133,7 @@
<div class="container-fluid">
<div class="navbar-collapse collapse" id="footer-body">
<ul class="nav navbar-nav">
- <li><a href="#">About Us</a></li>
+ <li><a href="about.html">About Us</a></li>
<li><a href="#">Contact Us</a></li>
<li><a href="#">Terms &amp; Conditions</a></li>
<li><a href="#">Privacy Policy</a></li>
diff --git a/index.html b/index.html
index 4294c2f..6edf4c1 100644
--- a/index.html
+++ b/index.html
@@ -137,7 +137,7 @@
<div class="container-fluid">
<div class="navbar-collapse collapse" id="footer-body">
<ul class="nav navbar-nav">
- <li><a href="#">About Us</a></li>
+ <li><a href="about.html">About Us</a></li>
<li><a href="#">Contact Us</a></li>
<li><a href="#">Terms &amp; Conditions</a></li>
<li><a href="#">Privacy Policy</a></li>
diff --git a/questions.html b/questions.html
index a3e805d..4fd07a2 100644
--- a/questions.html
+++ b/questions.html
@@ -119,7 +119,7 @@
<div class="container-fluid">
<div class="navbar-collapse collapse" id="footer-body">
<ul class="nav navbar-nav">
- <li><a href="#">About Us</a></li>
+ <li><a href="about.html">About Us</a></li>
<li><a href="#">Contact Us</a></li>
<li><a href="#">Terms &amp; Conditions</a></li>
<li><a href="#">Privacy Policy</a></li>
diff --git a/user_profile_alt.html b/user_profile_alt.html
index bcf1863..7da0b60 100644
--- a/user_profile_alt.html
+++ b/user_profile_alt.html
@@ -365,7 +365,7 @@
<div class="container-fluid">
<div class="navbar-collapse collapse" id="footer-body">
<ul class="nav navbar-nav">
- <li><a href="#">About Us</a></li>
+ <li><a href="about.html">About Us</a></li>
<li><a href="#">Contact Us</a></li>
<li><a href="#">Terms &amp; Conditions</a></li>
<li><a href="#">Privacy Policy</a></li>
diff --git a/user_solutions.html b/user_solutions.html
index 4e5ede8..92ad0e4 100644
--- a/user_solutions.html
+++ b/user_solutions.html
@@ -224,7 +224,7 @@
<div class="container-fluid">
<div class="navbar-collapse collapse" id="footer-body">
<ul class="nav navbar-nav">
- <li><a href="#">About Us</a></li>
+ <li><a href="about.html">About Us</a></li>
<li><a href="#">Contact Us</a></li>
<li><a href="#">Terms &amp; Conditions</a></li>
<li><a href="#">Privacy Policy</a></li>