diff options
| author | kumar <kumar.damani@mail.utoronto.ca> | 2016-07-27 14:06:18 +0000 |
|---|---|---|
| committer | kumar <kumar.damani@mail.utoronto.ca> | 2016-07-27 14:06:18 +0000 |
| commit | fc0552c685b1ce37c9903418aa45f013067aad5d (patch) | |
| tree | 1a7d04aaba6c72740a8fdcf395416d705d0607fd /views | |
| parent | 95d1c4e58796ea481e58a5d3c559c147b5b9b921 (diff) | |
| parent | 9d337173a7a6b6234332e7fdb69ff10308b0aca1 (diff) | |
doing a pull
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
Diffstat (limited to 'views')
| -rw-r--r-- | views/about.hbs | 10 | ||||
| -rw-r--r-- | views/partials/footer.hbs | 1 | ||||
| -rw-r--r-- | views/partials/header.hbs | 16 | ||||
| -rw-r--r-- | views/signin.hbs | 3 |
4 files changed, 6 insertions, 24 deletions
diff --git a/views/about.hbs b/views/about.hbs index 0d19d8d..00b4203 100644 --- a/views/about.hbs +++ b/views/about.hbs @@ -4,24 +4,24 @@ <section class="abt-content"> <h3 class="">About Us</h3> <p class="about-p"> - We are 4 students from the University of Toronto. + We are students from the University of Toronto. </p> <h4 class="abt-name">Nargiza Nosirova</h4> <p>Occupation: Student</p> <p>Department: CS</p> - <p>Email: placeholder@gmail.com</p> + <p>Email: nargiza.nosirova@mail.utoronto.ca</p> <h4 class="abt-name">Waref Haque</h4> <p>Occupation: Student</p> <p>Department: ECE</p> - <p>Email: placeholder@gmail.com</p> + <p>Email: w.haque@mail.utoronto.ca</p> <h4 class="abt-name">Pradyumn (Kumar) Damani</h4> <p>Occupation: Student</p> <p>Department: CS</p> - <p>Email: placeholder@gmail.com</p> + <p>Email: kumar.damani@mail.utoronto.ca</p> <h4 class="abt-name">Humair Khan</h4> <p>Occupation: Student</p> <p>Department: CS</p> - <p>Email: placeholder@gmail.com</p> + <p>Email: humair.khan@mail.utoronto.ca</p> </section> </section> </main>
\ No newline at end of file diff --git a/views/partials/footer.hbs b/views/partials/footer.hbs index eecc2f7..b956a1f 100644 --- a/views/partials/footer.hbs +++ b/views/partials/footer.hbs @@ -4,7 +4,6 @@ <div class="navbar-collapse collapse" id="footer-body"> <ul class="nav navbar-nav"> <li><a href="/about">About Us</a></li> - <li><a href="#">Contact Us</a></li> <li><a href="#">Terms & Conditions</a></li> <li><a href="#">Privacy Policy</a></li> </ul> diff --git a/views/partials/header.hbs b/views/partials/header.hbs index d34ac98..57db052 100644 --- a/views/partials/header.hbs +++ b/views/partials/header.hbs @@ -128,22 +128,6 @@ {{ else }} <li><a href="/user/signup" >Sign up</a></li> {{/if}} - <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">Solutions Page</a></li> - <li><a href="/user/user_profile">Profile Page</a></li> - <li><a href="/questions">Questions Page</a></li> - <li><a href="/exams">Exams Pages</a></li> - </ul> - - </li> - </ul> </div> diff --git a/views/signin.hbs b/views/signin.hbs index ebe78d1..7bea713 100644 --- a/views/signin.hbs +++ b/views/signin.hbs @@ -1,6 +1,5 @@ <main id="solutions-main"> - - <div class="row" id="solutions-main"> + <div class="row"> <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3"> {{# if success }} |